diff options
| author | slewis | 2007-10-15 18:40:31 +0000 |
|---|---|---|
| committer | slewis | 2007-10-15 18:40:31 +0000 |
| commit | 0f23e051c0d280ef27f83d51e6855dd437fbe07c (patch) | |
| tree | a76a35514e505dedd3bfb403e4af224c462ea149 | |
| parent | 3d898ee44367b5764dd9736b82915183ad8dc028 (diff) | |
| download | org.eclipse.ecf-0f23e051c0d280ef27f83d51e6855dd437fbe07c.tar.gz org.eclipse.ecf-0f23e051c0d280ef27f83d51e6855dd437fbe07c.tar.xz org.eclipse.ecf-0f23e051c0d280ef27f83d51e6855dd437fbe07c.zip | |
Cleaned up code. by correcting warnings from equinox jdt, jdt ui prefs.
16 files changed, 634 insertions, 245 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/.settings/org.eclipse.jdt.core.prefs b/providers/bundles/org.eclipse.ecf.provider.remoteservice/.settings/org.eclipse.jdt.core.prefs index e50318967..1092bf69f 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/.settings/org.eclipse.jdt.core.prefs +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,331 @@ -#Fri Dec 15 08:26:52 CST 2006 +#Wed Oct 10 22:18:36 EDT 2007 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 +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.4 +org.eclipse.jdt.core.compiler.compliance=1.3 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +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/providers/bundles/org.eclipse.ecf.provider.remoteservice/.settings/org.eclipse.jdt.ui.prefs b/providers/bundles/org.eclipse.ecf.provider.remoteservice/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..9bb86c1d3 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,57 @@ +#Wed Oct 10 22:18:36 EDT 2007 +eclipse.preferences.version=1 +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/providers/bundles/org.eclipse.ecf.provider.remoteservice/.settings/org.eclipse.pde.prefs b/providers/bundles/org.eclipse.ecf.provider.remoteservice/.settings/org.eclipse.pde.prefs new file mode 100644 index 000000000..6686ccd10 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/.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/providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF b/providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF index 38719592d..edd9f70a9 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/META-INF/MANIFEST.MF @@ -19,4 +19,5 @@ Require-Bundle: org.eclipse.equinox.common, org.eclipse.ecf.provider, org.eclipse.ecf.remoteservice, org.eclipse.ecf.discovery -Import-Package: org.osgi.framework;version="1.3.0" +Import-Package: org.eclipse.osgi.util;version="1.1.0", + org.osgi.framework;version="1.3.0" diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/internal/provider/remoteservice/Activator.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/internal/provider/remoteservice/Activator.java index d66cf4f13..2448950a0 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/internal/provider/remoteservice/Activator.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/internal/provider/remoteservice/Activator.java @@ -17,7 +17,7 @@ import org.osgi.framework.BundleContext; public class Activator implements BundleActivator { // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.ecf.provider.remoteservice"; + public static final String PLUGIN_ID = "org.eclipse.ecf.provider.remoteservice"; //$NON-NLS-1$ // The shared instance private static Activator plugin; @@ -31,11 +31,11 @@ public class Activator implements BundleActivator { plugin = this; } - public void start(BundleContext context) throws Exception { - this.context = context; + public void start(BundleContext ctxt) throws Exception { + this.context = ctxt; } - public void stop(BundleContext context) throws Exception { + public void stop(BundleContext ctxt) throws Exception { this.context = null; plugin = null; } diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/internal/provider/remoteservice/Messages.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/internal/provider/remoteservice/Messages.java new file mode 100644 index 000000000..58a250573 --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/internal/provider/remoteservice/Messages.java @@ -0,0 +1,53 @@ +/**************************************************************************** + * Copyright (c) 2007 Composent, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Composent, Inc. - initial API and implementation + *****************************************************************************/ + +package org.eclipse.ecf.internal.provider.remoteservice; + +import org.eclipse.osgi.util.NLS; + +/** + * + */ +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.ecf.internal.provider.remoteservice.messages"; //$NON-NLS-1$ + public static String RegistrySharedObject_14; + public static String RegistrySharedObject_15; + public static String RegistrySharedObject_19; + public static String RegistrySharedObject_20; + public static String RegistrySharedObject_7; + public static String RegistrySharedObject_EXCEPTION_IN_REMOTE_CALL; + public static String RemoteServiceImpl_EXCEPTION_CREATING_PROXY; + public static String RegistrySharedObject_EXCEPTION_INVALID_RESPONSE; + public static String RegistrySharedObject_EXCEPTION_INVOKING_SERVICE; + public static String RegistrySharedObject_EXCEPTION_LOCALLY_INVOKING_REMOTE_CALL; + public static String RemoteServiceRegistrationImpl_EXCEPTION_SERVICE_ALREADY_REGISTERED; + public static String RegistrySharedObject_EXCEPTION_REQUEST_NOT_FOUND; + public static String RegistrySharedObject_EXCEPTION_SENDING_ADD_SERVICE; + public static String RegistrySharedObject_EXCEPTION_SENDING_CALL_REQUEST; + public static String RegistrySharedObject_EXCEPTION_SENDING_FIRE_REQUEST; + public static String RegistrySharedObject_EXCEPTION_SENDING_REMOTE_REQUEST; + public static String RegistrySharedObject_EXCEPTION_SENDING_REQUEST; + public static String RegistrySharedObject_EXCEPTION_SENDING_RESPONSE; + public static String RegistrySharedObject_EXCEPTION_SENDING_SERVICE_UNREGISTER; + public static String RegistrySharedObject_EXCEPTION_SERVICE_CANNOT_BE_NULL; + public static String RegistrySharedObject_EXCEPTION_SERVICE_CLASSES_LIST_EMPTY; + public static String RegistrySharedObject_EXCEPTION_SHARED_OBJECT_INVOKE; + public static String RegistrySharedObject_EXCEPTION_TIMEOUT_FOR_CALL_REQUEST; + public static String RegistrySharedObject_EXCEPTION_WAIT_INTERRUPTED; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + // + } +} diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/internal/provider/remoteservice/messages.properties b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/internal/provider/remoteservice/messages.properties new file mode 100644 index 000000000..8a8010d7d --- /dev/null +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/internal/provider/remoteservice/messages.properties @@ -0,0 +1,24 @@ +RegistrySharedObject_14=No pending request found id +RegistrySharedObject_15=callSynch.request/response DONE: +RegistrySharedObject_19=Request timed out after +RegistrySharedObject_20=\ ms +RegistrySharedObject_7=Service is not valid: +RegistrySharedObject_EXCEPTION_IN_REMOTE_CALL=Exception in remote call +RemoteServiceImpl_EXCEPTION_CREATING_PROXY=Exception creating proxy for remote service +RegistrySharedObject_EXCEPTION_INVALID_RESPONSE=Response to request is null +RegistrySharedObject_EXCEPTION_INVOKING_SERVICE=Exception invoking service +RegistrySharedObject_EXCEPTION_LOCALLY_INVOKING_REMOTE_CALL=Exception locally invoking remote call +RemoteServiceRegistrationImpl_EXCEPTION_SERVICE_ALREADY_REGISTERED=Service already registered +RegistrySharedObject_EXCEPTION_REQUEST_NOT_FOUND=request not found for received response +RegistrySharedObject_EXCEPTION_SENDING_ADD_SERVICE=exception sending add service registration message +RegistrySharedObject_EXCEPTION_SENDING_CALL_REQUEST=exception sending call request message +RegistrySharedObject_EXCEPTION_SENDING_FIRE_REQUEST=exception sending fire request message +RegistrySharedObject_EXCEPTION_SENDING_REMOTE_REQUEST=IOException sending remote request +RegistrySharedObject_EXCEPTION_SENDING_REQUEST=Exception sending request +RegistrySharedObject_EXCEPTION_SENDING_RESPONSE=Exception sending response +RegistrySharedObject_EXCEPTION_SENDING_SERVICE_UNREGISTER=exception sending service unregister message +RegistrySharedObject_EXCEPTION_SERVICE_CANNOT_BE_NULL=service cannot be null +RegistrySharedObject_EXCEPTION_SERVICE_CLASSES_LIST_EMPTY=service classes list is empty +RegistrySharedObject_EXCEPTION_SHARED_OBJECT_INVOKE=Exception in shared object message invoke +RegistrySharedObject_EXCEPTION_TIMEOUT_FOR_CALL_REQUEST=timeout for call request +RegistrySharedObject_EXCEPTION_WAIT_INTERRUPTED=Wait for response interrupted diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/ServiceTypeListener.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/ServiceTypeListener.java index c10e4680a..fdcc239ac 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/ServiceTypeListener.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/ServiceTypeListener.java @@ -12,12 +12,7 @@ package org.eclipse.ecf.provider.remoteservice; import org.eclipse.core.runtime.Assert; -import org.eclipse.ecf.discovery.IDiscoveryContainerAdapter; -import org.eclipse.ecf.discovery.IServiceEvent; -import org.eclipse.ecf.discovery.IServiceInfo; -import org.eclipse.ecf.discovery.IServiceListener; -import org.eclipse.ecf.discovery.IServiceProperties; -import org.eclipse.ecf.discovery.IServiceTypeListener; +import org.eclipse.ecf.discovery.*; import org.eclipse.ecf.discovery.identity.IServiceTypeID; /** @@ -27,7 +22,7 @@ public class ServiceTypeListener implements IServiceTypeListener { private final IDiscoveryContainerAdapter discovery; private final IServiceTypeID[] serviceTypeIDs; - private final IServiceListener serviceListener; + final IServiceListener serviceListener; private final String[] requiredProperties; class ServiceListener implements IServiceListener { @@ -124,7 +119,7 @@ public class ServiceTypeListener implements IServiceTypeListener { return false; } - private boolean hasRequiredProperties(IServiceProperties serviceProperties) { + boolean hasRequiredProperties(IServiceProperties serviceProperties) { if (requiredProperties == null) return true; for (int i = 0; i < requiredProperties.length; i++) diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java index 2f02e998f..c625a3d50 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java @@ -11,43 +11,16 @@ package org.eclipse.ecf.provider.remoteservice.generic; import java.io.IOException; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Dictionary; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - +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.BaseSharedObject; -import org.eclipse.ecf.core.sharedobject.SharedObjectInitException; -import org.eclipse.ecf.core.sharedobject.SharedObjectMsg; +import org.eclipse.ecf.core.sharedobject.*; import org.eclipse.ecf.core.sharedobject.events.ISharedObjectActivatedEvent; -import org.eclipse.ecf.core.util.ECFException; -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.provider.remoteservice.Activator; -import org.eclipse.ecf.internal.provider.remoteservice.IRemoteServiceProviderDebugOptions; -import org.eclipse.ecf.remoteservice.Constants; -import org.eclipse.ecf.remoteservice.IRemoteCall; -import org.eclipse.ecf.remoteservice.IRemoteCallListener; -import org.eclipse.ecf.remoteservice.IRemoteFilter; -import org.eclipse.ecf.remoteservice.IRemoteService; -import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter; -import org.eclipse.ecf.remoteservice.IRemoteServiceListener; -import org.eclipse.ecf.remoteservice.IRemoteServiceReference; -import org.eclipse.ecf.remoteservice.IRemoteServiceRegistration; -import org.eclipse.ecf.remoteservice.events.IRemoteCallCompleteEvent; -import org.eclipse.ecf.remoteservice.events.IRemoteCallStartEvent; -import org.eclipse.ecf.remoteservice.events.IRemoteServiceEvent; -import org.eclipse.ecf.remoteservice.events.IRemoteServiceRegisteredEvent; -import org.eclipse.ecf.remoteservice.events.IRemoteServiceUnregisteredEvent; +import org.eclipse.ecf.core.util.*; +import org.eclipse.ecf.internal.provider.remoteservice.*; +import org.eclipse.ecf.remoteservice.*; +import org.eclipse.ecf.remoteservice.events.*; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; @@ -62,6 +35,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer protected final Map localServiceRegistrations = new HashMap(); public RegistrySharedObject() { + // } /* (non-Javadoc) @@ -89,17 +63,17 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } public IRemoteService getRemoteService(IRemoteServiceReference reference) { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "getRemoteService", reference); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "getRemoteService", reference); //$NON-NLS-1$ final RemoteServiceRegistrationImpl registration = getRemoteServiceRegistrationImpl(reference); if (registration == null) return null; final RemoteServiceImpl remoteService = new RemoteServiceImpl(this, registration); - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "getRemoteService", remoteService); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "getRemoteService", remoteService); //$NON-NLS-1$ return remoteService; } public IRemoteServiceReference[] getRemoteServiceReferences(ID[] idFilter, String clazz, String filter) { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "getRemoteServiceReferences", new Object[] {idFilter, clazz, filter}); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "getRemoteServiceReferences", new Object[] {idFilter, clazz, filter}); //$NON-NLS-1$ final IRemoteFilter remoteFilter = createRemoteFilterFromString(filter); final List references = new ArrayList(); synchronized (remoteRegistrys) { @@ -123,7 +97,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer addReferencesFromRegistry(clazz, remoteFilter, localRegistry, references); } final IRemoteServiceReference[] result = (IRemoteServiceReference[]) references.toArray(new IRemoteServiceReference[references.size()]); - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "getRemoteServiceReferences", result); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "getRemoteServiceReferences", result); //$NON-NLS-1$ return result; } @@ -132,14 +106,14 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } public IRemoteServiceRegistration registerRemoteService(String[] clazzes, Object service, Dictionary properties) { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "registerRemoteService", new Object[] {clazzes, service, properties}); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "registerRemoteService", new Object[] {clazzes, service, properties}); //$NON-NLS-1$ if (service == null) { - throw new NullPointerException("service cannot be null"); + throw new NullPointerException(Messages.RegistrySharedObject_EXCEPTION_SERVICE_CANNOT_BE_NULL); } final int size = clazzes.length; if (size == 0) { - throw new IllegalArgumentException("service classes list is empty"); + throw new IllegalArgumentException(Messages.RegistrySharedObject_EXCEPTION_SERVICE_CLASSES_LIST_EMPTY); } final String[] copy = new String[clazzes.length]; @@ -150,7 +124,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer final String invalidService = checkServiceClass(clazzes, service); if (invalidService != null) { - throw new IllegalArgumentException("Service is not valid: " + invalidService); + throw new IllegalArgumentException(Messages.RegistrySharedObject_7 + invalidService); } final RemoteServiceRegistrationImpl reg = new RemoteServiceRegistrationImpl(); @@ -164,7 +138,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer sendAddRegistration(targets[i], reg); fireRemoteServiceListeners(createRegisteredEvent(reg)); - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "registerRemoteService", reg); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "registerRemoteService", reg); //$NON-NLS-1$ return reg; } @@ -173,11 +147,15 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer return true; } + protected ISharedObjectContext getSOContext() { + return super.getContext(); + } + /* End implementation of IRemoteServiceContainerAdapter public interface */ public void initialize() throws SharedObjectInitException { super.initialize(); - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "initialize"); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "initialize"); //$NON-NLS-1$ super.addEventProcessor(new IEventProcessor() { public boolean processEvent(Event arg0) { if (arg0 instanceof IContainerConnectedEvent) { @@ -185,7 +163,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } else if (arg0 instanceof IContainerDisconnectedEvent) { handleContainerDisconnectedEvent((IContainerDisconnectedEvent) arg0); } else if (arg0 instanceof ISharedObjectActivatedEvent) { - if (getConfig().getContext().getConnectedID() != null) { + if (getSOContext().getConnectedID() != null) { // We're already connected, so send request for update sendRegistryUpdateRequest(); } @@ -194,11 +172,11 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } }); localRegistry = new RemoteServiceRegistryImpl(getLocalContainerID()); - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "initialize"); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "initialize"); //$NON-NLS-1$ } protected void handleContainerDisconnectedEvent(IContainerDisconnectedEvent event) { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "handleContainerDisconnectedEvent", event); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "handleContainerDisconnectedEvent", event); //$NON-NLS-1$ final ID targetID = event.getTargetID(); synchronized (remoteRegistrys) { final RemoteServiceRegistryImpl registry = getRemoteRegistry(targetID); @@ -214,7 +192,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } } } - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "handleContainerDisconnectedEvent"); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "handleContainerDisconnectedEvent"); //$NON-NLS-1$ } protected void sendRegistryUpdate(ID targetContainerID) { @@ -230,17 +208,17 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } protected void handleContainerConnectedEvent(IContainerConnectedEvent event) { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "handleContainerConnectedEvent", event); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "handleContainerConnectedEvent", event); //$NON-NLS-1$ // If we're a group manager or the newly connected container is the // group manager ID targetID = event.getTargetID(); // If we're the group manager, or we've just joined the group, // then we sendAddRegistration to all - if (getContext().isGroupManager() || event.getTargetID().equals(getGroupID())) { + if (getContext().isGroupManager() || event.getTargetID().equals(getConnectedID())) { targetID = null; } sendRegistryUpdate(targetID); - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "handleContainerDisconnectedEvent"); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "handleContainerDisconnectedEvent"); //$NON-NLS-1$ } private Request createRequest(RemoteServiceRegistrationImpl remoteRegistration, IRemoteCall call, IRemoteCallListener listener) { @@ -264,12 +242,10 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer final RemoteServiceReferenceImpl ref = (RemoteServiceReferenceImpl) reference; if (!ref.isActive()) { return null; - } else { - return ref.getRegistration(); } - } else { - return null; + return ref.getRegistration(); } + return null; } private IRemoteFilter createRemoteFilterFromString(String filter) { @@ -287,7 +263,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } protected Object callSynch(RemoteServiceRegistrationImpl registration, IRemoteCall call) throws ECFException { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "callSynch", new Object[] {registration, call}); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "callSynch", new Object[] {registration, call}); //$NON-NLS-1$ boolean doneWaiting = false; Response response = null; try { @@ -300,42 +276,41 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer while ((timeout - System.currentTimeMillis()) > 0 && !doneWaiting) { final Request request = findRequestForId(requestId); if (request == null) { - throw new NullPointerException("No pending request found id " + requestId); + throw new NullPointerException(Messages.RegistrySharedObject_14 + requestId); } synchronized (request) { if (request.isDone()) { removeRequest(request); - Trace.trace(Activator.PLUGIN_ID, "callSynch.request/response DONE: " + request); + Trace.trace(Activator.PLUGIN_ID, Messages.RegistrySharedObject_15 + request); doneWaiting = true; response = request.getResponse(); if (response == null) { - throw new NullPointerException("Response to request is null"); + throw new NullPointerException(Messages.RegistrySharedObject_EXCEPTION_INVALID_RESPONSE); } } else { - Trace.trace(Activator.PLUGIN_ID, "Waiting " + RESPONSE_WAIT_INTERVAL + " for response to request: " + request); + Trace.trace(Activator.PLUGIN_ID, "Waiting " + RESPONSE_WAIT_INTERVAL + " for response to request: " + request); //$NON-NLS-1$ //$NON-NLS-2$ request.wait(RESPONSE_WAIT_INTERVAL); } } } if (!doneWaiting) { - throw new ECFException("Request timed out after " + call.getTimeout() + " ms"); + throw new ECFException(Messages.RegistrySharedObject_19 + call.getTimeout() + Messages.RegistrySharedObject_20); } } catch (final IOException e) { log(CALL_REQUEST_ERROR_CODE, CALL_REQUEST_ERROR_MESSAGE, e); - throw new ECFException("Exception sending request", e); + throw new ECFException(Messages.RegistrySharedObject_EXCEPTION_SENDING_REQUEST, e); } catch (final InterruptedException e) { log(CALL_REQUEST_TIMEOUT_ERROR_CODE, CALL_REQUEST_TIMEOUT_ERROR_MESSAGE, e); - throw new ECFException("Wait for response interrupted", e); + throw new ECFException(Messages.RegistrySharedObject_EXCEPTION_WAIT_INTERRUPTED, e); } // Success...now get values and return Object result = null; if (response.hadException()) { - throw new ECFException("Exception in remote call", response.getException()); - } else { - result = response.getResponse(); + throw new ECFException(Messages.RegistrySharedObject_EXCEPTION_IN_REMOTE_CALL, response.getException()); } + result = response.getResponse(); - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "callSynch", result); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "callSynch", result); //$NON-NLS-1$ return result; } @@ -356,8 +331,8 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } public String toString() { - final StringBuffer buf = new StringBuffer("IRemoteCallStartEvent["); - buf.append(";reference=").append(reference).append(";call=").append(call).append("]"); + final StringBuffer buf = new StringBuffer("IRemoteCallStartEvent["); //$NON-NLS-1$ + buf.append(";reference=").append(reference).append(";call=").append(call).append("]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ return buf.toString(); } }); @@ -384,8 +359,8 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } public String toString() { - final StringBuffer buf = new StringBuffer("IRemoteCallCompleteEvent["); - buf.append(";response=").append(response).append(";hadException=").append(hadException).append(";exception=").append(exception).append("]"); + final StringBuffer buf = new StringBuffer("IRemoteCallCompleteEvent["); //$NON-NLS-1$ + buf.append(";response=").append(response).append(";hadException=").append(hadException).append(";exception=").append(exception).append("]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ return buf.toString(); } }); @@ -436,68 +411,68 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer /** * Message send and handlers */ - private static final String FIRE_REQUEST = "handleFireRequest"; + private static final String FIRE_REQUEST = "handleFireRequest"; //$NON-NLS-1$ - private static final String FIRE_REQUEST_ERROR_MESSAGE = "exception sending fire request message"; + private static final String FIRE_REQUEST_ERROR_MESSAGE = Messages.RegistrySharedObject_EXCEPTION_SENDING_FIRE_REQUEST; private static final int FIRE_REQUEST_ERROR_CODE = 202; - private static final String CALL_REQUEST = "handleCallRequest"; + private static final String CALL_REQUEST = "handleCallRequest"; //$NON-NLS-1$ - private static final String CALL_REQUEST_ERROR_MESSAGE = "exception sending call request message"; + private static final String CALL_REQUEST_ERROR_MESSAGE = Messages.RegistrySharedObject_EXCEPTION_SENDING_CALL_REQUEST; private static final int CALL_REQUEST_ERROR_CODE = 203; - private static final String CALL_REQUEST_TIMEOUT_ERROR_MESSAGE = "timeout for call request"; + private static final String CALL_REQUEST_TIMEOUT_ERROR_MESSAGE = Messages.RegistrySharedObject_EXCEPTION_TIMEOUT_FOR_CALL_REQUEST; private static final int CALL_REQUEST_TIMEOUT_ERROR_CODE = 204; - private static final String UNREGISTER = "handleUnregister"; + private static final String UNREGISTER = "handleUnregister"; //$NON-NLS-1$ - private static final String UNREGISTER_ERROR_MESSAGE = "exception sending service unregister message"; + private static final String UNREGISTER_ERROR_MESSAGE = Messages.RegistrySharedObject_EXCEPTION_SENDING_SERVICE_UNREGISTER; private static final int UNREGISTER_ERROR_CODE = 206; - private static final String MSG_INVOKE_ERROR_MESSAGE = "Exception in shared object message invoke"; + private static final String MSG_INVOKE_ERROR_MESSAGE = Messages.RegistrySharedObject_EXCEPTION_SHARED_OBJECT_INVOKE; private static final int MSG_INVOKE_ERROR_CODE = 207; - private static final String SERVICE_INVOKE_ERROR_MESSAGE = "Exception invoking service"; + private static final String SERVICE_INVOKE_ERROR_MESSAGE = Messages.RegistrySharedObject_EXCEPTION_INVOKING_SERVICE; private static final int SERVICE_INVOKE_ERROR_CODE = 208; - private static final String HANDLE_REQUEST_ERROR_MESSAGE = "Exception locally invoking remote call"; + private static final String HANDLE_REQUEST_ERROR_MESSAGE = Messages.RegistrySharedObject_EXCEPTION_LOCALLY_INVOKING_REMOTE_CALL; private static final int HANDLE_REQUEST_ERROR_CODE = 209; - private static final String CALL_RESPONSE = "handleCallResponse"; + private static final String CALL_RESPONSE = "handleCallResponse"; //$NON-NLS-1$ - private static final String CALL_RESPONSE_ERROR_MESSAGE = "Exception sending response"; + private static final String CALL_RESPONSE_ERROR_MESSAGE = Messages.RegistrySharedObject_EXCEPTION_SENDING_RESPONSE; private static final int CALL_RESPONSE_ERROR_CODE = 210; - private static final String REQUEST_NOT_FOUND_ERROR_MESSAGE = "request not found for received response"; + private static final String REQUEST_NOT_FOUND_ERROR_MESSAGE = Messages.RegistrySharedObject_EXCEPTION_REQUEST_NOT_FOUND; private static final int REQUEST_NOT_FOUND_ERROR_CODE = 211; private static final long RESPONSE_WAIT_INTERVAL = 5000; - private static final String ADD_REGISTRATION = "handleAddRegistration"; + private static final String ADD_REGISTRATION = "handleAddRegistration"; //$NON-NLS-1$ - private static final String ADD_REGISTRATION_ERROR_MESSAGE = "exception sending add service registration message"; + private static final String ADD_REGISTRATION_ERROR_MESSAGE = Messages.RegistrySharedObject_EXCEPTION_SENDING_ADD_SERVICE; private static final int ADD_REGISTRATION_ERROR_CODE = 212; - private static final String REGISTRY_UPDATE_REQUEST = "handleRegistryUpdateRequest"; + private static final String REGISTRY_UPDATE_REQUEST = "handleRegistryUpdateRequest"; //$NON-NLS-1$ protected void sendRegistryUpdateRequest() { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendRegistryUpdateRequest"); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendRegistryUpdateRequest"); //$NON-NLS-1$ try { sendSharedObjectMsgTo(null, SharedObjectMsg.createMsg(REGISTRY_UPDATE_REQUEST, getLocalContainerID())); } catch (final IOException e) { log(CALL_RESPONSE_ERROR_CODE, CALL_RESPONSE_ERROR_MESSAGE, e); } - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendRegistryUpdateRequest"); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendRegistryUpdateRequest"); //$NON-NLS-1$ } protected void handleRegistryUpdateRequest(ID remoteContainerID) { @@ -510,13 +485,13 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } protected void sendAddRegistration(ID receiver, RemoteServiceRegistrationImpl reg) { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendAddRegistration", new Object[] {receiver, reg}); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendAddRegistration", new Object[] {receiver, reg}); //$NON-NLS-1$ try { sendSharedObjectMsgTo(receiver, SharedObjectMsg.createMsg(null, ADD_REGISTRATION, getLocalContainerID(), reg)); } catch (final IOException e) { log(ADD_REGISTRATION_ERROR_CODE, ADD_REGISTRATION_ERROR_MESSAGE, e); } - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendAddRegistration"); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendAddRegistration"); //$NON-NLS-1$ } protected void handleAddRegistration(ID remoteContainerID, final RemoteServiceRegistrationImpl registration) { @@ -553,7 +528,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer service = remoteServiceImpl.getProxy(); } catch (final ECFException e) { e.printStackTrace(); - log("localRegisterService", e); + log("localRegisterService", e); //$NON-NLS-1$ return; } final Hashtable properties = new Hashtable(); @@ -582,7 +557,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } protected long sendCallRequest(RemoteServiceRegistrationImpl remoteRegistration, final IRemoteCall call) throws IOException { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendCallRequest", new Object[] {remoteRegistration, call}); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendCallRequest", new Object[] {remoteRegistration, call}); //$NON-NLS-1$ final Request request = createRequest(remoteRegistration, call, null); addRequest(request); try { @@ -592,12 +567,12 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer throw e; } final long requestId = request.getRequestId(); - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendCallRequest", new Long(requestId)); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendCallRequest", new Long(requestId)); //$NON-NLS-1$ return requestId; } protected void handleCallRequest(Request request) { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "handleCallRequest", request); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "handleCallRequest", request); //$NON-NLS-1$ final ID responseTarget = request.getRequestContainerID(); final RemoteServiceRegistrationImpl localRegistration = getLocalRegistrationForRequest(request); // Else we've got a local service and we invoke it @@ -613,11 +588,11 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } // Now send response back to responseTarget (original requestor) sendCallResponse(responseTarget, response); - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "handleCallRequest"); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "handleCallRequest"); //$NON-NLS-1$ } protected void sendCallRequestWithListener(RemoteServiceRegistrationImpl remoteRegistration, IRemoteCall call, IRemoteCallListener listener) { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendCallRequestWithListener", new Object[] {remoteRegistration, call, listener}); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendCallRequestWithListener", new Object[] {remoteRegistration, call, listener}); //$NON-NLS-1$ final Request request = createRequest(remoteRegistration, call, listener); fireCallStartEvent(listener, request.getRequestId(), remoteRegistration.getReference(), call); try { @@ -628,17 +603,17 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer removeRequest(request); fireCallCompleteEvent(listener, request.getRequestId(), null, true, e); } - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendCallRequestWithListener"); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendCallRequestWithListener"); //$NON-NLS-1$ } protected void sendCallResponse(ID responseTarget, Response response) { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendCallResponse", new Object[] {responseTarget, response}); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendCallResponse", new Object[] {responseTarget, response}); //$NON-NLS-1$ try { sendSharedObjectMsgTo(responseTarget, SharedObjectMsg.createMsg(CALL_RESPONSE, response)); } catch (final IOException e) { log(CALL_RESPONSE_ERROR_CODE, CALL_RESPONSE_ERROR_MESSAGE, e); } - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendCallResponse"); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendCallResponse"); //$NON-NLS-1$ } protected void handleCallResponse(Response response) { @@ -647,32 +622,30 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer if (request == null) { log(REQUEST_NOT_FOUND_ERROR_CODE, REQUEST_NOT_FOUND_ERROR_MESSAGE, new NullPointerException()); return; - } else { - final IRemoteCallListener listener = request.getListener(); - if (listener != null) { - fireCallCompleteEvent(listener, request.getRequestId(), response.getResponse(), response.hadException(), response.getException()); - return; - } else { - synchronized (request) { - request.setResponse(response); - request.setDone(true); - request.notify(); - } - } + } + final IRemoteCallListener listener = request.getListener(); + if (listener != null) { + fireCallCompleteEvent(listener, request.getRequestId(), response.getResponse(), response.hadException(), response.getException()); + return; + } + synchronized (request) { + request.setResponse(response); + request.setDone(true); + request.notify(); } Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), CALL_RESPONSE); } protected Request sendFireRequest(RemoteServiceRegistrationImpl remoteRegistration, IRemoteCall call) throws ECFException { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendFireRequest", new Object[] {remoteRegistration, call}); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendFireRequest", new Object[] {remoteRegistration, call}); //$NON-NLS-1$ final Request request = createRequest(remoteRegistration, call, null); try { sendSharedObjectMsgTo(remoteRegistration.getContainerID(), SharedObjectMsg.createMsg(FIRE_REQUEST, request)); } catch (final IOException e) { log(FIRE_REQUEST_ERROR_CODE, FIRE_REQUEST_ERROR_MESSAGE, e); - throw new ECFException("IOException sending remote request", e); + throw new ECFException(Messages.RegistrySharedObject_EXCEPTION_SENDING_REMOTE_REQUEST, e); } - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendFireRequest", request); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendFireRequest", request); //$NON-NLS-1$ return request; } @@ -690,7 +663,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } protected void sendUnregister(RemoteServiceRegistrationImpl serviceRegistration) { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendUnregister", new Object[] {serviceRegistration}); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "sendUnregister", new Object[] {serviceRegistration}); //$NON-NLS-1$ synchronized (localRegistry) { localRegistry.unpublishService(serviceRegistration); final ID containerID = serviceRegistration.getContainerID(); @@ -701,7 +674,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer log(UNREGISTER_ERROR_CODE, UNREGISTER_ERROR_MESSAGE, e); } } - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendUnregister"); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "sendUnregister"); //$NON-NLS-1$ } private void unregisterServiceRegistrationsForContainer(ID containerID) { @@ -715,7 +688,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer serviceRegistration.unregister(); } catch (Exception e) { // Simply log - log("unregister", e); + log("unregister", e); //$NON-NLS-1$ } } } @@ -730,7 +703,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } protected void handleUnregister(ID containerID, Long serviceId) { - Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "handleUnregister", new Object[] {containerID, serviceId}); + Trace.entering(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_ENTERING, this.getClass(), "handleUnregister", new Object[] {containerID, serviceId}); //$NON-NLS-1$ synchronized (remoteRegistrys) { // get registry for given containerID final RemoteServiceRegistryImpl serviceRegistry = (RemoteServiceRegistryImpl) remoteRegistrys.get(containerID); @@ -743,7 +716,7 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } } } - Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "handleUnregister"); + Trace.exiting(Activator.PLUGIN_ID, IRemoteServiceProviderDebugOptions.METHODS_EXITING, this.getClass(), "handleUnregister"); //$NON-NLS-1$ } protected IRemoteServiceUnregisteredEvent createUnregisteredEvent(final RemoteServiceRegistrationImpl registration) { @@ -762,10 +735,10 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } public String toString() { - final StringBuffer buf = new StringBuffer("RemoteServiceUnregisteredEvent["); - buf.append("containerID=").append(registration.getContainerID()); - buf.append(";clazzes=").append(Arrays.asList(registration.getClasses())); - buf.append(";reference=").append(registration.getReference()).append("]"); + final StringBuffer buf = new StringBuffer("RemoteServiceUnregisteredEvent["); //$NON-NLS-1$ + buf.append("containerID=").append(registration.getContainerID()); //$NON-NLS-1$ + buf.append(";clazzes=").append(Arrays.asList(registration.getClasses())); //$NON-NLS-1$ + buf.append(";reference=").append(registration.getReference()).append("]"); //$NON-NLS-1$ //$NON-NLS-2$ return buf.toString(); } }; @@ -787,10 +760,10 @@ public class RegistrySharedObject extends BaseSharedObject implements IRemoteSer } public String toString() { - final StringBuffer buf = new StringBuffer("RemoteServiceRegisteredEvent["); - buf.append("containerID=").append(registration.getContainerID()); - buf.append(";clazzes=").append(Arrays.asList(registration.getClasses())); - buf.append(";reference=").append(registration.getReference()).append("]"); + final StringBuffer buf = new StringBuffer("RemoteServiceRegisteredEvent["); //$NON-NLS-1$ + buf.append("containerID=").append(registration.getContainerID()); //$NON-NLS-1$ + buf.append(";clazzes=").append(Arrays.asList(registration.getClasses())); //$NON-NLS-1$ + buf.append(";reference=").append(registration.getReference()).append("]"); //$NON-NLS-1$ //$NON-NLS-2$ return buf.toString(); } }; diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerAdapterFactory.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerAdapterFactory.java index 9553f7685..7463b230a 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerAdapterFactory.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerAdapterFactory.java @@ -9,13 +9,10 @@ package org.eclipse.ecf.provider.remoteservice.generic; import org.eclipse.ecf.core.identity.ID; -import org.eclipse.ecf.core.sharedobject.AbstractSharedObjectContainerAdapterFactory; -import org.eclipse.ecf.core.sharedobject.ISharedObject; -import org.eclipse.ecf.core.sharedobject.ISharedObjectContainer; +import org.eclipse.ecf.core.sharedobject.*; import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter; -public class RemoteServiceContainerAdapterFactory extends - AbstractSharedObjectContainerAdapterFactory { +public class RemoteServiceContainerAdapterFactory extends AbstractSharedObjectContainerAdapterFactory { /* * (non-Javadoc) @@ -23,17 +20,15 @@ public class RemoteServiceContainerAdapterFactory extends * @see org.eclipse.ecf.core.sharedobject.AbstractSharedObjectContainerAdapterFactory#createAdapter(org.eclipse.ecf.core.sharedobject.ISharedObjectContainer, * java.lang.Class, org.eclipse.ecf.core.identity.ID) */ - protected ISharedObject createAdapter(ISharedObjectContainer container, - Class adapterType, ID adapterID) { + protected ISharedObject createAdapter(ISharedObjectContainer container, Class adapterType, ID adapterID) { if (adapterType.equals(IRemoteServiceContainerAdapter.class)) { return new RegistrySharedObject(); - } else { - return null; } + return null; } public Class[] getAdapterList() { - return new Class[] { IRemoteServiceContainerAdapter.class }; + return new Class[] {IRemoteServiceContainerAdapter.class}; } } diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceImpl.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceImpl.java index b5a291fa3..3edab05aa 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceImpl.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceImpl.java @@ -15,6 +15,7 @@ import java.lang.reflect.Proxy; import org.eclipse.ecf.core.util.AsyncResult; import org.eclipse.ecf.core.util.ECFException; import org.eclipse.ecf.core.util.IAsyncResult; +import org.eclipse.ecf.internal.provider.remoteservice.Messages; import org.eclipse.ecf.remoteservice.IRemoteCall; import org.eclipse.ecf.remoteservice.IRemoteCallListener; import org.eclipse.ecf.remoteservice.IRemoteService; @@ -76,7 +77,7 @@ public class RemoteServiceImpl implements IRemoteService, InvocationHandler { cs[i] = Class.forName(clazzes[i]); proxy = Proxy.newProxyInstance(this.getClass().getClassLoader(), cs, this); } catch (final Exception e) { - throw new ECFException("Exception creating proxy for remote service", e); + throw new ECFException(Messages.RemoteServiceImpl_EXCEPTION_CREATING_PROXY, e); } return proxy; } diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceReferenceImpl.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceReferenceImpl.java index cda4c5019..118433fad 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceReferenceImpl.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceReferenceImpl.java @@ -55,9 +55,9 @@ public class RemoteServiceReferenceImpl implements IRemoteServiceReference { } public String toString() { - StringBuffer buf = new StringBuffer("RemoteServiceReferenceImpl["); - buf.append("class=").append(getRemoteClass()).append(";"); - buf.append("registration=").append(getRegistration()).append("]"); + StringBuffer buf = new StringBuffer("RemoteServiceReferenceImpl["); //$NON-NLS-1$ + buf.append("class=").append(getRemoteClass()).append(";"); //$NON-NLS-1$ //$NON-NLS-2$ + buf.append("registration=").append(getRegistration()).append("]"); //$NON-NLS-1$ //$NON-NLS-2$ return buf.toString(); } } diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistrationImpl.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistrationImpl.java index d050cd66a..0b90d2da5 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistrationImpl.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistrationImpl.java @@ -10,18 +10,13 @@ package org.eclipse.ecf.provider.remoteservice.generic; import java.io.Serializable; import java.lang.reflect.Array; -import java.util.Arrays; -import java.util.Dictionary; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Vector; - +import java.util.*; import org.eclipse.ecf.core.identity.ID; +import org.eclipse.ecf.internal.provider.remoteservice.Messages; import org.eclipse.ecf.remoteservice.IRemoteServiceReference; import org.eclipse.ecf.remoteservice.IRemoteServiceRegistration; -public class RemoteServiceRegistrationImpl implements - IRemoteServiceRegistration, Serializable { +public class RemoteServiceRegistrationImpl implements IRemoteServiceRegistration, Serializable { private static final long serialVersionUID = -3206899332723536545L; @@ -58,20 +53,19 @@ public class RemoteServiceRegistrationImpl implements protected transient RegistrySharedObject sharedObject = null; public RemoteServiceRegistrationImpl() { + // } - public void publish(RegistrySharedObject sharedObject, - RemoteServiceRegistryImpl registry, Object service, - String[] clazzes, Dictionary properties) { - this.sharedObject = sharedObject; - this.service = service; - this.clazzes = clazzes; + public void publish(RegistrySharedObject sharedObject1, RemoteServiceRegistryImpl registry, Object svc, String[] clzzes, Dictionary props) { + this.sharedObject = sharedObject1; + this.service = svc; + this.clazzes = clzzes; this.containerID = registry.getContainerID(); this.reference = new RemoteServiceReferenceImpl(this); synchronized (registry) { serviceid = registry.getNextServiceId(); - this.properties = createProperties(properties); + this.properties = createProperties(props); registry.publishService(this); } } @@ -101,7 +95,7 @@ public class RemoteServiceRegistrationImpl implements synchronized (registrationLock) { /* in the process of unregistering */ if (state != REGISTERED) { - throw new IllegalStateException("Service already registered"); + throw new IllegalStateException(Messages.RemoteServiceRegistrationImpl_EXCEPTION_SERVICE_ALREADY_REGISTERED); } this.properties = createProperties(properties); } @@ -124,21 +118,17 @@ public class RemoteServiceRegistrationImpl implements * @return A Properties object for this ServiceRegistration. */ protected Properties createProperties(Dictionary props) { - final Properties properties = new Properties(props); + final Properties resultProps = new Properties(props); - properties.setProperty(RemoteServiceRegistryImpl.REMOTEOBJECTCLASS, - clazzes); + resultProps.setProperty(RemoteServiceRegistryImpl.REMOTEOBJECTCLASS, clazzes); - properties.setProperty(RemoteServiceRegistryImpl.REMOTESERVICE_ID, - new Long(serviceid)); + resultProps.setProperty(RemoteServiceRegistryImpl.REMOTESERVICE_ID, new Long(serviceid)); - final Object ranking = properties - .getProperty(RemoteServiceRegistryImpl.REMOTESERVICE_RANKING); + final Object ranking = resultProps.getProperty(RemoteServiceRegistryImpl.REMOTESERVICE_RANKING); - serviceranking = (ranking instanceof Integer) ? ((Integer) ranking) - .intValue() : 0; + serviceranking = (ranking instanceof Integer) ? ((Integer) ranking).intValue() : 0; - return (properties); + return (resultProps); } static class Properties extends Hashtable { @@ -258,8 +248,7 @@ public class RemoteServiceRegistrationImpl implements } // must use reflection because Object clone method is protected!! try { - return (clazz.getMethod("clone", (Class[]) null).invoke(value, - (Object[]) null)); + return (clazz.getMethod("clone", (Class[]) null).invoke(value, (Object[]) null)); //$NON-NLS-1$ } catch (final Exception e) { /* clone is not a public method on value's class */ } catch (final Error e) { @@ -332,15 +321,15 @@ public class RemoteServiceRegistrationImpl implements public Object callService(RemoteCallImpl call) throws Exception { return call.invoke(service); } - + public String toString() { - StringBuffer buf = new StringBuffer("RemoteServiceRegistrationImpl["); - buf.append("containerID=").append(containerID).append(";"); - buf.append("serviceid=").append(serviceid).append(";"); - buf.append("serviceranking=").append(serviceranking).append(";"); - buf.append("classes=").append(Arrays.asList(clazzes)).append(";"); - buf.append("state=").append(state).append(";"); - buf.append("sharedobject=").append(sharedObject).append("]"); + StringBuffer buf = new StringBuffer("RemoteServiceRegistrationImpl["); //$NON-NLS-1$ + buf.append("containerID=").append(containerID).append(";"); //$NON-NLS-1$ //$NON-NLS-2$ + buf.append("serviceid=").append(serviceid).append(";"); //$NON-NLS-1$ //$NON-NLS-2$ + buf.append("serviceranking=").append(serviceranking).append(";"); //$NON-NLS-1$ //$NON-NLS-2$ + buf.append("classes=").append(Arrays.asList(clazzes)).append(";"); //$NON-NLS-1$ //$NON-NLS-2$ + buf.append("state=").append(state).append(";"); //$NON-NLS-1$ //$NON-NLS-2$ + buf.append("sharedobject=").append(sharedObject).append("]"); //$NON-NLS-1$ //$NON-NLS-2$ return buf.toString(); } diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistryImpl.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistryImpl.java index f56381448..157bb0ec2 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistryImpl.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceRegistryImpl.java @@ -9,15 +9,9 @@ package org.eclipse.ecf.provider.remoteservice.generic; import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; - +import java.util.*; import org.eclipse.ecf.core.identity.ID; -import org.eclipse.ecf.remoteservice.Constants; -import org.eclipse.ecf.remoteservice.IRemoteFilter; -import org.eclipse.ecf.remoteservice.IRemoteServiceReference; -import org.eclipse.ecf.remoteservice.IRemoteServiceRegistration; +import org.eclipse.ecf.remoteservice.*; public class RemoteServiceRegistryImpl implements Serializable { @@ -34,6 +28,7 @@ public class RemoteServiceRegistryImpl implements Serializable { protected ID containerID; public RemoteServiceRegistryImpl() { + // } /** @@ -62,15 +57,13 @@ public class RemoteServiceRegistryImpl implements Serializable { // Add the ServiceRegistration to the list of Services published by // Class Name. - final String[] clazzes = (String[]) serviceReg.getReference() - .getProperty(REMOTEOBJECTCLASS); + final String[] clazzes = (String[]) serviceReg.getReference().getProperty(REMOTEOBJECTCLASS); final int size = clazzes.length; for (int i = 0; i < size; i++) { final String clazz = clazzes[i]; - ArrayList services = (ArrayList) publishedServicesByClass - .get(clazz); + ArrayList services = (ArrayList) publishedServicesByClass.get(clazz); if (services == null) { services = new ArrayList(10); @@ -88,14 +81,12 @@ public class RemoteServiceRegistryImpl implements Serializable { // Remove the ServiceRegistration from the list of Services published by // Class Name. - final String[] clazzes = (String[]) serviceReg.getReference() - .getProperty(REMOTEOBJECTCLASS); + final String[] clazzes = (String[]) serviceReg.getReference().getProperty(REMOTEOBJECTCLASS); final int size = clazzes.length; for (int i = 0; i < size; i++) { final String clazz = clazzes[i]; - final ArrayList services = (ArrayList) publishedServicesByClass - .get(clazz); + final ArrayList services = (ArrayList) publishedServicesByClass.get(clazz); services.remove(serviceReg); } @@ -110,8 +101,7 @@ public class RemoteServiceRegistryImpl implements Serializable { allPublishedServices.clear(); } - public IRemoteServiceReference[] lookupServiceReferences(String clazz, - IRemoteFilter filter) { + public IRemoteServiceReference[] lookupServiceReferences(String clazz, IRemoteFilter filter) { int size; ArrayList references; ArrayList serviceRegs; @@ -134,11 +124,9 @@ public class RemoteServiceRegistryImpl implements Serializable { references = new ArrayList(size); for (int i = 0; i < size; i++) { - final IRemoteServiceRegistration registration = (IRemoteServiceRegistration) serviceRegs - .get(i); + final IRemoteServiceRegistration registration = (IRemoteServiceRegistration) serviceRegs.get(i); - final IRemoteServiceReference reference = registration - .getReference(); + final IRemoteServiceReference reference = registration.getReference(); if ((filter == null) || filter.match(reference)) { // Must be RemoteServiceReferenceImpl final RemoteServiceReferenceImpl impl = (RemoteServiceReferenceImpl) reference; @@ -151,8 +139,7 @@ public class RemoteServiceRegistryImpl implements Serializable { return null; } - return (IRemoteServiceReference[]) references - .toArray(new RemoteServiceReferenceImpl[references.size()]); + return (IRemoteServiceReference[]) references.toArray(new RemoteServiceReferenceImpl[references.size()]); } @@ -167,11 +154,9 @@ public class RemoteServiceRegistryImpl implements Serializable { references = new ArrayList(size); for (int i = 0; i < size; i++) { - final IRemoteServiceRegistration registration = (IRemoteServiceRegistration) allPublishedServices - .get(i); + final IRemoteServiceRegistration registration = (IRemoteServiceRegistration) allPublishedServices.get(i); - final IRemoteServiceReference reference = registration - .getReference(); + final IRemoteServiceReference reference = registration.getReference(); references.add(reference); } @@ -179,21 +164,16 @@ public class RemoteServiceRegistryImpl implements Serializable { return null; } - return (IRemoteServiceReference[]) references - .toArray(new RemoteServiceReferenceImpl[references.size()]); + return (IRemoteServiceReference[]) references.toArray(new RemoteServiceReferenceImpl[references.size()]); } protected RemoteServiceRegistrationImpl[] getRegistrations() { - return (RemoteServiceRegistrationImpl[]) allPublishedServices - .toArray(new RemoteServiceRegistrationImpl[allPublishedServices - .size()]); + return (RemoteServiceRegistrationImpl[]) allPublishedServices.toArray(new RemoteServiceRegistrationImpl[allPublishedServices.size()]); } - protected RemoteServiceRegistrationImpl findRegistrationForServiceId( - long serviceId) { + protected RemoteServiceRegistrationImpl findRegistrationForServiceId(long serviceId) { for (final Iterator i = allPublishedServices.iterator(); i.hasNext();) { - final RemoteServiceRegistrationImpl reg = (RemoteServiceRegistrationImpl) i - .next(); + final RemoteServiceRegistrationImpl reg = (RemoteServiceRegistrationImpl) i.next(); if (serviceId == reg.getServiceId()) { return reg; } @@ -202,9 +182,8 @@ public class RemoteServiceRegistryImpl implements Serializable { } public String toString() { - final StringBuffer buf = new StringBuffer("RemoteServiceRegistryImpl["); - buf.append("all=").append(allPublishedServices).append(";").append( - "byclass=").append(publishedServicesByClass).append("]"); + final StringBuffer buf = new StringBuffer("RemoteServiceRegistryImpl["); //$NON-NLS-1$ + buf.append("all=").append(allPublishedServices).append(";").append("byclass=").append(publishedServicesByClass).append("]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ return buf.toString(); } diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/Request.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/Request.java index 2cd563c6e..fdd29dd89 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/Request.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/Request.java @@ -83,12 +83,12 @@ public class Request implements Serializable { } public String toString() { - final StringBuffer buf = new StringBuffer("Request["); - buf.append("requestId=").append(requestId).append(";cont=").append( - requestContainerID).append(";serviceId=").append(serviceId) - .append(";call=").append(call).append(";done=").append(done) - .append(";response=").append(response).append(";listener=") - .append(listener).append("]"); + final StringBuffer buf = new StringBuffer("Request["); //$NON-NLS-1$ + buf.append("requestId=").append(requestId).append(";cont=").append( //$NON-NLS-1$ //$NON-NLS-2$ + requestContainerID).append(";serviceId=").append(serviceId) //$NON-NLS-1$ + .append(";call=").append(call).append(";done=").append(done) //$NON-NLS-1$ //$NON-NLS-2$ + .append(";response=").append(response).append(";listener=") //$NON-NLS-1$ //$NON-NLS-2$ + .append(listener).append("]"); //$NON-NLS-1$ return buf.toString(); } diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/Response.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/Response.java index 02fea42e9..8e0723ee8 100644 --- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/Response.java +++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/Response.java @@ -47,9 +47,9 @@ public class Response implements Serializable { } public String toString() { - final StringBuffer buf = new StringBuffer("Response["); - buf.append("requestId=").append(requestId).append(";response=").append( - response).append(";exception=").append(exception).append("]"); + final StringBuffer buf = new StringBuffer("Response["); //$NON-NLS-1$ + buf.append("requestId=").append(requestId).append(";response=").append( //$NON-NLS-1$ //$NON-NLS-2$ + response).append(";exception=").append(exception).append("]"); //$NON-NLS-1$ //$NON-NLS-2$ return buf.toString(); } } |