diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-08-12 15:50:25 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-08-12 15:50:25 -0230 |
| commit | 2f5c841cfce2ae5ff26e2e373c3ea7188da8b75b (patch) | |
| tree | b460e22e91a9fbb9cfb71631303963fa94dd2c9c /java | |
| parent | ICE-5492 Tcp Loopback Fast Path for C#/C++ on Windows (diff) | |
| download | ice-2f5c841cfce2ae5ff26e2e373c3ea7188da8b75b.tar.bz2 ice-2f5c841cfce2ae5ff26e2e373c3ea7188da8b75b.tar.xz ice-2f5c841cfce2ae5ff26e2e373c3ea7188da8b75b.zip | |
Added eclipse project settings for java.
Fix lots of warnings in Ice for Java.
Diffstat (limited to 'java')
382 files changed, 3329 insertions, 993 deletions
diff --git a/java/.classpath b/java/.classpath new file mode 100644 index 00000000000..52fa997f441 --- /dev/null +++ b/java/.classpath @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry excluding="ant/|test/**/lambda/*|test/android/|test/ejb/|test/Ice/translator/|test/Ice/translator/Test/" kind="src" path="src"/> + <classpathentry kind="src" path="generated"/> + <classpathentry kind="src" path="generated.test"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Ice3rdPartyWin"/> + <classpathentry kind="output" path="lib"/> +</classpath> diff --git a/java/.externalToolBuilders/Slice.launch b/java/.externalToolBuilders/Slice.launch new file mode 100644 index 00000000000..3cc27d208e7 --- /dev/null +++ b/java/.externalToolBuilders/Slice.launch @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> +<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="generate,freeze-generate,test-generate,"/> +<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean-generated,"/> +<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="generate,freeze-generate,test-generate,"/> +<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> +<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> +<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/> +<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ice"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/ice/slice" type="2"/> <item path="/ice/test/Slice" type="2"/> </resources>}"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${project_loc}/build.xml"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,clean"/> +<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> +</launchConfiguration> diff --git a/java/.project b/java/.project new file mode 100644 index 00000000000..7666f37c4cd --- /dev/null +++ b/java/.project @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>ice</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <arguments> + <dictionary> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/Slice.launch</value> + </dictionary> + <dictionary> + <key>incclean</key> + <value>true</value> + </dictionary> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.zeroc.Slice2JavaPlugin.Slice2JavaNature</nature> + </natures> + <linkedResources> + <link> + <name>slice</name> + <type>2</type> + <locationURI>PARENT-1-PROJECT_LOC/slice</locationURI> + </link> + <link> + <name>src/test</name> + <type>2</type> + <locationURI>PROJECT_LOC/test</locationURI> + </link> + </linkedResources> +</projectDescription> diff --git a/java/.settings/org.eclipse.jdt.core.prefs b/java/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..9060ba01e38 --- /dev/null +++ b/java/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,373 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +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_annotation=0 +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_method_declaration=0 +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_resources_in_try=80 +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.alignment_for_union_type_in_multicatch=16 +org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=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=next_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=next_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert +org.eclipse.jdt.core.formatter.comment.line_length=80 +org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true +org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true +org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false +org.eclipse.jdt.core.formatter.compact_else_if=true +org.eclipse.jdt.core.formatter.continuation_indentation=2 +org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 +org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off +org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on +org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false +org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true +org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false +org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true +org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false +org.eclipse.jdt.core.formatter.indentation.size=8 +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=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=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=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=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=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert +org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert +org.eclipse.jdt.core.formatter.join_lines_in_comments=true +org.eclipse.jdt.core.formatter.join_wrapped_lines=true +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false +org.eclipse.jdt.core.formatter.lineSplit=120 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_on_off_tags=false +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=true +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true diff --git a/java/.settings/org.eclipse.jdt.ui.prefs b/java/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 00000000000..74e568e0217 --- /dev/null +++ b/java/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +formatter_profile=_ZeroC +formatter_settings_version=12 diff --git a/java/build.xml b/java/build.xml index 4ea685cdc3a..4a6fd537272 100644 --- a/java/build.xml +++ b/java/build.xml @@ -1034,4 +1034,17 @@ <ant inheritAll="false" dir="test" target="clean"/> </target> + <target name="clean-generated" depends="config-init"> + <delete includeemptydirs="true"> + <fileset dir="${generated.dir}" includes="**/*"/> + </delete> + <delete includeemptydirs="true"> + <fileset dir="${generated.test.dir}" includes="**/*"/> + </delete> + <!-- <delete deleteonexit="true" dir="${lib.dir}"/> --> + <delete dir="${cache.dir}"/> + <!-- <ant inheritAll="false" dir="demo" target="clean-generated"/> --> + <!-- <ant inheritAll="false" dir="test" target="clean-generated"/> --> + </target> + </project> diff --git a/java/src/IceGridGUI/AdapterObserverI.java b/java/src/IceGridGUI/AdapterObserverI.java index a94f9500967..7b92ad11acb 100644 --- a/java/src/IceGridGUI/AdapterObserverI.java +++ b/java/src/IceGridGUI/AdapterObserverI.java @@ -20,6 +20,7 @@ class AdapterObserverI extends _AdapterObserverDisp _trace = coordinator.traceObservers(); } + @Override public synchronized void adapterInit(final AdapterInfo[] adapters, Ice.Current current) { if(_trace) @@ -42,6 +43,7 @@ class AdapterObserverI extends _AdapterObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.adapterInit(adapters); @@ -49,6 +51,7 @@ class AdapterObserverI extends _AdapterObserverDisp }); } + @Override public void adapterAdded(final AdapterInfo info, Ice.Current current) { if(_trace) @@ -58,6 +61,7 @@ class AdapterObserverI extends _AdapterObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.adapterAdded(info); @@ -65,6 +69,7 @@ class AdapterObserverI extends _AdapterObserverDisp }); } + @Override public void adapterUpdated(final AdapterInfo info, Ice.Current current) { if(_trace) @@ -74,6 +79,7 @@ class AdapterObserverI extends _AdapterObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.adapterUpdated(info); @@ -81,6 +87,7 @@ class AdapterObserverI extends _AdapterObserverDisp }); } + @Override public void adapterRemoved(final String id, Ice.Current current) { if(_trace) @@ -90,6 +97,7 @@ class AdapterObserverI extends _AdapterObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.adapterRemoved(id); diff --git a/java/src/IceGridGUI/AdminRouter.java b/java/src/IceGridGUI/AdminRouter.java index c4db76e8e0f..4d4d9557e88 100644 --- a/java/src/IceGridGUI/AdminRouter.java +++ b/java/src/IceGridGUI/AdminRouter.java @@ -13,6 +13,7 @@ import IceGrid.*; class AdminRouter extends Ice.Blobject { + @Override public boolean ice_invoke(byte[] inParams, Ice.ByteSeqHolder outParams, Ice.Current current) { if(_admin == null) diff --git a/java/src/IceGridGUI/Application/AbstractServerEditor.java b/java/src/IceGridGUI/Application/AbstractServerEditor.java index dfc4e0d7935..9b55bafc5c5 100644 --- a/java/src/IceGridGUI/Application/AbstractServerEditor.java +++ b/java/src/IceGridGUI/Application/AbstractServerEditor.java @@ -10,18 +10,7 @@ package IceGridGUI.Application; import javax.swing.JOptionPane; -import javax.swing.JTextField; -import javax.swing.JToolBar; - -import com.jgoodies.looks.Options; -import com.jgoodies.looks.HeaderStyle; -import com.jgoodies.looks.BorderStyle; -import com.jgoodies.looks.plastic.PlasticLookAndFeel; - -import com.jgoodies.forms.builder.DefaultFormBuilder; - import IceGrid.*; -import IceGridGUI.*; // // Base class for ServerEditor and ServerInstanceEditor @@ -32,12 +21,14 @@ abstract class AbstractServerEditor extends Editor abstract protected void writeDescriptor(); abstract protected boolean isSimpleUpdate(); + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Server Properties"); } + @Override protected boolean applyUpdate(boolean refresh) { Root root = _target.getRoot(); @@ -90,7 +81,7 @@ abstract class AbstractServerEditor extends Editor // // Success // - _target = (TreeNode)node.findChildWithDescriptor(server.getDescriptor()); + _target = node.findChildWithDescriptor(server.getDescriptor()); root.updated(); if(refresh) diff --git a/java/src/IceGridGUI/Application/Adapter.java b/java/src/IceGridGUI/Application/Adapter.java index cd8132e35ce..63be0308d4b 100644 --- a/java/src/IceGridGUI/Application/Adapter.java +++ b/java/src/IceGridGUI/Application/Adapter.java @@ -43,6 +43,7 @@ class Adapter extends TreeNode implements DescriptorHolder // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -63,6 +64,7 @@ class Adapter extends TreeNode implements DescriptorHolder return actions; } + @Override public void copy() { AdapterCopy copy = new AdapterCopy(); @@ -73,11 +75,13 @@ class Adapter extends TreeNode implements DescriptorHolder getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { ((TreeNode)_parent).paste(); } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -96,6 +100,7 @@ class Adapter extends TreeNode implements DescriptorHolder return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public Editor getEditor() { if(_editor == null) @@ -106,11 +111,13 @@ class Adapter extends TreeNode implements DescriptorHolder return _editor; } + @Override protected Editor createEditor() { return new AdapterEditor(); } + @Override public void destroy() { removeProperty(_descriptor.name + ".Endpoints"); @@ -120,16 +127,19 @@ class Adapter extends TreeNode implements DescriptorHolder ((Communicator)_parent).getAdapters().destroyChild(this); } + @Override Object getDescriptor() { return _descriptor; } + @Override public Object saveDescriptor() { return copyDescriptor(_descriptor); } + @Override public void restoreDescriptor(Object savedDescriptor) { AdapterDescriptor ad = (AdapterDescriptor)savedDescriptor; @@ -152,6 +162,7 @@ class Adapter extends TreeNode implements DescriptorHolder _parentProperties = parentProperties; } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -271,6 +282,7 @@ class Adapter extends TreeNode implements DescriptorHolder "${server}.${service}." + name: "${server}." + name; } + @Override public boolean isEphemeral() { return _ephemeral; diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java index 5ee99bfdb2d..007796ad7b2 100644 --- a/java/src/IceGridGUI/Application/AdapterEditor.java +++ b/java/src/IceGridGUI/Application/AdapterEditor.java @@ -19,7 +19,6 @@ import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; -import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JScrollPane; import javax.swing.JTextArea; @@ -50,6 +49,7 @@ class AdapterEditor extends CommunicatorChildEditor // Action gotoReplicaGroup = new AbstractAction("", Utils.getIcon("/icons/16x16/goto.png")) { + @Override public void actionPerformed(ActionEvent e) { Object obj = _replicaGroupId.getSelectedItem(); @@ -81,6 +81,7 @@ class AdapterEditor extends CommunicatorChildEditor Action checkRegisterProcess = new AbstractAction("Register Process") { + @Override public void actionPerformed(ActionEvent e) { updated(); @@ -97,6 +98,7 @@ class AdapterEditor extends CommunicatorChildEditor Action checkServerLifetime = new AbstractAction("Server Lifetime") { + @Override public void actionPerformed(ActionEvent e) { updated(); @@ -114,16 +116,19 @@ class AdapterEditor extends CommunicatorChildEditor _name.getDocument().addDocumentListener( new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { update(); } + @Override public void insertUpdate(DocumentEvent e) { update(); } + @Override public void removeUpdate(DocumentEvent e) { update(); @@ -180,6 +185,7 @@ class AdapterEditor extends CommunicatorChildEditor // From CommunicatorChildEditor // + @Override void writeDescriptor() { AdapterDescriptor descriptor = (AdapterDescriptor)getAdapter().getDescriptor(); @@ -194,6 +200,7 @@ class AdapterEditor extends CommunicatorChildEditor descriptor.allocatables = _allocatableList; } + @Override boolean isSimpleUpdate() { AdapterDescriptor descriptor = (AdapterDescriptor)getAdapter().getDescriptor(); @@ -201,11 +208,13 @@ class AdapterEditor extends CommunicatorChildEditor return descriptor.name.equals(_name.getText().trim()); } + @Override Communicator.ChildList getChildList() { return ((Communicator)_target.getParent()).getAdapters(); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Adapter Name" ); @@ -278,12 +287,14 @@ class AdapterEditor extends CommunicatorChildEditor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Adapter Properties"); } + @Override void postUpdate() { // @@ -405,6 +416,7 @@ class AdapterEditor extends CommunicatorChildEditor } } + @Override protected boolean validate() { // @@ -477,6 +489,7 @@ class AdapterEditor extends CommunicatorChildEditor _replicaGroupId.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { if(e.getStateChange() == ItemEvent.SELECTED) @@ -610,6 +623,7 @@ class AdapterEditor extends CommunicatorChildEditor private final Object DEFAULT_ADAPTER_ID = new Object() { + @Override public String toString() { return _defaultAdapterId; @@ -644,6 +658,7 @@ class AdapterEditor extends CommunicatorChildEditor static private final Object PUBLISH_ACTUAL = new Object() { + @Override public String toString() { return "Actual endpoints"; @@ -652,6 +667,7 @@ class AdapterEditor extends CommunicatorChildEditor static private final Object NOT_REPLICATED = new Object() { + @Override public String toString() { return "Does not belong to a replica group"; diff --git a/java/src/IceGridGUI/Application/ApplicationEditor.java b/java/src/IceGridGUI/Application/ApplicationEditor.java index 96718444102..2192e20ec43 100644 --- a/java/src/IceGridGUI/Application/ApplicationEditor.java +++ b/java/src/IceGridGUI/Application/ApplicationEditor.java @@ -9,11 +9,6 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JComboBox; import javax.swing.JOptionPane; @@ -30,6 +25,7 @@ import IceGridGUI.*; @SuppressWarnings("unchecked") class ApplicationEditor extends Editor { + @Override protected boolean applyUpdate(boolean refresh) { Root root = (Root)_target; @@ -115,6 +111,7 @@ class ApplicationEditor extends Editor } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Name"); @@ -153,6 +150,7 @@ class ApplicationEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); @@ -183,6 +181,7 @@ class ApplicationEditor extends Editor descriptor.distrib.directories = _distribDirs.getList(); } + @Override protected boolean validate() { return check(new String[]{"Name", _name.getText().trim()}); @@ -230,6 +229,7 @@ class ApplicationEditor extends Editor detectUpdates(true); } + @Override Utils.Resolver getDetailResolver() { if(_target.getCoordinator().substitute()) @@ -244,6 +244,7 @@ class ApplicationEditor extends Editor static private final Object NO_DISTRIB = new Object() { + @Override public String toString() { return "None selected"; diff --git a/java/src/IceGridGUI/Application/ArrayMapField.java b/java/src/IceGridGUI/Application/ArrayMapField.java index 43ac6ee97e5..f187607abd8 100644 --- a/java/src/IceGridGUI/Application/ArrayMapField.java +++ b/java/src/IceGridGUI/Application/ArrayMapField.java @@ -9,16 +9,13 @@ package IceGridGUI.Application; -import IceGrid.*; import IceGridGUI.*; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.DefaultCellEditor; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; @@ -57,6 +54,7 @@ public class ArrayMapField extends JTable Action deleteRow = new AbstractAction("Delete selected row(s)") { + @Override public void actionPerformed(ActionEvent e) { if(_editable) @@ -127,6 +125,7 @@ public class ArrayMapField extends JTable _model = new DefaultTableModel(vector, _columnNames) { + @Override public boolean isCellEditable(int row, int column) { return _editable; @@ -135,6 +134,7 @@ public class ArrayMapField extends JTable _model.addTableModelListener(new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { if(_editable) @@ -174,7 +174,7 @@ public class ArrayMapField extends JTable } @SuppressWarnings("unchecked") java.util.Vector<java.util.Vector<String>> vector = - (java.util.Vector<java.util.Vector<String>>)_model.getDataVector(); + _model.getDataVector(); java.util.TreeMap<String, String[]> result = new java.util.TreeMap<String, String[]>(); diff --git a/java/src/IceGridGUI/Application/Communicator.java b/java/src/IceGridGUI/Application/Communicator.java index 7f486d1a720..f657113b1e8 100644 --- a/java/src/IceGridGUI/Application/Communicator.java +++ b/java/src/IceGridGUI/Application/Communicator.java @@ -22,10 +22,12 @@ import IceGridGUI.*; // abstract class Communicator extends TreeNode implements DescriptorHolder { + @Override public Enumeration children() { return new Enumeration() { + @Override public boolean hasMoreElements() { if(_p.hasNext()) @@ -44,6 +46,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder return false; } + @Override public Object nextElement() { try @@ -68,11 +71,13 @@ abstract class Communicator extends TreeNode implements DescriptorHolder }; } + @Override public boolean getAllowsChildren() { return true; } + @Override public javax.swing.tree.TreeNode getChildAt(int childIndex) { if(childIndex < 0) @@ -94,6 +99,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder throw new ArrayIndexOutOfBoundsException(childIndex); } + @Override public int getChildCount() { int result = 0; @@ -104,6 +110,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder return result; } + @Override public int getIndex(javax.swing.tree.TreeNode node) { int offset = 0; @@ -122,6 +129,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder return -1; } + @Override public boolean isLeaf() { for(ChildList childList : _childListArray) @@ -138,26 +146,31 @@ abstract class Communicator extends TreeNode implements DescriptorHolder // Actions // + @Override public void newAdapter() { _adapters.newChild(); } + @Override public void newDbEnv() { _dbEnvs.newChild(); } + @Override public void newService() { _services.newChild(); } + @Override public void newServiceFromTemplate() { _services.newServiceFromTemplate(); } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -198,6 +211,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder return result; } + @Override TreeNode findChildLike(TreeNode other) { if(other instanceof Adapter) @@ -489,6 +503,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder } } + @Override void newChild() { AdapterDescriptor descriptor = new AdapterDescriptor( @@ -514,6 +529,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder return new Adapter(Communicator.this, name, ad, null, false); } */ + @Override TreeNode createChild(AdapterDescriptor descriptor) { String name = Utils.substitute(descriptor.name, getResolver()); @@ -574,6 +590,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder super(true); } + @Override void newChild() { DbEnvDescriptor descriptor = new DbEnvDescriptor( @@ -586,6 +603,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder } //TreeNode createChild(Object descriptor) + @Override TreeNode createChild(DbEnvDescriptor descriptor) { //DbEnvDescriptor dd = (DbEnvDescriptor)descriptor; @@ -618,6 +636,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder super(false); } + @Override void newChild() { ServiceDescriptor serviceDescriptor = @@ -690,6 +709,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder getCoordinator().showActions(child); } + @Override TreeNode createChild(ServiceInstanceDescriptor descriptor) throws UpdateFailedException { @@ -761,6 +781,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder } } + @Override void tryUpdate(TreeNode child) throws UpdateFailedException { @@ -868,7 +889,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder ServiceInstance obj = (ServiceInstance)p.next(); if(obj instanceof ServiceInstance) { - ServiceInstance service = (ServiceInstance)obj; + ServiceInstance service = obj; ServiceInstanceDescriptor d = (ServiceInstanceDescriptor)service.getDescriptor(); if(d.template.equals(template)) { diff --git a/java/src/IceGridGUI/Application/CommunicatorChildEditor.java b/java/src/IceGridGUI/Application/CommunicatorChildEditor.java index 62dc9e6aec0..b3e72b8f91d 100644 --- a/java/src/IceGridGUI/Application/CommunicatorChildEditor.java +++ b/java/src/IceGridGUI/Application/CommunicatorChildEditor.java @@ -11,9 +11,6 @@ package IceGridGUI.Application; import javax.swing.JOptionPane; -import IceGrid.*; -import IceGridGUI.*; - abstract class CommunicatorChildEditor extends Editor { abstract void writeDescriptor(); @@ -24,6 +21,7 @@ abstract class CommunicatorChildEditor extends Editor { } + @Override @SuppressWarnings("unchecked") protected boolean applyUpdate(boolean refresh) { diff --git a/java/src/IceGridGUI/Application/CommunicatorSubEditor.java b/java/src/IceGridGUI/Application/CommunicatorSubEditor.java index ad34ac4b425..66d1785e082 100644 --- a/java/src/IceGridGUI/Application/CommunicatorSubEditor.java +++ b/java/src/IceGridGUI/Application/CommunicatorSubEditor.java @@ -9,15 +9,8 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; import javax.swing.JScrollPane; import javax.swing.JTextArea; -import javax.swing.JTextField; - import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.layout.CellConstraints; diff --git a/java/src/IceGridGUI/Application/DbEnv.java b/java/src/IceGridGUI/Application/DbEnv.java index 21e8e488ea6..7f1743bf678 100644 --- a/java/src/IceGridGUI/Application/DbEnv.java +++ b/java/src/IceGridGUI/Application/DbEnv.java @@ -33,6 +33,7 @@ class DbEnv extends TreeNode implements DescriptorHolder return copy; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -53,6 +54,7 @@ class DbEnv extends TreeNode implements DescriptorHolder // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -73,17 +75,20 @@ class DbEnv extends TreeNode implements DescriptorHolder return actions; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { ((TreeNode)_parent).paste(); } + @Override public Editor getEditor() { if(_editor == null) @@ -94,11 +99,13 @@ class DbEnv extends TreeNode implements DescriptorHolder return _editor; } + @Override protected Editor createEditor() { return new DbEnvEditor(); } + @Override public Object getDescriptor() { return _descriptor; @@ -109,11 +116,13 @@ class DbEnv extends TreeNode implements DescriptorHolder return copyDescriptor(_descriptor); } + @Override public Object saveDescriptor() { return copyDescriptor(_descriptor); } + @Override public void restoreDescriptor(Object savedDescriptor) { DbEnvDescriptor clone = (DbEnvDescriptor)savedDescriptor; @@ -123,11 +132,13 @@ class DbEnv extends TreeNode implements DescriptorHolder _descriptor.properties = clone.properties; } + @Override public void destroy() { ((Communicator)_parent).getDbEnvs().destroyChild(this); } + @Override public boolean isEphemeral() { return _ephemeral; @@ -152,6 +163,7 @@ class DbEnv extends TreeNode implements DescriptorHolder } } + @Override void write(XMLWriter writer) throws java.io.IOException { diff --git a/java/src/IceGridGUI/Application/DbEnvEditor.java b/java/src/IceGridGUI/Application/DbEnvEditor.java index 7c20ab43b3a..f4c6dfcc531 100644 --- a/java/src/IceGridGUI/Application/DbEnvEditor.java +++ b/java/src/IceGridGUI/Application/DbEnvEditor.java @@ -9,11 +9,6 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JScrollPane; import javax.swing.JTextArea; @@ -44,6 +39,7 @@ class DbEnvEditor extends CommunicatorChildEditor _properties = new PropertiesField(this); } + @Override void writeDescriptor() { DbEnvDescriptor descriptor = (DbEnvDescriptor)getDbEnv().getDescriptor(); @@ -53,17 +49,20 @@ class DbEnvEditor extends CommunicatorChildEditor descriptor.properties = _properties.getProperties(); } + @Override boolean isSimpleUpdate() { DbEnvDescriptor descriptor = (DbEnvDescriptor)getDbEnv().getDescriptor(); return descriptor.name.equals(_name.getText().trim()); } + @Override Communicator.ChildList getChildList() { return ((Communicator)_target.getParent()).getDbEnvs(); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Name" ); @@ -100,12 +99,14 @@ class DbEnvEditor extends CommunicatorChildEditor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Database Environment Properties"); } + @Override protected boolean validate() { return check(new String[]{"Name", _name.getText().trim()}); @@ -189,6 +190,7 @@ class DbEnvEditor extends CommunicatorChildEditor static private final Object NO_DB_HOME = new Object() { + @Override public String toString() { return "Created by the IceGrid Node"; diff --git a/java/src/IceGridGUI/Application/Editor.java b/java/src/IceGridGUI/Application/Editor.java index 4450b5b75c5..48908b6f74b 100644 --- a/java/src/IceGridGUI/Application/Editor.java +++ b/java/src/IceGridGUI/Application/Editor.java @@ -13,28 +13,15 @@ import java.awt.BorderLayout; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.JButton; import javax.swing.JComponent; -import javax.swing.JLabel; import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JToolBar; - -import javax.swing.tree.TreePath; - import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.builder.ButtonBarBuilder; import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.factories.DefaultComponentFactory; -import com.jgoodies.forms.layout.FormLayout; -import com.jgoodies.forms.util.LayoutStyle; - -import IceGrid.*; import IceGridGUI.*; public class Editor extends EditorBase @@ -99,10 +86,12 @@ public class Editor extends EditorBase root.cancelEdit(); } + @Override protected void appendProperties(DefaultFormBuilder builder) { } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); @@ -118,6 +107,7 @@ public class Editor extends EditorBase // AbstractAction apply = new AbstractAction("Apply") { + @Override public void actionPerformed(ActionEvent e) { if(validate()) @@ -137,6 +127,7 @@ public class Editor extends EditorBase // AbstractAction discard = new AbstractAction("Discard") { + @Override public void actionPerformed(ActionEvent e) { discardUpdate(); @@ -148,16 +139,19 @@ public class Editor extends EditorBase _updateListener = new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { updated(); } + @Override public void insertUpdate(DocumentEvent e) { updated(); } + @Override public void removeUpdate(DocumentEvent e) { updated(); diff --git a/java/src/IceGridGUI/Application/ListTextField.java b/java/src/IceGridGUI/Application/ListTextField.java index 0ebce04fae4..a329cf14439 100644 --- a/java/src/IceGridGUI/Application/ListTextField.java +++ b/java/src/IceGridGUI/Application/ListTextField.java @@ -9,7 +9,6 @@ package IceGridGUI.Application; -import IceGrid.*; import IceGridGUI.*; import javax.swing.JTextField; @@ -30,6 +29,7 @@ public class ListTextField extends JTextField { Utils.Stringifier stringifier = new Utils.Stringifier() { + @Override public String toString(Object obj) { return Utils.substitute((String)obj, resolver); diff --git a/java/src/IceGridGUI/Application/ListTreeNode.java b/java/src/IceGridGUI/Application/ListTreeNode.java index bc6fa5f78cc..d5d6770ee2e 100644 --- a/java/src/IceGridGUI/Application/ListTreeNode.java +++ b/java/src/IceGridGUI/Application/ListTreeNode.java @@ -13,7 +13,6 @@ import javax.swing.tree.DefaultTreeModel; import java.util.Enumeration; -import IceGrid.*; import IceGridGUI.*; // @@ -21,15 +20,18 @@ import IceGridGUI.*; // abstract class ListTreeNode extends TreeNode { + @Override public Enumeration children() { return new Enumeration() { + @Override public boolean hasMoreElements() { return _p.hasNext(); } + @Override public Object nextElement() { return _p.next(); @@ -39,11 +41,13 @@ abstract class ListTreeNode extends TreeNode }; } + @Override public boolean getAllowsChildren() { return true; } + @Override public javax.swing.tree.TreeNode getChildAt(int childIndex) { if(childIndex < 0) @@ -60,21 +64,25 @@ abstract class ListTreeNode extends TreeNode } } + @Override public int getChildCount() { return _children.size(); } + @Override public int getIndex(javax.swing.tree.TreeNode node) { return _children.indexOf(node); } + @Override public boolean isLeaf() { return _children.isEmpty(); } + @Override public Editor getEditor() { if(_editor == null) @@ -84,6 +92,7 @@ abstract class ListTreeNode extends TreeNode return _editor; } + @Override protected Editor createEditor() { assert false; @@ -96,6 +105,7 @@ abstract class ListTreeNode extends TreeNode _editable = new Editable(brandNew); } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -169,6 +179,7 @@ abstract class ListTreeNode extends TreeNode // class ComboBoxModel extends javax.swing.AbstractListModel implements javax.swing.ComboBoxModel { + @Override public Object getElementAt(int index) { if(_firstItem != null) @@ -188,6 +199,7 @@ abstract class ListTreeNode extends TreeNode } } + @Override public int getSize() { if(_firstItem != null) @@ -200,11 +212,13 @@ abstract class ListTreeNode extends TreeNode } } + @Override public Object getSelectedItem() { return _selectedItem; } + @Override public void setSelectedItem(Object obj) { if(obj != _selectedItem) diff --git a/java/src/IceGridGUI/Application/Node.java b/java/src/IceGridGUI/Application/Node.java index 33c34c1d5a2..6ba82544034 100644 --- a/java/src/IceGridGUI/Application/Node.java +++ b/java/src/IceGridGUI/Application/Node.java @@ -13,14 +13,11 @@ import java.awt.Component; import java.util.Enumeration; import javax.swing.Icon; -import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPopupMenu; -import javax.swing.JTextField; import javax.swing.JTree; import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.DefaultTreeCellRenderer; import IceGrid.*; @@ -50,10 +47,12 @@ class Node extends TreeNode implements PropertySetParent return copy; } + @Override public Enumeration children() { return new Enumeration() { + @Override public boolean hasMoreElements() { if(!_p.hasNext()) @@ -69,6 +68,7 @@ class Node extends TreeNode implements PropertySetParent return true; } + @Override public Object nextElement() { return _p.next(); @@ -79,11 +79,13 @@ class Node extends TreeNode implements PropertySetParent }; } + @Override public boolean getAllowsChildren() { return true; } + @Override public javax.swing.tree.TreeNode getChildAt(int childIndex) { if(childIndex < 0) @@ -104,11 +106,13 @@ class Node extends TreeNode implements PropertySetParent } } + @Override public int getChildCount() { return _propertySets.size() + _servers.size(); } + @Override public int getIndex(javax.swing.tree.TreeNode node) { if(node instanceof PropertySet) @@ -126,6 +130,7 @@ class Node extends TreeNode implements PropertySetParent } } + @Override public boolean isLeaf() { return _propertySets.isEmpty() && _servers.isEmpty(); @@ -201,6 +206,7 @@ class Node extends TreeNode implements PropertySetParent getRoot().getTreeModel().nodesWereRemoved(this, new int[]{index}, new Object[]{child}); } + @Override public void insertPropertySet(PropertySet child, boolean fireEvent) throws UpdateFailedException { @@ -212,6 +218,7 @@ class Node extends TreeNode implements PropertySetParent } } + @Override public void removePropertySet(PropertySet child) { int index = getIndex(child); @@ -220,16 +227,19 @@ class Node extends TreeNode implements PropertySetParent getRoot().getTreeModel().nodesWereRemoved(this, new int[]{index}, new Object[]{child}); } + @Override public void removeDescriptor(String id) { _descriptor.propertySets.remove(id); } + @Override public Editable getEditable() { return _editable; } + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -258,6 +268,7 @@ class Node extends TreeNode implements PropertySetParent return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -274,12 +285,14 @@ class Node extends TreeNode implements PropertySetParent return _popup; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -321,20 +334,24 @@ class Node extends TreeNode implements PropertySetParent } } + @Override public void newPropertySet() { newPropertySet(new PropertySetDescriptor(new String[0], new java.util.LinkedList<PropertyDescriptor>())); } + @Override public void newServer() { newServer(PlainServer.newServerDescriptor()); } + @Override public void newServerIceBox() { newServer(PlainServer.newIceBoxDescriptor()); } + @Override public void newServerFromTemplate() { ServerInstanceDescriptor descriptor = @@ -348,6 +365,7 @@ class Node extends TreeNode implements PropertySetParent newServer(descriptor); } + @Override public void destroy() { Nodes nodes = (Nodes)_parent; @@ -364,6 +382,7 @@ class Node extends TreeNode implements PropertySetParent } } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -387,6 +406,7 @@ class Node extends TreeNode implements PropertySetParent return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public Editor getEditor() { if(_editor == null) @@ -397,16 +417,19 @@ class Node extends TreeNode implements PropertySetParent return _editor; } + @Override protected Editor createEditor() { return new NodeEditor(); } + @Override public boolean isEphemeral() { return _ephemeral; } + @Override Object getDescriptor() { return _descriptor; @@ -424,6 +447,7 @@ class Node extends TreeNode implements PropertySetParent _descriptor.variables = copy.variables; } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -1073,11 +1097,13 @@ class Node extends TreeNode implements PropertySetParent } } + @Override Utils.Resolver getResolver() { return _resolver; } + @Override public void tryAdd(String id, PropertySetDescriptor descriptor) throws UpdateFailedException { @@ -1085,6 +1111,7 @@ class Node extends TreeNode implements PropertySetParent _descriptor.propertySets.put(id, descriptor); } + @Override public void tryRename(String oldId, String oldId2, String newId) throws UpdateFailedException { diff --git a/java/src/IceGridGUI/Application/NodeEditor.java b/java/src/IceGridGUI/Application/NodeEditor.java index 481d0874ba9..d26c32bc8fe 100644 --- a/java/src/IceGridGUI/Application/NodeEditor.java +++ b/java/src/IceGridGUI/Application/NodeEditor.java @@ -9,20 +9,10 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JTextField; -import javax.swing.KeyStroke; - import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.layout.CellConstraints; @@ -31,12 +21,14 @@ import IceGridGUI.*; class NodeEditor extends Editor { + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Node Properties"); } + @Override protected boolean applyUpdate(boolean refresh) { Root root = _target.getRoot(); @@ -145,6 +137,7 @@ class NodeEditor extends Editor } } + @Override Utils.Resolver getDetailResolver() { if(_target.getCoordinator().substitute()) @@ -176,6 +169,7 @@ class NodeEditor extends Editor + "on Windows, IceGrid uses 1.0.<html>"); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Name"); @@ -224,6 +218,7 @@ class NodeEditor extends Editor descriptor.loadFactor = _loadFactor.getText().trim(); } + @Override protected boolean validate() { return check(new String[]{"Name", _name.getText().trim()}); diff --git a/java/src/IceGridGUI/Application/Nodes.java b/java/src/IceGridGUI/Application/Nodes.java index c2f6c4168fe..f8fc97f0912 100644 --- a/java/src/IceGridGUI/Application/Nodes.java +++ b/java/src/IceGridGUI/Application/Nodes.java @@ -9,13 +9,8 @@ package IceGridGUI.Application; -import java.awt.Component; - -import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPopupMenu; -import javax.swing.JTree; - import IceGrid.*; import IceGridGUI.*; @@ -32,6 +27,7 @@ class Nodes extends ListTreeNode return copy; } + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -45,6 +41,7 @@ class Nodes extends ListTreeNode return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -57,6 +54,7 @@ class Nodes extends ListTreeNode return _popup; } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -98,6 +96,7 @@ class Nodes extends ListTreeNode newNode(nd); } + @Override public void newNode() { newNode(new NodeDescriptor( @@ -300,6 +299,7 @@ class Nodes extends ListTreeNode _descriptors.remove(nodeName); } + @Override Object getDescriptor() { return _descriptors; diff --git a/java/src/IceGridGUI/Application/ParameterValuesField.java b/java/src/IceGridGUI/Application/ParameterValuesField.java index 18a3e4e48b5..ad4adb5c88c 100644 --- a/java/src/IceGridGUI/Application/ParameterValuesField.java +++ b/java/src/IceGridGUI/Application/ParameterValuesField.java @@ -9,24 +9,16 @@ package IceGridGUI.Application; -import IceGrid.*; import IceGridGUI.*; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.DefaultCellEditor; import javax.swing.JComboBox; import javax.swing.JTable; -import javax.swing.JTextField; -import javax.swing.KeyStroke; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellEditor; -import javax.swing.table.TableColumn; // // A special field used to show/edit parameter values @@ -84,7 +76,7 @@ public class ParameterValuesField extends JTable } else { - row.add(Utils.substitute((String)val, resolver)); + row.add(Utils.substitute(val, resolver)); } vector.add(row); i++; @@ -92,6 +84,7 @@ public class ParameterValuesField extends JTable _model = new DefaultTableModel(vector, _columnNames) { + @Override public boolean isCellEditable(int row, int column) { if(resolver == null) @@ -107,6 +100,7 @@ public class ParameterValuesField extends JTable _model.addTableModelListener(new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { _editor.updated(); @@ -132,7 +126,7 @@ public class ParameterValuesField extends JTable } java.util.Vector<java.util.Vector<String>> vector = - (java.util.Vector<java.util.Vector<String>>)_model.getDataVector(); + _model.getDataVector(); for(java.util.Vector<String> row : vector) { @@ -156,6 +150,7 @@ public class ParameterValuesField extends JTable return values; } + @Override public TableCellEditor getCellEditor(int row, int column) { if(column == 1) diff --git a/java/src/IceGridGUI/Application/ParametersField.java b/java/src/IceGridGUI/Application/ParametersField.java index 46503d7fa4f..80d68d737ef 100644 --- a/java/src/IceGridGUI/Application/ParametersField.java +++ b/java/src/IceGridGUI/Application/ParametersField.java @@ -9,9 +9,6 @@ package IceGridGUI.Application; -import IceGrid.*; -import IceGridGUI.*; - import java.awt.event.ActionEvent; import javax.swing.AbstractAction; @@ -19,11 +16,9 @@ import javax.swing.Action; import javax.swing.DefaultCellEditor; import javax.swing.JComboBox; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; -import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellEditor; import javax.swing.table.TableColumn; @@ -59,6 +54,7 @@ public class ParametersField extends JTable Action deleteRow = new AbstractAction("Delete selected row(s)") { + @Override public void actionPerformed(ActionEvent e) { if(isEditing()) @@ -118,6 +114,7 @@ public class ParametersField extends JTable _model.addTableModelListener(new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { Object lastKey = _model.getValueAt(_model.getRowCount() - 1 , 0); @@ -149,7 +146,7 @@ public class ParametersField extends JTable } @SuppressWarnings("unchecked") java.util.Vector<java.util.Vector<String>> vector = - (java.util.Vector<java.util.Vector<String>>)_model.getDataVector(); + _model.getDataVector(); for(java.util.Vector<String> row : vector) { diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/Application/PlainServer.java index 2e0d0a83630..774b346fc7a 100644 --- a/java/src/IceGridGUI/Application/PlainServer.java +++ b/java/src/IceGridGUI/Application/PlainServer.java @@ -15,7 +15,6 @@ import javax.swing.Icon; import javax.swing.JPopupMenu; import javax.swing.JTree; -import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.DefaultTreeCellRenderer; import IceGrid.*; @@ -114,6 +113,7 @@ class PlainServer extends Communicator implements Server // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -144,6 +144,7 @@ class PlainServer extends Communicator implements Server return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -159,12 +160,14 @@ class PlainServer extends Communicator implements Server return _popup; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public Editor getEditor() { if(_editor == null) @@ -175,11 +178,13 @@ class PlainServer extends Communicator implements Server return _editor; } + @Override protected Editor createEditor() { return new PlainServerEditor(); } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -211,6 +216,7 @@ class PlainServer extends Communicator implements Server return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public void destroy() { Node node = (Node)_parent; @@ -228,11 +234,13 @@ class PlainServer extends Communicator implements Server } } + @Override public Object getDescriptor() { return _descriptor; } + @Override public Object saveDescriptor() { ServerDescriptor clone = (ServerDescriptor)_descriptor.clone(); @@ -240,6 +248,7 @@ class PlainServer extends Communicator implements Server return clone; } + @Override public void restoreDescriptor(Object savedDescriptor) { shallowRestore((ServerDescriptor)savedDescriptor, _descriptor); @@ -327,6 +336,7 @@ class PlainServer extends Communicator implements Server } } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -374,11 +384,13 @@ class PlainServer extends Communicator implements Server } } + @Override boolean isIceBox() { return _descriptor instanceof IceBoxDescriptor; } + @Override public Object rebuild(java.util.List<Editable> editables) throws UpdateFailedException { @@ -433,6 +445,7 @@ class PlainServer extends Communicator implements Server return backup; } + @Override public void restore(Object backupObj) { Editable backup = (Editable)backupObj; @@ -498,26 +511,31 @@ class PlainServer extends Communicator implements Server } } + @Override CommunicatorDescriptor getCommunicatorDescriptor() { return _descriptor; } + @Override Utils.Resolver getResolver() { return _resolver; } + @Override public Editable getEditable() { return _editable; } + @Override Editable getEnclosingEditable() { return _editable; } + @Override public boolean isEphemeral() { return _ephemeral; diff --git a/java/src/IceGridGUI/Application/PlainServerEditor.java b/java/src/IceGridGUI/Application/PlainServerEditor.java index 63da967a368..74070353be0 100644 --- a/java/src/IceGridGUI/Application/PlainServerEditor.java +++ b/java/src/IceGridGUI/Application/PlainServerEditor.java @@ -11,16 +11,17 @@ package IceGridGUI.Application; import com.jgoodies.forms.builder.DefaultFormBuilder; -import IceGrid.*; import IceGridGUI.*; class PlainServerEditor extends AbstractServerEditor { + @Override protected void writeDescriptor() { _subEditor.writeDescriptor(); } + @Override protected boolean isSimpleUpdate() { return _subEditor.isSimpleUpdate(); @@ -34,6 +35,7 @@ class PlainServerEditor extends AbstractServerEditor // // From Editor: // + @Override Utils.Resolver getDetailResolver() { if(_target.getCoordinator().substitute()) @@ -46,16 +48,19 @@ class PlainServerEditor extends AbstractServerEditor } } + @Override protected void appendProperties(DefaultFormBuilder builder) { _subEditor.appendProperties(builder); } + @Override Object getSubDescriptor() { return _target.getDescriptor(); } + @Override protected boolean validate() { return _subEditor.validate(); diff --git a/java/src/IceGridGUI/Application/PlainService.java b/java/src/IceGridGUI/Application/PlainService.java index 3c91e3942f5..fd4305763ec 100644 --- a/java/src/IceGridGUI/Application/PlainService.java +++ b/java/src/IceGridGUI/Application/PlainService.java @@ -29,6 +29,7 @@ class PlainService extends Communicator implements Service, Cloneable return copy; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -52,6 +53,7 @@ class PlainService extends Communicator implements Service, Cloneable // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -81,6 +83,7 @@ class PlainService extends Communicator implements Service, Cloneable return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -97,32 +100,38 @@ class PlainService extends Communicator implements Service, Cloneable return _popup; } + @Override public void copy() { getCoordinator().setClipboard(ServiceInstance.copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void moveUp() { move(true); } + @Override public void moveDown() { move(false); } + @Override public Object getDescriptor() { return _descriptor; } + @Override public Object saveDescriptor() { return _descriptor.clone(); } + @Override public void restoreDescriptor(Object savedDescriptor) { ServiceInstanceDescriptor sid = (ServiceInstanceDescriptor)savedDescriptor; @@ -133,11 +142,13 @@ class PlainService extends Communicator implements Service, Cloneable _descriptor.descriptor.entry = sid.descriptor.entry; } + @Override public void destroy() { ((Communicator)_parent).getServices().destroyChild(this); } + @Override public Editor getEditor() { if(_editor == null) @@ -148,11 +159,13 @@ class PlainService extends Communicator implements Service, Cloneable return _editor; } + @Override protected Editor createEditor() { return new PlainServiceEditor(); } + @Override Editable getEnclosingEditable() { return ((Communicator)_parent).getEnclosingEditable(); @@ -176,6 +189,7 @@ class PlainService extends Communicator implements Service, Cloneable ((Communicator)_parent).getServices().move(this, up); } + @Override public Object rebuild(java.util.List<Editable> editables) throws UpdateFailedException { @@ -189,7 +203,7 @@ class PlainService extends Communicator implements Service, Cloneable try { - backup = (PlainService)clone(); + backup = clone(); } catch(CloneNotSupportedException e) { @@ -201,6 +215,7 @@ class PlainService extends Communicator implements Service, Cloneable return backup; } + @Override public void restore(Object backupObj) { reset((PlainService)backupObj); @@ -251,6 +266,7 @@ class PlainService extends Communicator implements Service, Cloneable return attributes; } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -273,16 +289,19 @@ class PlainService extends Communicator implements Service, Cloneable } } + @Override CommunicatorDescriptor getCommunicatorDescriptor() { return _descriptor.descriptor; } + @Override Utils.Resolver getResolver() { return _resolver; } + @Override public boolean isEphemeral() { return _ephemeral; diff --git a/java/src/IceGridGUI/Application/PlainServiceEditor.java b/java/src/IceGridGUI/Application/PlainServiceEditor.java index b5410f0b21d..d99a9bd774c 100644 --- a/java/src/IceGridGUI/Application/PlainServiceEditor.java +++ b/java/src/IceGridGUI/Application/PlainServiceEditor.java @@ -24,6 +24,7 @@ class PlainServiceEditor extends CommunicatorChildEditor // // From Editor: // + @Override Utils.Resolver getDetailResolver() { PlainService service = (PlainService)_target; @@ -37,37 +38,44 @@ class PlainServiceEditor extends CommunicatorChildEditor } } + @Override protected void appendProperties(DefaultFormBuilder builder) { _subEditor.appendProperties(builder); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Service Properties"); } + @Override protected boolean validate() { return _subEditor.validate(); } + @Override void writeDescriptor() { _subEditor.writeDescriptor(); } + @Override boolean isSimpleUpdate() { return _subEditor.isSimpleUpdate(); } + @Override Communicator.ChildList getChildList() { return ((Communicator)_target.getParent()).getServices(); } + @Override Object getSubDescriptor() { ServiceInstanceDescriptor sid = (ServiceInstanceDescriptor)_target.getDescriptor(); diff --git a/java/src/IceGridGUI/Application/PropertiesField.java b/java/src/IceGridGUI/Application/PropertiesField.java index a3f12460837..983b6de1f51 100644 --- a/java/src/IceGridGUI/Application/PropertiesField.java +++ b/java/src/IceGridGUI/Application/PropertiesField.java @@ -16,9 +16,7 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.DefaultCellEditor; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; @@ -51,6 +49,7 @@ public class PropertiesField extends JTable Action deleteRow = new AbstractAction("Delete selected row(s)") { + @Override public void actionPerformed(ActionEvent e) { if(_editable) @@ -185,6 +184,7 @@ public class PropertiesField extends JTable _model = new DefaultTableModel(vector, _columnNames) { + @Override public boolean isCellEditable(int row, int column) { return _editable; @@ -193,6 +193,7 @@ public class PropertiesField extends JTable _model.addTableModelListener(new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { if(_editable) @@ -226,7 +227,7 @@ public class PropertiesField extends JTable } @SuppressWarnings("unchecked") java.util.Vector<java.util.Vector<String>> vector = - (java.util.Vector<java.util.Vector<String>>)_model.getDataVector(); + _model.getDataVector(); java.util.LinkedList<PropertyDescriptor> result = new java.util.LinkedList<PropertyDescriptor>(_hiddenProperties); diff --git a/java/src/IceGridGUI/Application/PropertySet.java b/java/src/IceGridGUI/Application/PropertySet.java index 1919300d7bd..d7675eace42 100644 --- a/java/src/IceGridGUI/Application/PropertySet.java +++ b/java/src/IceGridGUI/Application/PropertySet.java @@ -26,6 +26,7 @@ class PropertySet extends TreeNode return psd; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -47,6 +48,7 @@ class PropertySet extends TreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -66,6 +68,7 @@ class PropertySet extends TreeNode return actions; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); @@ -73,11 +76,13 @@ class PropertySet extends TreeNode } + @Override public void paste() { ((TreeNode)_parent).paste(); } + @Override public void destroy() { PropertySetParent parent = (PropertySetParent)_parent; @@ -98,6 +103,7 @@ class PropertySet extends TreeNode } } + @Override public Editor getEditor() { if(_editor == null) @@ -115,6 +121,7 @@ class PropertySet extends TreeNode return _editor; } + @Override protected Editor createEditor() { if(_inServerInstance) @@ -127,6 +134,7 @@ class PropertySet extends TreeNode } } + @Override public boolean isEphemeral() { return _ephemeral; @@ -137,6 +145,7 @@ class PropertySet extends TreeNode return _unsubstitutedId; } + @Override Object getDescriptor() { return _descriptor; @@ -205,6 +214,7 @@ class PropertySet extends TreeNode rebuild(descriptor); } + @Override void write(XMLWriter writer) throws java.io.IOException { diff --git a/java/src/IceGridGUI/Application/PropertySetEditor.java b/java/src/IceGridGUI/Application/PropertySetEditor.java index 16d3e36aabe..70a7e35d3de 100644 --- a/java/src/IceGridGUI/Application/PropertySetEditor.java +++ b/java/src/IceGridGUI/Application/PropertySetEditor.java @@ -9,20 +9,10 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JButton; -import javax.swing.JCheckBox; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JScrollPane; -import javax.swing.JTextArea; import javax.swing.JTextField; import com.jgoodies.forms.builder.DefaultFormBuilder; @@ -33,6 +23,7 @@ import IceGridGUI.*; class PropertySetEditor extends Editor { + @Override protected boolean applyUpdate(boolean refresh) { PropertySet nps = (PropertySet)_target; @@ -135,6 +126,7 @@ class PropertySetEditor extends Editor } } + @Override Utils.Resolver getDetailResolver() { Root root = _target.getRoot(); @@ -169,7 +161,7 @@ class PropertySetEditor extends Editor { PropertySetDescriptor descriptor = (PropertySetDescriptor)getPropertySet().getDescriptor(); - descriptor.references = (String[])_propertySets.getList().toArray(new String[0]); + descriptor.references = _propertySets.getList().toArray(new String[0]); descriptor.properties = _properties.getProperties(); } @@ -178,6 +170,7 @@ class PropertySetEditor extends Editor return getIdText().equals(_oldId); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append(_idLabel); @@ -204,12 +197,14 @@ class PropertySetEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Named Property Set"); } + @Override protected boolean validate() { return check(new String[]{_idLabel.getText(), getIdText()}); diff --git a/java/src/IceGridGUI/Application/PropertySetParent.java b/java/src/IceGridGUI/Application/PropertySetParent.java index 75574f70940..39bf95e5204 100644 --- a/java/src/IceGridGUI/Application/PropertySetParent.java +++ b/java/src/IceGridGUI/Application/PropertySetParent.java @@ -10,7 +10,6 @@ package IceGridGUI.Application; import IceGrid.*; -import IceGridGUI.*; interface PropertySetParent { diff --git a/java/src/IceGridGUI/Application/PropertySets.java b/java/src/IceGridGUI/Application/PropertySets.java index fc88f340879..933757a1e81 100644 --- a/java/src/IceGridGUI/Application/PropertySets.java +++ b/java/src/IceGridGUI/Application/PropertySets.java @@ -9,8 +9,6 @@ package IceGridGUI.Application; -import javax.swing.AbstractListModel; -import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import IceGrid.*; @@ -32,6 +30,7 @@ class PropertySets extends ListTreeNode implements PropertySetParent // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -46,6 +45,7 @@ class PropertySets extends ListTreeNode implements PropertySetParent return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -58,6 +58,7 @@ class PropertySets extends ListTreeNode implements PropertySetParent return _popup; } + @Override public void newPropertySet() { PropertySetDescriptor descriptor = @@ -65,6 +66,7 @@ class PropertySets extends ListTreeNode implements PropertySetParent newPropertySet(descriptor); } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -144,11 +146,13 @@ class PropertySets extends ListTreeNode implements PropertySetParent } } + @Override Object getDescriptor() { return _descriptors; } + @Override public void tryAdd(String id, PropertySetDescriptor descriptor) throws UpdateFailedException { @@ -157,6 +161,7 @@ class PropertySets extends ListTreeNode implements PropertySetParent _descriptors.put(id, descriptor); } + @Override public void tryRename(String oldId, String oldId2, String newId) throws UpdateFailedException { @@ -187,22 +192,26 @@ class PropertySets extends ListTreeNode implements PropertySetParent _descriptors.put(newId, descriptor); } + @Override public void insertPropertySet(PropertySet nps, boolean fireEvent) throws UpdateFailedException { insertChild(nps, fireEvent); } + @Override public void removePropertySet(PropertySet nps) { removeChild(nps); } + @Override public void removeDescriptor(String id) { _descriptors.remove(id); } + @Override public Editable getEditable() { return super.getEditable(); diff --git a/java/src/IceGridGUI/Application/ReplicaGroup.java b/java/src/IceGridGUI/Application/ReplicaGroup.java index c3eff384b19..e49d98271dc 100644 --- a/java/src/IceGridGUI/Application/ReplicaGroup.java +++ b/java/src/IceGridGUI/Application/ReplicaGroup.java @@ -24,6 +24,7 @@ class ReplicaGroup extends TreeNode return (ReplicaGroupDescriptor)d.clone(); } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -45,6 +46,7 @@ class ReplicaGroup extends TreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -64,17 +66,20 @@ class ReplicaGroup extends TreeNode return actions; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { ((TreeNode)_parent).paste(); } + @Override public void destroy() { ReplicaGroups replicaGroups = (ReplicaGroups)_parent; @@ -88,6 +93,7 @@ class ReplicaGroup extends TreeNode } } + @Override public Editor getEditor() { if(_editor == null) @@ -98,16 +104,19 @@ class ReplicaGroup extends TreeNode return _editor; } + @Override protected Editor createEditor() { return new ReplicaGroupEditor(); } + @Override public boolean isEphemeral() { return _ephemeral; } + @Override Object getDescriptor() { return _descriptor; @@ -154,6 +163,7 @@ class ReplicaGroup extends TreeNode rebuild(descriptor); } + @Override void write(XMLWriter writer) throws java.io.IOException { diff --git a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java index 7d0e38c4b2a..da7e2e07cc1 100644 --- a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java +++ b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java @@ -9,15 +9,9 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JButton; -import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JOptionPane; @@ -34,6 +28,7 @@ import IceGridGUI.*; @SuppressWarnings("unchecked") class ReplicaGroupEditor extends Editor { + @Override protected boolean applyUpdate(boolean refresh) { ReplicaGroup replicaGroup = (ReplicaGroup)_target; @@ -158,6 +153,7 @@ class ReplicaGroupEditor extends Editor } } + @Override Utils.Resolver getDetailResolver() { Root root = _target.getRoot(); @@ -181,6 +177,7 @@ class ReplicaGroupEditor extends Editor // _loadBalancing.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { if(e.getStateChange() == ItemEvent.SELECTED) @@ -264,6 +261,7 @@ class ReplicaGroupEditor extends Editor return descriptor.id.equals(_id.getText().trim()); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Replica Group ID"); @@ -312,12 +310,14 @@ class ReplicaGroupEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Replica Group Properties"); } + @Override protected boolean validate() { // diff --git a/java/src/IceGridGUI/Application/ReplicaGroups.java b/java/src/IceGridGUI/Application/ReplicaGroups.java index f403973c503..9aef88b7426 100644 --- a/java/src/IceGridGUI/Application/ReplicaGroups.java +++ b/java/src/IceGridGUI/Application/ReplicaGroups.java @@ -9,8 +9,6 @@ package IceGridGUI.Application; -import javax.swing.AbstractListModel; -import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import IceGrid.*; @@ -32,6 +30,7 @@ class ReplicaGroups extends ListTreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -46,6 +45,7 @@ class ReplicaGroups extends ListTreeNode return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -58,6 +58,7 @@ class ReplicaGroups extends ListTreeNode return _popup; } + @Override public void newReplicaGroup() { ReplicaGroupDescriptor descriptor = new @@ -72,6 +73,7 @@ class ReplicaGroups extends ListTreeNode newReplicaGroup(descriptor); } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -154,6 +156,7 @@ class ReplicaGroups extends ListTreeNode childrenChanged(updatedChildren); } + @Override Object getDescriptor() { return _descriptors; diff --git a/java/src/IceGridGUI/Application/Root.java b/java/src/IceGridGUI/Application/Root.java index 26c20321bda..31f00581390 100644 --- a/java/src/IceGridGUI/Application/Root.java +++ b/java/src/IceGridGUI/Application/Root.java @@ -22,8 +22,6 @@ import javax.swing.tree.TreePath; import java.io.File; -import java.util.Enumeration; - import IceGrid.*; import IceGridGUI.*; @@ -126,6 +124,7 @@ public class Root extends ListTreeNode return copy; } + @Override public Editor getEditor() { if(_editor == null) @@ -136,6 +135,7 @@ public class Root extends ListTreeNode return _editor; } + @Override protected Editor createEditor() { return new ApplicationEditor(); @@ -245,6 +245,7 @@ public class Root extends ListTreeNode } } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -264,6 +265,7 @@ public class Root extends ListTreeNode return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -289,6 +291,7 @@ public class Root extends ListTreeNode return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = _coordinator.getActionsForPopup(); @@ -308,42 +311,50 @@ public class Root extends ListTreeNode return _popup; } + @Override public void copy() { _coordinator.setClipboard(copyDescriptor(_descriptor)); _coordinator.getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { _coordinator.pasteApplication(); } + @Override public void newNode() { _nodes.newNode(); } + @Override public void newPropertySet() { _propertySets.newPropertySet(); } + @Override public void newReplicaGroup() { _replicaGroups.newReplicaGroup(); } + @Override public void newTemplateServer() { _serverTemplates.newTemplateServer(); } + @Override public void newTemplateServerIceBox() { _serverTemplates.newTemplateServerIceBox(); } + @Override public void newTemplateService() { _serviceTemplates.newTemplateService(); @@ -407,6 +418,7 @@ public class Root extends ListTreeNode JOptionPane.ERROR_MESSAGE); } + @Override public void run() { _coordinator.getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); @@ -425,6 +437,7 @@ public class Root extends ListTreeNode Ice.Callback cb = new Ice.Callback() { + @Override public void completed(Ice.AsyncResult result) { try @@ -446,6 +459,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { commit(); @@ -464,6 +478,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _skipUpdates--; @@ -527,6 +542,7 @@ public class Root extends ListTreeNode Callback_Admin_addApplication cb = new Callback_Admin_addApplication() { + @Override public void response() { if(_traceSaveToRegistry) @@ -537,6 +553,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { commit(); @@ -548,6 +565,7 @@ public class Root extends ListTreeNode }); } + @Override public void exception(final Ice.UserException e) { if(_traceSaveToRegistry) @@ -558,6 +576,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { handleFailure(prefix, "Add failed", @@ -567,6 +586,7 @@ public class Root extends ListTreeNode }); } + @Override public void exception(final Ice.LocalException e) { if(_traceSaveToRegistry) @@ -577,6 +597,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { handleFailure(prefix, "Add failed", @@ -602,6 +623,7 @@ public class Root extends ListTreeNode Ice.Callback cb = new Ice.Callback() { + @Override public void completed(Ice.AsyncResult result) { try @@ -623,6 +645,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { commit(); @@ -664,6 +687,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(_live) @@ -970,11 +994,13 @@ public class Root extends ListTreeNode _serviceTemplates.commit(); } + @Override public boolean isEphemeral() { return false; } + @Override public void destroy() { if(!_live && _file == null) @@ -1143,6 +1169,7 @@ public class Root extends ListTreeNode return _treeModel; } + @Override public Coordinator getCoordinator() { return _coordinator; @@ -1244,6 +1271,7 @@ public class Root extends ListTreeNode return result; } + @Override Object getDescriptor() { return _descriptor; @@ -1265,6 +1293,7 @@ public class Root extends ListTreeNode _descriptor.description = clone.description; } + @Override public void write(XMLWriter writer) throws java.io.IOException { @@ -1389,12 +1418,12 @@ public class Root extends ListTreeNode TemplateDescriptor findServerTemplateDescriptor(String templateName) { - return (TemplateDescriptor)_descriptor.serverTemplates.get(templateName); + return _descriptor.serverTemplates.get(templateName); } TemplateDescriptor findServiceTemplateDescriptor(String templateName) { - return (TemplateDescriptor)_descriptor.serviceTemplates.get(templateName); + return _descriptor.serviceTemplates.get(templateName); } ServerTemplates getServerTemplates() @@ -1440,11 +1469,13 @@ public class Root extends ListTreeNode return true; } + @Override public Root getRoot() { return this; } + @Override Utils.Resolver getResolver() { return _resolver; diff --git a/java/src/IceGridGUI/Application/ServerInstance.java b/java/src/IceGridGUI/Application/ServerInstance.java index 8fd0136e2de..fc76d2181b2 100644 --- a/java/src/IceGridGUI/Application/ServerInstance.java +++ b/java/src/IceGridGUI/Application/ServerInstance.java @@ -15,7 +15,6 @@ import javax.swing.Icon; import javax.swing.JPopupMenu; import javax.swing.JTree; -import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.DefaultTreeCellRenderer; import IceGrid.*; @@ -34,6 +33,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent // // Overrides ListTreeNode // + @Override public boolean getAllowsChildren() { return _isIceBox; @@ -42,6 +42,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -71,12 +72,14 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent return actions; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { if(_isIceBox) @@ -92,11 +95,13 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent ((TreeNode)_parent).paste(); } + @Override public void newPropertySet() { newPropertySet(new PropertySetDescriptor(new String[0], new java.util.LinkedList<PropertyDescriptor>())); } + @Override public JPopupMenu getPopupMenu() { if(_isIceBox) @@ -116,6 +121,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent } } + @Override public Editor getEditor() { if(_editor == null) @@ -126,11 +132,13 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent return _editor; } + @Override protected Editor createEditor() { return new ServerInstanceEditor(); } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -158,6 +166,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public void destroy() { Node node = (Node)_parent; @@ -175,16 +184,19 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent } } + @Override public Object getDescriptor() { return _descriptor; } + @Override public Object saveDescriptor() { return _descriptor.clone(); } + @Override public void restoreDescriptor(Object savedDescriptor) { ServerInstanceDescriptor copy = (ServerInstanceDescriptor)savedDescriptor; @@ -220,6 +232,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent } } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -278,6 +291,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent java.util.Map<String, String> parameterValues; } + @Override public Object rebuild(java.util.List<Editable> editables) throws UpdateFailedException { @@ -341,6 +355,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent return backup; } + @Override public void restore(Object backupObj) { Backup backup = (Backup)backupObj; @@ -370,6 +385,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent } } + @Override public void tryAdd(String unsubstitutedId, PropertySetDescriptor descriptor) throws UpdateFailedException { @@ -382,6 +398,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent _editable.markModified(); } + @Override public void tryRename(String oldId, String oldUnresolvedId, String newUnsubstitutedId) throws UpdateFailedException { @@ -416,22 +433,26 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent _descriptor.servicePropertySets.put(newUnsubstitutedId, descriptor); } + @Override public void insertPropertySet(PropertySet nps, boolean fireEvent) throws UpdateFailedException { insertChild(nps, fireEvent); } + @Override public void removePropertySet(PropertySet nps) { removeChild(nps); } + @Override public void removeDescriptor(String unsubstitutedId) { _descriptor.servicePropertySets.remove(unsubstitutedId); } + @Override public Editable getEditable() { return _editable; @@ -459,7 +480,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent if(d.template.length() > 0) { TemplateDescriptor templateDescriptor = - (TemplateDescriptor)getRoot().findServiceTemplateDescriptor(d.template); + getRoot().findServiceTemplateDescriptor(d.template); assert templateDescriptor != null; Utils.Resolver serviceResolver = new Utils.Resolver(_resolver, d.parameterValues, @@ -516,16 +537,19 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent getRoot().setSelectedNode(ps); } + @Override Utils.Resolver getResolver() { return _resolver; } + @Override public boolean isEphemeral() { return _ephemeral; } + @Override public String toString() { if(_ephemeral) diff --git a/java/src/IceGridGUI/Application/ServerInstanceEditor.java b/java/src/IceGridGUI/Application/ServerInstanceEditor.java index 1baf054f431..0401daf4567 100644 --- a/java/src/IceGridGUI/Application/ServerInstanceEditor.java +++ b/java/src/IceGridGUI/Application/ServerInstanceEditor.java @@ -16,8 +16,6 @@ import javax.swing.Action; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JScrollPane; -import javax.swing.JTextField; - import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; @@ -30,6 +28,7 @@ import IceGridGUI.*; @SuppressWarnings("unchecked") class ServerInstanceEditor extends AbstractServerEditor { + @Override protected void writeDescriptor() { ServerInstanceDescriptor descriptor = getDescriptor(); @@ -38,13 +37,14 @@ class ServerInstanceEditor extends AbstractServerEditor descriptor.template = t.getId(); descriptor.parameterValues = _parameters.getValues(); - descriptor.propertySet.references = (String[])_propertySets.getList().toArray(new String[0]); + descriptor.propertySet.references = _propertySets.getList().toArray(new String[0]); descriptor.propertySet.properties = _properties.getProperties(); ((ServerInstance)_target).isIceBox( ((TemplateDescriptor)t.getDescriptor()).descriptor instanceof IceBoxDescriptor); } + @Override protected boolean isSimpleUpdate() { ServerInstanceDescriptor descriptor = getDescriptor(); @@ -63,6 +63,7 @@ class ServerInstanceEditor extends AbstractServerEditor Action gotoTemplate = new AbstractAction( "", Utils.getIcon("/icons/16x16/goto.png")) { + @Override public void actionPerformed(ActionEvent e) { TreeNode t = (TreeNode)_template.getSelectedItem(); @@ -92,6 +93,7 @@ class ServerInstanceEditor extends AbstractServerEditor // From Editor: // + @Override Utils.Resolver getDetailResolver() { if(_target.getCoordinator().substitute()) @@ -104,6 +106,7 @@ class ServerInstanceEditor extends AbstractServerEditor } } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Template", _template); @@ -171,6 +174,7 @@ class ServerInstanceEditor extends AbstractServerEditor ListDataListener templateListener = new ListDataListener() { + @Override public void contentsChanged(ListDataEvent e) { updated(); @@ -187,10 +191,12 @@ class ServerInstanceEditor extends AbstractServerEditor td.parameterDefaults, null); } + @Override public void intervalAdded(ListDataEvent e) { } + @Override public void intervalRemoved(ListDataEvent e) { } diff --git a/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java b/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java index da166ea538d..4292cd868ae 100644 --- a/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java +++ b/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java @@ -14,7 +14,6 @@ import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JTextField; -import IceGrid.*; import IceGridGUI.*; class ServerInstancePropertySetEditor extends PropertySetEditor @@ -28,17 +27,20 @@ class ServerInstancePropertySetEditor extends PropertySetEditor idTextField.getDocument().addDocumentListener(_updateListener); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Service Instance Property Set"); } + @Override protected JComponent getIdComponent() { return _id; } + @Override protected String getIdText() { if(_id.getSelectedItem() == null) @@ -51,6 +53,7 @@ class ServerInstancePropertySetEditor extends PropertySetEditor } } + @Override @SuppressWarnings("unchecked") protected void showId(String unsubstitutedId, Utils.Resolver resolver) { diff --git a/java/src/IceGridGUI/Application/ServerSubEditor.java b/java/src/IceGridGUI/Application/ServerSubEditor.java index 0c5b54c9b79..6c3f079c202 100644 --- a/java/src/IceGridGUI/Application/ServerSubEditor.java +++ b/java/src/IceGridGUI/Application/ServerSubEditor.java @@ -13,7 +13,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JComponent; @@ -86,6 +85,7 @@ class ServerSubEditor extends CommunicatorSubEditor Action allocatable = new AbstractAction("Allocatable") { + @Override public void actionPerformed(ActionEvent e) { _mainEditor.updated(); @@ -99,6 +99,7 @@ class ServerSubEditor extends CommunicatorSubEditor Action appDistrib = new AbstractAction("Depends on the application distribution") { + @Override public void actionPerformed(ActionEvent e) { _mainEditor.updated(); @@ -127,6 +128,7 @@ class ServerSubEditor extends CommunicatorSubEditor return (ServerDescriptor)_mainEditor.getSubDescriptor(); } + @Override void appendProperties(DefaultFormBuilder builder) { builder.append("Server ID"); @@ -355,6 +357,7 @@ class ServerSubEditor extends CommunicatorSubEditor static private final Object NO_DISTRIB = new Object() { + @Override public String toString() { return "None selected"; diff --git a/java/src/IceGridGUI/Application/ServerTemplate.java b/java/src/IceGridGUI/Application/ServerTemplate.java index 6da4c72c1bf..896fb30705a 100644 --- a/java/src/IceGridGUI/Application/ServerTemplate.java +++ b/java/src/IceGridGUI/Application/ServerTemplate.java @@ -10,14 +10,7 @@ package IceGridGUI.Application; import java.awt.Component; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.Icon; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JTree; @@ -37,6 +30,7 @@ class ServerTemplate extends Communicator return copy; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -82,6 +76,7 @@ class ServerTemplate extends Communicator // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -113,12 +108,14 @@ class ServerTemplate extends Communicator return actions; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_templateDescriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -134,6 +131,7 @@ class ServerTemplate extends Communicator return _popup; } + @Override public Editor getEditor() { if(_editor == null) @@ -144,11 +142,13 @@ class ServerTemplate extends Communicator return _editor; } + @Override protected Editor createEditor() { return new ServerTemplateEditor(); } + @Override public void destroy() { ServerTemplates serverTemplates = (ServerTemplates)_parent; @@ -167,21 +167,25 @@ class ServerTemplate extends Communicator } } + @Override public boolean isEphemeral() { return _ephemeral; } + @Override public Object getDescriptor() { return _templateDescriptor; } + @Override CommunicatorDescriptor getCommunicatorDescriptor() { return _templateDescriptor.descriptor; } + @Override public Object saveDescriptor() { // @@ -192,6 +196,7 @@ class ServerTemplate extends Communicator return clone; } + @Override public void restoreDescriptor(Object savedDescriptor) { TemplateDescriptor clone = (TemplateDescriptor)savedDescriptor; @@ -230,6 +235,7 @@ class ServerTemplate extends Communicator } } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -286,6 +292,7 @@ class ServerTemplate extends Communicator } } + @Override boolean isIceBox() { return _templateDescriptor.descriptor instanceof IceBoxDescriptor; @@ -333,11 +340,13 @@ class ServerTemplate extends Communicator return _editable; } + @Override Editable getEnclosingEditable() { return _editable; } + @Override java.util.List<? extends TemplateInstance> findInstances() { return getRoot().findServerInstances(_id); diff --git a/java/src/IceGridGUI/Application/ServerTemplateEditor.java b/java/src/IceGridGUI/Application/ServerTemplateEditor.java index 57aa9829af0..f6f45252dc8 100644 --- a/java/src/IceGridGUI/Application/ServerTemplateEditor.java +++ b/java/src/IceGridGUI/Application/ServerTemplateEditor.java @@ -18,17 +18,20 @@ class ServerTemplateEditor extends TemplateEditor _subEditor = new ServerSubEditor(this); } + @Override void writeDescriptor() { super.writeDescriptor(); _subEditor.writeDescriptor(); } + @Override boolean isSimpleUpdate() { return super.isSimpleUpdate() && _subEditor.isSimpleUpdate(); } + @Override protected void appendProperties(DefaultFormBuilder builder) { super.appendProperties(builder); @@ -37,12 +40,14 @@ class ServerTemplateEditor extends TemplateEditor _subEditor.appendProperties(builder); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Server Template Properties"); } + @Override protected boolean validate() { return super.validate() && _subEditor.validate(); diff --git a/java/src/IceGridGUI/Application/ServerTemplates.java b/java/src/IceGridGUI/Application/ServerTemplates.java index 4237e0fc46c..5e2458ae29f 100644 --- a/java/src/IceGridGUI/Application/ServerTemplates.java +++ b/java/src/IceGridGUI/Application/ServerTemplates.java @@ -9,7 +9,6 @@ package IceGridGUI.Application; -import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import IceGrid.*; @@ -31,6 +30,7 @@ class ServerTemplates extends Templates // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -46,6 +46,7 @@ class ServerTemplates extends Templates return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -59,6 +60,7 @@ class ServerTemplates extends Templates return _popup; } + @Override public void newTemplateServer() { newServerTemplate(new TemplateDescriptor( @@ -67,6 +69,7 @@ class ServerTemplates extends Templates new java.util.TreeMap<String, String>())); } + @Override public void newTemplateServerIceBox() { newServerTemplate(new TemplateDescriptor( @@ -75,6 +78,7 @@ class ServerTemplates extends Templates new java.util.TreeMap<String, String>())); } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -107,6 +111,7 @@ class ServerTemplates extends Templates // // Variable resolution does not make sense for templates / template children // + @Override Utils.Resolver getResolver() { return null; @@ -180,6 +185,7 @@ class ServerTemplates extends Templates getRoot().setSelectedNode(t); } + @Override void tryAdd(String newId, TemplateDescriptor descriptor) throws UpdateFailedException { @@ -251,6 +257,7 @@ class ServerTemplates extends Templates _descriptors.remove(id); } + @Override Object getDescriptor() { return _descriptors; diff --git a/java/src/IceGridGUI/Application/ServiceInstance.java b/java/src/IceGridGUI/Application/ServiceInstance.java index aecc6fe7d26..aa21a9ce37d 100644 --- a/java/src/IceGridGUI/Application/ServiceInstance.java +++ b/java/src/IceGridGUI/Application/ServiceInstance.java @@ -28,7 +28,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable if(copy.descriptor != null) { - copy.descriptor = PlainService.copyDescriptor((ServiceDescriptor)copy.descriptor); + copy.descriptor = PlainService.copyDescriptor(copy.descriptor); } return copy; } @@ -44,6 +44,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable return copy; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -65,6 +66,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -88,6 +90,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -101,32 +104,38 @@ class ServiceInstance extends TreeNode implements Service, Cloneable return _popup; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { ((TreeNode)_parent).paste(); } + @Override public void moveUp() { move(true); } + @Override public void moveDown() { move(false); } + @Override public Object getDescriptor() { return _descriptor; } + @Override public Object saveDescriptor() { // @@ -137,6 +146,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable return saved; } + @Override public void restoreDescriptor(Object savedDescriptor) { ServiceInstanceDescriptor sd = (ServiceInstanceDescriptor)savedDescriptor; @@ -145,11 +155,13 @@ class ServiceInstance extends TreeNode implements Service, Cloneable _descriptor.propertySet = sd.propertySet; } + @Override public void destroy() { ((Communicator)_parent).getServices().destroyChild(this); } + @Override public Editor getEditor() { if(_editor == null) @@ -160,11 +172,13 @@ class ServiceInstance extends TreeNode implements Service, Cloneable return _editor; } + @Override protected Editor createEditor() { return new ServiceInstanceEditor(); } + @Override public String toString() { if(_displayString != null) @@ -206,6 +220,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable ServiceInstance clone; } + @Override public Object rebuild(java.util.List<Editable> editables) throws UpdateFailedException { @@ -264,6 +279,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable return backup; } + @Override public void restore(Object backupObj) { Backup backup = (Backup)backupObj; @@ -308,6 +324,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable _ephemeral = true; } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -332,11 +349,13 @@ class ServiceInstance extends TreeNode implements Service, Cloneable } } + @Override Utils.Resolver getResolver() { return _resolver; } + @Override public boolean isEphemeral() { return _ephemeral; diff --git a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java b/java/src/IceGridGUI/Application/ServiceInstanceEditor.java index 654f19dd39f..9edbfe39927 100644 --- a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java +++ b/java/src/IceGridGUI/Application/ServiceInstanceEditor.java @@ -16,8 +16,6 @@ import javax.swing.Action; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JScrollPane; -import javax.swing.JTextField; - import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; @@ -38,6 +36,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor Action gotoTemplate = new AbstractAction( "", Utils.getIcon("/icons/16x16/goto.png")) { + @Override public void actionPerformed(ActionEvent e) { TreeNode t = (TreeNode)_template.getSelectedItem(); @@ -65,6 +64,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor // // From Editor: // + @Override Utils.Resolver getDetailResolver() { ServiceInstance service = (ServiceInstance)_target; @@ -78,16 +78,18 @@ class ServiceInstanceEditor extends CommunicatorChildEditor } } + @Override void writeDescriptor() { ServiceInstanceDescriptor descriptor = getDescriptor(); descriptor.template = ((ServiceTemplate)_template.getSelectedItem()).getId(); descriptor.parameterValues = _parameters.getValues(); - descriptor.propertySet.references = (String[])_propertySets.getList().toArray(new String[0]); + descriptor.propertySet.references = _propertySets.getList().toArray(new String[0]); descriptor.propertySet.properties = _properties.getProperties(); } + @Override boolean isSimpleUpdate() { ServiceInstanceDescriptor descriptor = getDescriptor(); @@ -96,11 +98,13 @@ class ServiceInstanceEditor extends CommunicatorChildEditor return descriptor.template.equals(t.getId()) && descriptor.parameterValues.equals(_parameters.getValues()); } + @Override Communicator.ChildList getChildList() { return ((Communicator)_target.getParent()).getServices(); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Template", _template); @@ -143,6 +147,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); @@ -180,6 +185,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor ListDataListener templateListener = new ListDataListener() { + @Override public void contentsChanged(ListDataEvent e) { updated(); @@ -196,10 +202,12 @@ class ServiceInstanceEditor extends CommunicatorChildEditor td.parameterDefaults, null); } + @Override public void intervalAdded(ListDataEvent e) { } + @Override public void intervalRemoved(ListDataEvent e) { } diff --git a/java/src/IceGridGUI/Application/ServiceSubEditor.java b/java/src/IceGridGUI/Application/ServiceSubEditor.java index d6e7c3015d3..37ad5ada3c8 100644 --- a/java/src/IceGridGUI/Application/ServiceSubEditor.java +++ b/java/src/IceGridGUI/Application/ServiceSubEditor.java @@ -9,10 +9,6 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.JTextField; import com.jgoodies.forms.builder.DefaultFormBuilder; @@ -43,6 +39,7 @@ class ServiceSubEditor extends CommunicatorSubEditor return (ServiceDescriptor)_mainEditor.getSubDescriptor(); } + @Override void appendProperties(DefaultFormBuilder builder) { builder.append("Service Name"); diff --git a/java/src/IceGridGUI/Application/ServiceTemplate.java b/java/src/IceGridGUI/Application/ServiceTemplate.java index 11e2d73f3b2..b8210f000ec 100644 --- a/java/src/IceGridGUI/Application/ServiceTemplate.java +++ b/java/src/IceGridGUI/Application/ServiceTemplate.java @@ -10,7 +10,6 @@ package IceGridGUI.Application; import java.awt.Component; -import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; @@ -28,6 +27,7 @@ class ServiceTemplate extends Communicator return copy; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -50,6 +50,7 @@ class ServiceTemplate extends Communicator // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -78,12 +79,14 @@ class ServiceTemplate extends Communicator return actions; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_templateDescriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -97,6 +100,7 @@ class ServiceTemplate extends Communicator return _popup; } + @Override public Editor getEditor() { if(_editor == null) @@ -107,6 +111,7 @@ class ServiceTemplate extends Communicator return _editor; } + @Override protected Editor createEditor() { return new ServiceTemplateEditor(); @@ -129,6 +134,7 @@ class ServiceTemplate extends Communicator _templateDescriptor = descriptor; } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -177,21 +183,25 @@ class ServiceTemplate extends Communicator _editable.commit(); } + @Override public Object getDescriptor() { return _templateDescriptor; } + @Override CommunicatorDescriptor getCommunicatorDescriptor() { return _templateDescriptor.descriptor; } + @Override public boolean isEphemeral() { return _ephemeral; } + @Override public void destroy() { ServiceTemplates serviceTemplates = (ServiceTemplates)_parent; @@ -210,6 +220,7 @@ class ServiceTemplate extends Communicator } } + @Override java.util.List<? extends TemplateInstance> findInstances() { return getRoot().findServiceInstances(_id); @@ -220,11 +231,13 @@ class ServiceTemplate extends Communicator return _editable; } + @Override Editable getEnclosingEditable() { return _editable; } + @Override public Object saveDescriptor() { // @@ -235,6 +248,7 @@ class ServiceTemplate extends Communicator return clone; } + @Override public void restoreDescriptor(Object savedDescriptor) { TemplateDescriptor clone = (TemplateDescriptor)savedDescriptor; diff --git a/java/src/IceGridGUI/Application/ServiceTemplateEditor.java b/java/src/IceGridGUI/Application/ServiceTemplateEditor.java index 16ea4c939fc..7dba325e896 100644 --- a/java/src/IceGridGUI/Application/ServiceTemplateEditor.java +++ b/java/src/IceGridGUI/Application/ServiceTemplateEditor.java @@ -18,17 +18,20 @@ class ServiceTemplateEditor extends TemplateEditor _subEditor = new ServiceSubEditor(this); } + @Override void writeDescriptor() { super.writeDescriptor(); _subEditor.writeDescriptor(); } + @Override boolean isSimpleUpdate() { return super.isSimpleUpdate() && _subEditor.isSimpleUpdate(); } + @Override protected void appendProperties(DefaultFormBuilder builder) { super.appendProperties(builder); @@ -37,12 +40,14 @@ class ServiceTemplateEditor extends TemplateEditor _subEditor.appendProperties(builder); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Service Template Properties"); } + @Override protected boolean validate() { return super.validate() && _subEditor.validate(); diff --git a/java/src/IceGridGUI/Application/ServiceTemplates.java b/java/src/IceGridGUI/Application/ServiceTemplates.java index 4ce7b8880b1..a4a3412afc7 100644 --- a/java/src/IceGridGUI/Application/ServiceTemplates.java +++ b/java/src/IceGridGUI/Application/ServiceTemplates.java @@ -9,11 +9,6 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import IceGrid.*; @@ -35,6 +30,7 @@ class ServiceTemplates extends Templates // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -49,6 +45,7 @@ class ServiceTemplates extends Templates return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -61,6 +58,7 @@ class ServiceTemplates extends Templates return _popup; } + @Override public void newTemplateService() { ServiceDescriptor sd = new ServiceDescriptor( @@ -76,6 +74,7 @@ class ServiceTemplates extends Templates new java.util.TreeMap<String, String>())); } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -99,6 +98,7 @@ class ServiceTemplates extends Templates // // Variable resolution does not make sense for templates / template children // + @Override Utils.Resolver getResolver() { return null; @@ -120,6 +120,7 @@ class ServiceTemplates extends Templates getRoot().setSelectedNode(t); } + @Override void tryAdd(String newId, TemplateDescriptor descriptor) throws UpdateFailedException { @@ -194,6 +195,7 @@ class ServiceTemplates extends Templates _descriptors.remove(id); } + @Override Object getDescriptor() { return _descriptors; diff --git a/java/src/IceGridGUI/Application/SimpleMapField.java b/java/src/IceGridGUI/Application/SimpleMapField.java index f4ece384f8d..7a9bbda1389 100644 --- a/java/src/IceGridGUI/Application/SimpleMapField.java +++ b/java/src/IceGridGUI/Application/SimpleMapField.java @@ -9,16 +9,13 @@ package IceGridGUI.Application; -import IceGrid.*; import IceGridGUI.*; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.DefaultCellEditor; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; @@ -52,6 +49,7 @@ public class SimpleMapField extends JTable Action deleteRow = new AbstractAction("Delete selected row(s)") { + @Override public void actionPerformed(ActionEvent e) { if(_editable) @@ -115,6 +113,7 @@ public class SimpleMapField extends JTable _model = new DefaultTableModel(vector, _columnNames) { + @Override public boolean isCellEditable(int row, int column) { return _editable; @@ -123,6 +122,7 @@ public class SimpleMapField extends JTable _model.addTableModelListener(new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { if(_editable) @@ -157,7 +157,7 @@ public class SimpleMapField extends JTable } @SuppressWarnings("unchecked") java.util.Vector<java.util.Vector<String>> vector = - (java.util.Vector<java.util.Vector<String>>)_model.getDataVector(); + _model.getDataVector(); java.util.TreeMap<String, String> result = new java.util.TreeMap<String, String>(); diff --git a/java/src/IceGridGUI/Application/TemplateEditor.java b/java/src/IceGridGUI/Application/TemplateEditor.java index f09a899491c..3a5117291ba 100644 --- a/java/src/IceGridGUI/Application/TemplateEditor.java +++ b/java/src/IceGridGUI/Application/TemplateEditor.java @@ -9,11 +9,6 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; import javax.swing.JOptionPane; import javax.swing.JScrollPane; import javax.swing.JTextField; @@ -22,7 +17,6 @@ import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.layout.CellConstraints; import IceGrid.*; -import IceGridGUI.*; class TemplateEditor extends Editor { @@ -39,6 +33,7 @@ class TemplateEditor extends Editor return (TemplateDescriptor)_target.getDescriptor(); } + @Override Object getSubDescriptor() { return getDescriptor().descriptor; @@ -61,6 +56,7 @@ class TemplateEditor extends Editor return descriptor.parameters.equals(parameters) && descriptor.parameterDefaults.equals(defaultValues); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Template ID"); @@ -83,6 +79,7 @@ class TemplateEditor extends Editor builder.nextLine(); } + @Override protected boolean validate() { return check(new String[]{"Template ID", _template.getText().trim()}); @@ -97,6 +94,7 @@ class TemplateEditor extends Editor _parameters.set(descriptor.parameters, descriptor.parameterDefaults); } + @Override protected boolean applyUpdate(boolean refresh) { Root root = _target.getRoot(); diff --git a/java/src/IceGridGUI/Application/Templates.java b/java/src/IceGridGUI/Application/Templates.java index d451b65f2fb..2394ed71dcb 100644 --- a/java/src/IceGridGUI/Application/Templates.java +++ b/java/src/IceGridGUI/Application/Templates.java @@ -9,10 +9,7 @@ package IceGridGUI.Application; -import javax.swing.JOptionPane; - import IceGrid.*; -import IceGridGUI.*; abstract class Templates extends ListTreeNode { diff --git a/java/src/IceGridGUI/Application/TreeNode.java b/java/src/IceGridGUI/Application/TreeNode.java index 7f5f2f97ec8..f67e46d887f 100644 --- a/java/src/IceGridGUI/Application/TreeNode.java +++ b/java/src/IceGridGUI/Application/TreeNode.java @@ -9,10 +9,6 @@ package IceGridGUI.Application; -import javax.swing.JOptionPane; -import javax.swing.JPopupMenu; -import javax.swing.SwingUtilities; - import java.util.Enumeration; import IceGrid.*; diff --git a/java/src/IceGridGUI/Application/UpdateFailedException.java b/java/src/IceGridGUI/Application/UpdateFailedException.java index fd78c621b28..d81d5802fc0 100644 --- a/java/src/IceGridGUI/Application/UpdateFailedException.java +++ b/java/src/IceGridGUI/Application/UpdateFailedException.java @@ -21,6 +21,7 @@ public class UpdateFailedException extends Exception _message = message; } + @Override public String toString() { return _message; diff --git a/java/src/IceGridGUI/ApplicationActions.java b/java/src/IceGridGUI/ApplicationActions.java index edefed76750..4abd75f6261 100644 --- a/java/src/IceGridGUI/ApplicationActions.java +++ b/java/src/IceGridGUI/ApplicationActions.java @@ -9,15 +9,9 @@ package IceGridGUI; -import java.awt.Toolkit; import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; - import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.KeyStroke; - -import IceGrid.*; import IceGridGUI.Application.*; // @@ -54,10 +48,9 @@ public class ApplicationActions ApplicationActions(boolean popup) { - final int MENU_MASK = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); - _array[TreeNode.NEW_ADAPTER] = new AbstractAction(popup ? "New Adapter" : "Adapter") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -69,6 +62,7 @@ public class ApplicationActions _array[TreeNode.NEW_DBENV] = new AbstractAction(popup ? "New Database Environment" : "Database Environment") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -80,6 +74,7 @@ public class ApplicationActions _array[TreeNode.NEW_NODE] = new AbstractAction(popup ? "New Node" : "Node") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -91,6 +86,7 @@ public class ApplicationActions _array[TreeNode.NEW_PROPERTY_SET] = new AbstractAction(popup ? "New Property Set" : "Property Set") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -102,6 +98,7 @@ public class ApplicationActions _array[TreeNode.NEW_REPLICA_GROUP] = new AbstractAction(popup ? "New Replica Group" : "Replica Group" ) { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -113,6 +110,7 @@ public class ApplicationActions _array[TreeNode.NEW_SERVER] = new AbstractAction(popup ? "New Server" : "Server") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -124,6 +122,7 @@ public class ApplicationActions _array[TreeNode.NEW_SERVER_ICEBOX] = new AbstractAction(popup ? "New IceBox Server" : "IceBox Server") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -136,6 +135,7 @@ public class ApplicationActions _array[TreeNode.NEW_SERVER_FROM_TEMPLATE] = new AbstractAction( popup ? "New Server from Template" : "Server from Template") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -148,6 +148,7 @@ public class ApplicationActions _array[TreeNode.NEW_SERVICE] = new AbstractAction(popup ? "New Service" : "Service") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -160,6 +161,7 @@ public class ApplicationActions _array[TreeNode.NEW_SERVICE_FROM_TEMPLATE] = new AbstractAction( popup ? "New Service from Template" : "Service from Template") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -171,6 +173,7 @@ public class ApplicationActions _array[TreeNode.NEW_TEMPLATE_SERVER] = new AbstractAction(popup ? "New Server Template" : "Server Template") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -183,6 +186,7 @@ public class ApplicationActions _array[TreeNode.NEW_TEMPLATE_SERVER_ICEBOX] = new AbstractAction( popup ? "New IceBox Server Template" : "IceBox Server Template") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -195,6 +199,7 @@ public class ApplicationActions _array[TreeNode.NEW_TEMPLATE_SERVICE] = new AbstractAction(popup ? "New Service Template" : "Service Template") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -206,6 +211,7 @@ public class ApplicationActions _array[TreeNode.COPY] = new AbstractAction("Copy") { + @Override public void actionPerformed(ActionEvent e) { _target.copy(); @@ -214,6 +220,7 @@ public class ApplicationActions _array[TreeNode.PASTE] = new AbstractAction("Paste") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -225,6 +232,7 @@ public class ApplicationActions _array[TreeNode.DELETE] = new AbstractAction("Delete") { + @Override public void actionPerformed(ActionEvent e) { _target.delete(); @@ -233,6 +241,7 @@ public class ApplicationActions _array[TreeNode.SHOW_VARS] = new AbstractAction("Show Variables") { + @Override public void actionPerformed(ActionEvent e) { _target.getCoordinator().showVars(); @@ -246,6 +255,7 @@ public class ApplicationActions _array[TreeNode.SUBSTITUTE_VARS] = new AbstractAction("Substitute Variables") { + @Override public void actionPerformed(ActionEvent e) { _target.getCoordinator().substituteVars(); @@ -258,6 +268,7 @@ public class ApplicationActions _array[TreeNode.MOVE_UP] = new AbstractAction("Move Up") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -269,6 +280,7 @@ public class ApplicationActions _array[TreeNode.MOVE_DOWN] = new AbstractAction("Move Down") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) diff --git a/java/src/IceGridGUI/ApplicationObserverI.java b/java/src/IceGridGUI/ApplicationObserverI.java index 85d712df471..feaf4306b88 100644 --- a/java/src/IceGridGUI/ApplicationObserverI.java +++ b/java/src/IceGridGUI/ApplicationObserverI.java @@ -52,6 +52,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp } } + @Override public synchronized void applicationInit(int serial, java.util.List<ApplicationInfo> applications, Ice.Current current) { @@ -84,6 +85,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp notify(); } + @Override public void applicationAdded(final int serial, final ApplicationInfo info, Ice.Current current) { if(_trace) @@ -95,6 +97,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.applicationAdded(serial, info); @@ -102,6 +105,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp }); } + @Override public void applicationRemoved(final int serial, final String name, final Ice.Current current) { if(_trace) @@ -113,6 +117,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.applicationRemoved(serial, name); @@ -120,6 +125,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp }); } + @Override public void applicationUpdated(final int serial, final ApplicationUpdateInfo info, Ice.Current current) { if(_trace) @@ -131,6 +137,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.applicationUpdated(serial, info); diff --git a/java/src/IceGridGUI/ApplicationPane.java b/java/src/IceGridGUI/ApplicationPane.java index 30d1fdb72b9..52e5d9076b4 100644 --- a/java/src/IceGridGUI/ApplicationPane.java +++ b/java/src/IceGridGUI/ApplicationPane.java @@ -10,14 +10,10 @@ package IceGridGUI; import java.awt.*; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import javax.swing.*; -import javax.swing.border.AbstractBorder; import javax.swing.border.EmptyBorder; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; @@ -27,24 +23,22 @@ import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import com.jgoodies.looks.Options; -import com.jgoodies.looks.plastic.PlasticLookAndFeel; -import com.jgoodies.looks.windows.WindowsLookAndFeel; import com.jgoodies.forms.factories.Borders; -import IceGrid.*; import IceGridGUI.Application.Editor; import IceGridGUI.Application.Root; import IceGridGUI.Application.TreeNode; public class ApplicationPane extends JSplitPane implements Tab { + @Override public void updateUI() { super.updateUI(); setEmptyDividerBorder(); } + @Override public void selected() { Coordinator c = _root.getCoordinator(); @@ -73,6 +67,7 @@ public class ApplicationPane extends JSplitPane implements Tab c.showActions(_currentNode); } + @Override public void refresh() { if(_currentNode != null) @@ -88,6 +83,7 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void showNode(TreeNodeBase node) { TreeNode newNode = (TreeNode)node; @@ -135,6 +131,7 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void back() { // @@ -172,6 +169,7 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void forward() { if(_currentEditor != null && !_currentEditor.save(false)) @@ -250,8 +248,8 @@ public class ApplicationPane extends JSplitPane implements Tab JScrollPane leftScroll = new JScrollPane(tree, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); leftScroll.setBorder(Borders.EMPTY); _leftPane.setContent(leftScroll); @@ -264,6 +262,7 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void save() { if(_currentEditor == null || _currentEditor.save(true)) @@ -272,6 +271,7 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void saveToRegistry(boolean restart) { if(_currentEditor == null || _currentEditor.save(true)) @@ -280,6 +280,7 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void saveToFile() { if(_currentEditor == null || _currentEditor.save(true)) @@ -288,11 +289,13 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void discardUpdates() { _root.discardUpdates(); } + @Override public boolean close() { _root.getCoordinator().getMainPane().remove(this); @@ -319,7 +322,7 @@ public class ApplicationPane extends JSplitPane implements Tab javax.swing.InputMap im = _leftPane.getInputMap(); im.put((KeyStroke)action.getValue(Action.ACCELERATOR_KEY), (String)action.getValue(Action.NAME)); - am.put((String)action.getValue(Action.NAME), action); + am.put(action.getValue(Action.NAME), action); } ApplicationPane(Root root) @@ -384,11 +387,13 @@ public class ApplicationPane extends JSplitPane implements Tab private class PopupListener extends MouseAdapter { + @Override public void mousePressed(MouseEvent e) { maybeShowPopup(e); } + @Override public void mouseReleased(MouseEvent e) { maybeShowPopup(e); @@ -417,6 +422,7 @@ public class ApplicationPane extends JSplitPane implements Tab private class SelectionListener implements TreeSelectionListener { + @Override public void valueChanged(TreeSelectionEvent e) { if(_root.isSelectionListenerEnabled()) diff --git a/java/src/IceGridGUI/CellRenderer.java b/java/src/IceGridGUI/CellRenderer.java index dae3b0e68b7..4e319329755 100644 --- a/java/src/IceGridGUI/CellRenderer.java +++ b/java/src/IceGridGUI/CellRenderer.java @@ -16,6 +16,7 @@ import javax.swing.tree.DefaultTreeCellRenderer; class CellRenderer implements TreeCellRenderer { + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java index 778eeadd628..a1aa6994eb6 100644 --- a/java/src/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/Coordinator.java @@ -16,7 +16,6 @@ import java.util.Enumeration; import java.util.Collection; import java.awt.*; import java.awt.event.*; -import java.awt.image.*; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.File; @@ -24,7 +23,6 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import javax.swing.*; -import javax.swing.text.Keymap; import javax.swing.border.EmptyBorder; import javax.swing.filechooser.FileFilter; import javax.swing.text.JTextComponent; @@ -36,21 +34,12 @@ import com.jgoodies.looks.plastic.PlasticLookAndFeel; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.builder.ButtonBarBuilder; import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.factories.DefaultComponentFactory; import com.jgoodies.forms.layout.FormLayout; -import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.util.LayoutStyle; -import java.security.Key; import java.security.KeyStore; import java.security.cert.Certificate; -import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import java.security.MessageDigest; - -import javax.security.auth.x500.X500Principal; - -import Ice.LocatorFinderPrx; import Ice.LocatorFinderPrxHelper; import IceGrid.*; @@ -89,11 +78,13 @@ public class Coordinator add(_connectedLabel, BorderLayout.LINE_END); } + @Override public void setText(String text) { _text.setText(text); } + @Override public void setConnected(boolean connected) { if(connected) @@ -118,6 +109,7 @@ public class Coordinator setEnabled(false); } + @Override public void actionPerformed(ActionEvent e) { if(_target != null) @@ -126,6 +118,7 @@ public class Coordinator } } + @Override public void propertyChange(java.beans.PropertyChangeEvent e) { // @@ -171,6 +164,7 @@ public class Coordinator super(name); } + @Override public void actionPerformed(ActionEvent e) { if(_target != null) @@ -193,6 +187,7 @@ public class Coordinator private class FocusListener implements java.beans.PropertyChangeListener { + @Override public void propertyChange(java.beans.PropertyChangeEvent e) { Object o = e.getNewValue(); @@ -605,12 +600,14 @@ public class Coordinator _clientProxy = proxy; } + @Override public Ice.ObjectPrx getClientProxy(Ice.Current current) { return _clientProxy; } + @Override public Ice.ObjectPrx getServerProxy(Ice.Current current) { @@ -618,11 +615,14 @@ public class Coordinator } /** @deprecated **/ + @Deprecated + @Override public void addProxy(Ice.ObjectPrx proxy, Ice.Current current) { } + @Override public Ice.ObjectPrx[] addProxies(Ice.ObjectPrx[] proxies, Ice.Current current) { @@ -939,6 +939,7 @@ public class Coordinator JOptionPane.ERROR_MESSAGE); } + @Override public void run() { getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); @@ -947,6 +948,7 @@ public class Coordinator final String prefix = "Deleting application '" + name + "'..."; Callback_Admin_removeApplication cb = new Callback_Admin_removeApplication() { + @Override public void response() { if(_traceSaveToRegistry) @@ -956,6 +958,7 @@ public class Coordinator SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { release(); @@ -964,6 +967,7 @@ public class Coordinator }); } + @Override public void exception(final Ice.UserException e) { if(_traceSaveToRegistry) @@ -973,6 +977,7 @@ public class Coordinator SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { handleFailure(prefix, "Delete failed", @@ -982,6 +987,7 @@ public class Coordinator }); } + @Override public void exception(final Ice.LocalException e) { if(_traceSaveToRegistry) @@ -991,6 +997,7 @@ public class Coordinator SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { handleFailure(prefix, "Delete failed", @@ -1272,11 +1279,9 @@ public class Coordinator // // Keep certificates arround for connection retry // - _trasientCert = null; + _transientCert = null; _liveDeploymentRoot.clear(); - AdminSessionPrx session = null; - destroyCommunicator(); Ice.InitializationData initData = _initData; @@ -1385,6 +1390,7 @@ public class Coordinator return _decision; } + @Override public void run() { @@ -1410,6 +1416,7 @@ public class Coordinator private TrustDecision _decision = TrustDecision.No; } + @Override public boolean verify(IceSSL.NativeConnectionInfo info) { if(!(info.nativeCerts[0] instanceof X509Certificate)) @@ -1430,14 +1437,14 @@ public class Coordinator // // Compare the server certificate with a previous accepted certificate if - // any, the trasient certificate is reset by Coordinator.login, and is only - // ussefull in case the connection is retry, because a timeout or ACM closed - // it while the certificate verifier was waiting for the user decission. + // any, the transient certificate is reset by Coordinator.login, and is only + // useful in case the connection is retry, because a timeout or ACM closed + // it while the certificate verifier was waiting for the user decision. // // This avoids to show the dialog again if the user already granted the cert for // this login operation. // - if(_trasientCert != null && _trasientCert.equals(cert)) + if(_transientCert != null && _transientCert.equals(cert)) { return true; } @@ -1447,9 +1454,9 @@ public class Coordinator // try { - for(Enumeration e = _trustedServerKeyStore.aliases(); e.hasMoreElements() ;) + for(Enumeration<String> e = _trustedServerKeyStore.aliases(); e.hasMoreElements() ;) { - String alias = e.nextElement().toString(); + String alias = e.nextElement(); if(!_trustedServerKeyStore.isCertificateEntry(alias)) { continue; @@ -1478,6 +1485,7 @@ public class Coordinator { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, ex.toString(), "Error loading keystore", @@ -1516,12 +1524,11 @@ public class Coordinator // try { - Collection altNames = cert.getSubjectAlternativeNames(); + Collection<java.util.List<?>> altNames = cert.getSubjectAlternativeNames(); if(altNames != null) { - for(Object o : altNames) + for(java.util.List<?> l : altNames) { - java.util.List l = (java.util.List)o; Integer kind = (Integer)l.get(0); if(kind != 2 && kind != 7) { @@ -1546,9 +1553,9 @@ public class Coordinator // try { - for(Enumeration e = _trustedCaKeyStore.aliases(); e.hasMoreElements() ;) + for(Enumeration<String> e = _trustedCaKeyStore.aliases(); e.hasMoreElements() ;) { - String alias = e.nextElement().toString(); + String alias = e.nextElement(); if(!_trustedCaKeyStore.isCertificateEntry(alias)) { continue; @@ -1575,6 +1582,7 @@ public class Coordinator { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, ex.toString(), "Error loading keystore", @@ -1604,7 +1612,7 @@ public class Coordinator if(decision == TrustDecision.YesThisTime) { - _trasientCert = (X509Certificate) info.nativeCerts[0]; + _transientCert = (X509Certificate) info.nativeCerts[0]; return true; } else if(decision == TrustDecision.YesAlways) @@ -1635,6 +1643,7 @@ public class Coordinator { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, ex.toString(), "Error saving certificate", @@ -1673,6 +1682,7 @@ public class Coordinator { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, ex.toString(), @@ -1803,6 +1813,7 @@ public class Coordinator final ConnectionCallback cb = new ConnectionCallback(); new Thread(new Runnable() { + @Override public void run() { try @@ -1840,6 +1851,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog( @@ -1867,6 +1879,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog( @@ -1894,6 +1907,7 @@ public class Coordinator } SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { cb.loginSuccess(); @@ -1904,6 +1918,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { String msg = e.reason; @@ -1933,6 +1948,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, "Could not create session: " @@ -1948,7 +1964,8 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { - public void run() + @Override + public void run() { JOptionPane.showMessageDialog( getMainFrame(), @@ -1963,6 +1980,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, @@ -2032,6 +2050,7 @@ public class Coordinator new Thread(new Runnable() { + @Override public void run() { synchronized(Coordinator.this) @@ -2061,6 +2080,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog( @@ -2081,7 +2101,8 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { - public void run() + @Override + public void run() { JOptionPane.showMessageDialog( getMainFrame(), @@ -2096,6 +2117,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog( @@ -2172,6 +2194,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { String msg = e.reason; @@ -2205,6 +2228,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, @@ -2221,6 +2245,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(JOptionPane.showConfirmDialog( @@ -2249,6 +2274,7 @@ public class Coordinator SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { cb.loginSuccess(); @@ -2277,14 +2303,17 @@ public class Coordinator Glacier2.Callback_Router_destroySession cb = new Glacier2.Callback_Router_destroySession() { + @Override public void response() { } + @Override public void exception(Ice.LocalException ex) { } + @Override public void exception(Ice.UserException ex) { } @@ -2607,6 +2636,7 @@ public class Coordinator _shutdownHook = new Thread("Shutdown hook") { + @Override public void run() { destroyIceGridAdmin(); @@ -2630,11 +2660,13 @@ public class Coordinator _saveXMLChooser.addChoosableFileFilter(new FileFilter() { + @Override public boolean accept(File f) { return f.isDirectory() || f.getName().endsWith(".xml"); } + @Override public String getDescription() { return ".xml files"; @@ -2645,6 +2677,7 @@ public class Coordinator _saveLogChooser.addChoosableFileFilter(new FileFilter() { + @Override public boolean accept(File f) { return f.isDirectory() || @@ -2654,6 +2687,7 @@ public class Coordinator f.getName().endsWith(".txt"); } + @Override public String getDescription() { return ".out .err .log .txt files"; @@ -2673,6 +2707,7 @@ public class Coordinator // _newApplication = new AbstractAction("Application") { + @Override public void actionPerformed(ActionEvent e) { newApplication(); @@ -2682,6 +2717,7 @@ public class Coordinator _newApplicationWithDefaultTemplates = new AbstractAction("Application with Default Templates from Registry") { + @Override public void actionPerformed(ActionEvent e) { newApplicationWithDefaultTemplates(); @@ -2691,6 +2727,7 @@ public class Coordinator _login = new AbstractAction("Login...") { + @Override public void actionPerformed(ActionEvent e) { _sessionKeeper.connectionManager(); @@ -2700,6 +2737,7 @@ public class Coordinator _logout = new AbstractAction("Logout") { + @Override public void actionPerformed(ActionEvent e) { if(_graphViews.size() > 0) @@ -2726,6 +2764,7 @@ public class Coordinator _acquireExclusiveWriteAccess = new AbstractAction("Acquire Exclusive Write Access") { + @Override public void actionPerformed(ActionEvent e) { try @@ -2746,6 +2785,7 @@ public class Coordinator _releaseExclusiveWriteAccess = new AbstractAction("Release Exclusive Write Access") { + @Override public void actionPerformed(ActionEvent e) { releaseExclusiveWriteAccess(); @@ -2759,6 +2799,7 @@ public class Coordinator _newGraph = new AbstractAction("Metrics Graph") { + @Override public void actionPerformed(ActionEvent e) { createGraphView(); @@ -2768,6 +2809,7 @@ public class Coordinator _showLiveDeploymentFilters = new AbstractAction("Filter live deployment") { + @Override public void actionPerformed(ActionEvent e) { @@ -2811,6 +2853,7 @@ public class Coordinator _openApplicationFromFile = new AbstractAction("Application from File") { + @Override public void actionPerformed(ActionEvent e) { int result = _openChooser.showOpenDialog(_mainFrame); @@ -2850,6 +2893,7 @@ public class Coordinator _openApplicationFromRegistry = new AbstractAction("Application from Registry") { + @Override public void actionPerformed(ActionEvent e) { Object[] applicationNames = _liveDeploymentRoot.getApplicationNames(); @@ -2890,6 +2934,7 @@ public class Coordinator _closeApplication = new AbstractAction("Close Application") { + @Override public void actionPerformed(ActionEvent e) { Tab tab = getCurrentTab(); @@ -2916,6 +2961,7 @@ public class Coordinator _save = new AbstractAction("Save") { + @Override public void actionPerformed(ActionEvent e) { try @@ -2936,6 +2982,7 @@ public class Coordinator _saveToRegistry = new AbstractAction("Save to Registry (Servers may restart)") { + @Override public void actionPerformed(ActionEvent e) { getCurrentTab().saveToRegistry(true); @@ -2947,6 +2994,7 @@ public class Coordinator _saveToRegistryWithoutRestart = new AbstractAction("Save to Registry (No server restart)") { + @Override public void actionPerformed(ActionEvent e) { getCurrentTab().saveToRegistry(false); @@ -2957,6 +3005,7 @@ public class Coordinator _saveToFile = new AbstractAction("Save to File") { + @Override public void actionPerformed(ActionEvent e) { try @@ -2975,6 +3024,7 @@ public class Coordinator _discardUpdates = new AbstractAction("Discard Updates") { + @Override public void actionPerformed(ActionEvent e) { getCurrentTab().discardUpdates(); @@ -2985,6 +3035,7 @@ public class Coordinator _certificateManager = new AbstractAction("Certificate Manager...") { + @Override public void actionPerformed(ActionEvent e) { SessionKeeper.CertificateManagerDialog d = _sessionKeeper.certificateManager(getMainFrame()); @@ -2998,6 +3049,7 @@ public class Coordinator _exit = new AbstractAction("Exit") { + @Override public void actionPerformed(ActionEvent e) { exit(0); @@ -3007,6 +3059,7 @@ public class Coordinator _back = new AbstractAction("Go Back to the Previous Node") { + @Override public void actionPerformed(ActionEvent e) { getCurrentTab().back(); @@ -3017,6 +3070,7 @@ public class Coordinator _forward = new AbstractAction("Go to the Next Node") { + @Override public void actionPerformed(ActionEvent e) { getCurrentTab().forward(); @@ -3027,6 +3081,7 @@ public class Coordinator _helpContents = new AbstractAction("Contents") { + @Override public void actionPerformed(ActionEvent e) { helpContents(); @@ -3035,6 +3090,7 @@ public class Coordinator _about = new AbstractAction("About") { + @Override public void actionPerformed(ActionEvent e) { about(); @@ -3043,6 +3099,7 @@ public class Coordinator _patchApplication = new AbstractAction("Patch Distribution") { + @Override public void actionPerformed(ActionEvent e) { Object[] applicationNames = _liveDeploymentRoot.getPatchableApplicationNames(); @@ -3074,6 +3131,7 @@ public class Coordinator _showApplicationDetails = new AbstractAction("Show details") { + @Override public void actionPerformed(ActionEvent e) { Object[] applicationNames = _liveDeploymentRoot.getApplicationNames(); @@ -3109,6 +3167,7 @@ public class Coordinator _removeApplicationFromRegistry = new AbstractAction("Remove from Registry") { + @Override public void actionPerformed(ActionEvent e) { Object[] applicationNames = _liveDeploymentRoot.getApplicationNames(); @@ -3182,7 +3241,7 @@ public class Coordinator _mainFrame.getContentPane().add(new ToolBar(), BorderLayout.PAGE_START); - _mainFrame.getContentPane().add((StatusBarI)_statusBar, BorderLayout.PAGE_END); + _mainFrame.getContentPane().add(_statusBar, BorderLayout.PAGE_END); java.awt.KeyboardFocusManager kbm = java.awt.KeyboardFocusManager.getCurrentKeyboardFocusManager(); kbm.addPropertyChangeListener("permanentFocusOwner", new FocusListener()); @@ -3195,6 +3254,7 @@ public class Coordinator new java.util.concurrent.ScheduledThreadPoolExecutor(1, new java.util.concurrent.ThreadFactory() { + @Override public Thread newThread(Runnable r) { Thread t = new Thread(r); @@ -3236,7 +3296,7 @@ public class Coordinator try { - Constructor ctor = c1.getConstructor(new Class[] { Coordinator.class, String.class }); + Constructor<?> ctor = c1.getConstructor(new Class[] { Coordinator.class, String.class }); view = (IGraphView)ctor.newInstance(new Object[] { Coordinator.this, title.toString() }); _graphViews.add(view); } @@ -3786,6 +3846,7 @@ public class Coordinator JButton yesAlwaysButton = new JButton(new AbstractAction("Yes, Always Trust") { + @Override public void actionPerformed(ActionEvent e) { _decision = TrustDecision.YesAlways; @@ -3795,6 +3856,7 @@ public class Coordinator JButton yesButton = new JButton(new AbstractAction("Yes, Just This Time") { + @Override public void actionPerformed(ActionEvent e) { _decision = TrustDecision.YesThisTime; @@ -3804,6 +3866,7 @@ public class Coordinator JButton noButton = new JButton(new AbstractAction("No") { + @Override public void actionPerformed(ActionEvent e) { _decision = TrustDecision.No; @@ -3955,11 +4018,9 @@ public class Coordinator private String _fileParser; private boolean _connected; - private X509Certificate _trasientCert; + private X509Certificate _transientCert; private java.util.List<IGraphView> _graphViews = new java.util.ArrayList<IGraphView>(); private java.util.concurrent.ScheduledExecutorService _executor; - - static private final int HISTORY_MAX_SIZE = 20; } diff --git a/java/src/IceGridGUI/EditorBase.java b/java/src/IceGridGUI/EditorBase.java index 1d894017f88..6b045e67454 100644 --- a/java/src/IceGridGUI/EditorBase.java +++ b/java/src/IceGridGUI/EditorBase.java @@ -15,14 +15,13 @@ import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JToolBar; +import javax.swing.ScrollPaneConstants; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.Borders; import com.jgoodies.forms.layout.FormLayout; import com.jgoodies.forms.util.LayoutStyle; -import IceGrid.*; - // // Base class for all editors // @@ -71,8 +70,8 @@ public abstract class EditorBase JScrollPane scrollPane = new JScrollPane(contents, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); scrollPane.setBorder(Borders.DIALOG); diff --git a/java/src/IceGridGUI/Fallback.java b/java/src/IceGridGUI/Fallback.java index 3e27436ce4c..31293f94386 100644 --- a/java/src/IceGridGUI/Fallback.java +++ b/java/src/IceGridGUI/Fallback.java @@ -13,6 +13,7 @@ import javax.swing.JOptionPane; public class Fallback extends javax.swing.JApplet { + @Override public void start() { try @@ -52,6 +53,7 @@ public class Fallback extends javax.swing.JApplet { Runtime.getRuntime().addShutdownHook(new Thread() { + @Override public void run() { while(true) diff --git a/java/src/IceGridGUI/LiveActions.java b/java/src/IceGridGUI/LiveActions.java index f70af2baae1..147a5946814 100644 --- a/java/src/IceGridGUI/LiveActions.java +++ b/java/src/IceGridGUI/LiveActions.java @@ -13,7 +13,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; -import IceGrid.*; import IceGridGUI.LiveDeployment.*; // @@ -30,6 +29,7 @@ public class LiveActions putValue(Action.SHORT_DESCRIPTION, "Send " + _name); } + @Override public void actionPerformed(ActionEvent e) { _target.signal(_name); @@ -67,6 +67,7 @@ public class LiveActions { _array[TreeNode.START] = new AbstractAction("Start", Utils.getIcon("/icons/16x16/start.png")) { + @Override public void actionPerformed(ActionEvent e) { _target.start(); @@ -76,6 +77,7 @@ public class LiveActions _array[TreeNode.STOP] = new AbstractAction("Stop", Utils.getIcon("/icons/16x16/stop.png")) { + @Override public void actionPerformed(ActionEvent e) { _target.stop(); @@ -86,6 +88,7 @@ public class LiveActions _array[TreeNode.ENABLE] = new AbstractAction("Enable", Utils.getIcon("/icons/16x16/enable.png")) { + @Override public void actionPerformed(ActionEvent e) { _target.enable(); @@ -95,6 +98,7 @@ public class LiveActions _array[TreeNode.DISABLE] = new AbstractAction("Disable", Utils.getIcon("/icons/16x16/disable.png")) { + @Override public void actionPerformed(ActionEvent e) { _target.disable(); @@ -112,6 +116,7 @@ public class LiveActions _array[TreeNode.WRITE_MESSAGE] = new AbstractAction("Write Message") { + @Override public void actionPerformed(ActionEvent e) { _target.writeMessage(); @@ -122,6 +127,7 @@ public class LiveActions _array[TreeNode.RETRIEVE_STDOUT] = new AbstractAction("Retrieve stdout") { + @Override public void actionPerformed(ActionEvent e) { _target.retrieveOutput(true); @@ -131,6 +137,7 @@ public class LiveActions _array[TreeNode.RETRIEVE_STDERR] = new AbstractAction("Retrieve stderr") { + @Override public void actionPerformed(ActionEvent e) { _target.retrieveOutput(false); @@ -140,6 +147,7 @@ public class LiveActions _array[TreeNode.RETRIEVE_LOG] = new AbstractAction("Retrieve Log") { + @Override public void actionPerformed(ActionEvent e) { _target.retrieveLog(); @@ -149,6 +157,7 @@ public class LiveActions _array[TreeNode.SHUTDOWN_NODE] = new AbstractAction("Shutdown") { + @Override public void actionPerformed(ActionEvent e) { _target.shutdownNode(); @@ -157,6 +166,7 @@ public class LiveActions _array[TreeNode.SHUTDOWN_REGISTRY] = new AbstractAction("Shutdown") { + @Override public void actionPerformed(ActionEvent e) { _target.shutdownRegistry(); @@ -165,6 +175,7 @@ public class LiveActions _array[TreeNode.PATCH_SERVER] = new AbstractAction("Patch Distribution") { + @Override public void actionPerformed(ActionEvent e) { _target.patchServer(); @@ -173,6 +184,7 @@ public class LiveActions _array[TreeNode.ADD_OBJECT] = new AbstractAction("Add Well-known Object") { + @Override public void actionPerformed(ActionEvent e) { _target.addObject(); @@ -181,6 +193,7 @@ public class LiveActions _array[TreeNode.OPEN_DEFINITION] = new AbstractAction("Open Definition") { + @Override public void actionPerformed(ActionEvent e) { _target.openDefinition(); @@ -189,6 +202,7 @@ public class LiveActions _array[TreeNode.ENABLE_METRICS_VIEW] = new AbstractAction("Enable Metrics View") { + @Override public void actionPerformed(ActionEvent e) { _target.enableMetricsView(true); @@ -197,6 +211,7 @@ public class LiveActions _array[TreeNode.DISABLE_METRICS_VIEW] = new AbstractAction("Disable Metrics View") { + @Override public void actionPerformed(ActionEvent e) { _target.enableMetricsView(false); diff --git a/java/src/IceGridGUI/LiveDeployment/Adapter.java b/java/src/IceGridGUI/LiveDeployment/Adapter.java index f70a40c5b80..d169c653477 100644 --- a/java/src/IceGridGUI/LiveDeployment/Adapter.java +++ b/java/src/IceGridGUI/LiveDeployment/Adapter.java @@ -14,16 +14,12 @@ import java.awt.Component; import javax.swing.Icon; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; - -import java.util.Enumeration; - import IceGrid.*; import IceGridGUI.*; class Adapter extends TreeNode { + @Override public Editor getEditor() { if(_editor == null) @@ -34,6 +30,7 @@ class Adapter extends TreeNode return _editor; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, diff --git a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java index 3c5de9630be..2c19d4ea883 100644 --- a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java @@ -9,14 +9,7 @@ package IceGridGUI.LiveDeployment; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JButton; import javax.swing.JCheckBox; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JTextField; @@ -73,7 +66,7 @@ class AdapterEditor extends Editor // getId() returns the name of the adapter! _endpoints.setText(resolver.substitute(properties.get(adapter.getId() + ".Endpoints"))); _publishedEndpoints.setText( - resolver.substitute((String)properties.get(adapter.getId() + ".PublishedEndpoints"))); + resolver.substitute(properties.get(adapter.getId() + ".PublishedEndpoints"))); _registerProcess.setSelected(descriptor.registerProcess); _serverLifetime.setSelected(descriptor.serverLifetime); @@ -82,6 +75,7 @@ class AdapterEditor extends Editor _allocatables.setObjects(descriptor.allocatables, resolver); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.appendSeparator("Runtime Status"); @@ -158,6 +152,7 @@ class AdapterEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); diff --git a/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java b/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java index 340d0995e01..8784f8812a2 100644 --- a/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java +++ b/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java @@ -9,23 +9,11 @@ package IceGridGUI.LiveDeployment; -import java.awt.BorderLayout; import java.awt.Container; -import java.awt.Dimension; -import java.awt.Frame; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFrame; -import javax.swing.JPanel; -import javax.swing.JScrollPane; import javax.swing.JTextField; +import javax.swing.WindowConstants; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.Borders; @@ -39,7 +27,7 @@ class ApplicationDetailsDialog extends JDialog ApplicationDetailsDialog(final Root root) { super(root.getCoordinator().getMainFrame(), "Application Details - IceGrid Admin", true); - setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); _mainFrame = root.getCoordinator().getMainFrame(); _name.setEditable(false); diff --git a/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java b/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java index d8ec8402e83..19a8b63def2 100644 --- a/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java @@ -33,6 +33,7 @@ class CommunicatorEditor extends Editor _properties.setSortedMap(properties); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Description"); diff --git a/java/src/IceGridGUI/LiveDeployment/DbEnv.java b/java/src/IceGridGUI/LiveDeployment/DbEnv.java index abce9740976..2788f3ee5ad 100644 --- a/java/src/IceGridGUI/LiveDeployment/DbEnv.java +++ b/java/src/IceGridGUI/LiveDeployment/DbEnv.java @@ -12,15 +12,12 @@ package IceGridGUI.LiveDeployment; import java.awt.Component; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; -import java.util.Enumeration; - import IceGrid.*; import IceGridGUI.*; class DbEnv extends TreeNode { + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -38,6 +35,7 @@ class DbEnv extends TreeNode return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public Editor getEditor() { if(_editor == null) diff --git a/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java b/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java index 3ed982b5e37..03a9596db66 100644 --- a/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java @@ -10,13 +10,9 @@ package IceGridGUI.LiveDeployment; import javax.swing.JScrollPane; -import javax.swing.JTable; import javax.swing.JTextArea; import javax.swing.JTextField; -import javax.swing.table.DefaultTableModel; -import javax.swing.table.DefaultTableCellRenderer; - import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.layout.CellConstraints; @@ -50,6 +46,7 @@ class DbEnvEditor extends Editor _properties.setProperties(descriptor.properties, resolver); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Description"); @@ -83,6 +80,7 @@ class DbEnvEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); diff --git a/java/src/IceGridGUI/LiveDeployment/Editor.java b/java/src/IceGridGUI/LiveDeployment/Editor.java index 5b738929102..7ed53021c5a 100644 --- a/java/src/IceGridGUI/LiveDeployment/Editor.java +++ b/java/src/IceGridGUI/LiveDeployment/Editor.java @@ -10,7 +10,6 @@ package IceGridGUI.LiveDeployment; import IceGridGUI.*; -import IceGrid.*; public abstract class Editor extends EditorBase { diff --git a/java/src/IceGridGUI/LiveDeployment/GraphView.java b/java/src/IceGridGUI/LiveDeployment/GraphView.java index 3d006331e2a..e42c20b9b5e 100644 --- a/java/src/IceGridGUI/LiveDeployment/GraphView.java +++ b/java/src/IceGridGUI/LiveDeployment/GraphView.java @@ -13,27 +13,19 @@ import java.util.Map; import java.util.List; import java.util.Stack; import java.util.HashMap; -import java.util.ArrayList; - import java.util.Date; import java.util.TimeZone; - import java.text.DateFormat; import java.text.SimpleDateFormat; - import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; - import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Container; import java.awt.Dimension; - import java.awt.Frame; import java.awt.Color; import java.awt.Rectangle; - import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; @@ -47,17 +39,12 @@ import javax.swing.BorderFactory; import javax.swing.border.Border; import javax.swing.DefaultCellEditor; import javax.swing.DefaultListCellRenderer; - -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import javax.swing.event.TableModelEvent; import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionEvent; - import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; -import javax.swing.JComponent; import javax.swing.JColorChooser; import javax.swing.colorchooser.AbstractColorChooserPanel; import javax.swing.JDialog; @@ -77,50 +64,37 @@ import javax.swing.KeyStroke; import javax.swing.ListCellRenderer; import javax.swing.SwingUtilities; import javax.swing.SpinnerNumberModel; -import javax.swing.SwingConstants; import javax.swing.JSplitPane; - -import javax.swing.ListSelectionModel; -import javax.swing.table.DefaultTableModel; +import javax.swing.WindowConstants; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.text.DecimalFormat; import javafx.application.Platform; - import javafx.embed.swing.JFXPanel; - import javafx.scene.chart.LineChart; import javafx.scene.chart.NumberAxis; import javafx.scene.chart.XYChart; - import javafx.scene.Scene; - import javafx.scene.input.MouseEvent; import javafx.event.EventHandler; import javafx.scene.input.MouseButton; - import javafx.scene.input.DragEvent; import javafx.scene.input.TransferMode; import javafx.scene.input.DataFormat; import javafx.scene.input.Dragboard; - import javafx.util.StringConverter; import com.jgoodies.forms.layout.FormLayout; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.builder.ButtonBarBuilder; -import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.looks.Options; import com.jgoodies.looks.HeaderStyle; import com.jgoodies.looks.BorderStyle; import com.jgoodies.looks.plastic.PlasticLookAndFeel; -import IceGrid.*; import IceGridGUI.*; - import IceGridGUI.LiveDeployment.MetricsViewEditor.MetricsViewInfo; import IceGridGUI.LiveDeployment.MetricsViewEditor.MetricsCell; import IceGridGUI.LiveDeployment.MetricsViewEditor.MetricsViewTransferableData; @@ -241,9 +215,10 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // Platform.setImplicitExit(false); setIconImage(Utils.getIcon("/icons/16x16/metrics_graph.png").getImage()); - setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { close(); @@ -255,6 +230,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // Action preferences = new AbstractAction("Preferences") { + @Override public void actionPerformed(ActionEvent event) { // @@ -335,6 +311,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato _legendTable = new JTable(_legendModel) { //Implement table cell tool tips. + @Override public String getToolTipText(java.awt.event.MouseEvent e) { if(convertColumnIndexToModel(columnAtPoint(e.getPoint())) == 6) @@ -364,6 +341,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // final Action delete = new AbstractAction("Delete") { + @Override public void actionPerformed(ActionEvent event) { int[] selectedRows = _legendTable.getSelectedRows(); @@ -445,6 +423,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato _legendTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent e) { if(!e.getValueIsAdjusting()) @@ -557,6 +536,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato scene.setOnDragOver( new EventHandler<DragEvent>() { + @Override public void handle(DragEvent event) { Dragboard db = event.getDragboard(); @@ -575,6 +555,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato scene.setOnDragDropped( new EventHandler<DragEvent>() { + @Override public void handle(DragEvent event) { boolean success = false; @@ -630,74 +611,6 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } } - private void removeRows(MetricsViewInfo info) - { - // - // Remove rows from series hash maps - // - Map<String, Map<String, Map<String, MetricsRow>>> j = _series.remove(info); - if(j == null) - { - return; - } - - final List<MetricsRow> rows = new ArrayList<MetricsRow>(); - for(Map.Entry<String, Map<String, Map<String, MetricsRow>>> i : j.entrySet()) - { - for(Map.Entry<String, Map<String, MetricsRow>> k : i.getValue().entrySet()) - { - for(Map.Entry<String, MetricsRow> l : k.getValue().entrySet()) - { - rows.add(l.getValue()); - } - } - } - - int rowIndexes[] = new int[rows.size()]; - for(int i = 0; i < rows.size(); ++i) - { - rowIndexes[i] = _legendModel.getRowIndex(rows.get(i)); - } - _legendModel.removeRows(rowIndexes); - - // - // Remove series from the chart, in JavaFx thread. - // - enqueueJFX(new Runnable() - { - @Override - public void run() - { - for(MetricsRow row : rows) - { - String seriesClass = getSeriesClass(row.series.peek()); - if(seriesClass != null) - { - _styles.remove(seriesClass); - } - // - // Don't remove the XYChart.Series object here, to avoid the series style classes - // to be reasign by JavaFX. - // - // _chart.getData().remove(row.series); - for(int i = 0; i < row.series.size(); ++i) - { - XYChart.Series<Number, Number> series = row.series.get(i); - if(series == null || series.getData() == null) - { - continue; - } - - while(series.getData().size() > 0) - { - series.getData().remove(0); - } - } - } - } - }); - } - private boolean showInfo() { try @@ -803,6 +716,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato return true; } + @Override public void close() { storePreferences(); @@ -812,6 +726,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato dispose(); } + @Override public void addSeries(final MetricsViewTransferableData data) { // @@ -882,6 +797,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // enqueueSwing(new Runnable() { + @Override public void run() { int i = _legendModel.getRowIndex(row); @@ -901,6 +817,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // enqueueSwing(new Runnable() { + @Override public void run() { _legendModel.addRow(row); @@ -964,6 +881,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // enqueueSwing(new Runnable() { + @Override public void run() { int i = _legendModel.getRowIndex(row); @@ -1091,6 +1009,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // enqueueSwing(new Runnable() { + @Override public void run() { _legendModel.fireTableChanged( @@ -1154,6 +1073,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato { _refreshFuture = _coordinator.getExecutor().scheduleAtFixedRate(new Runnable() { + @Override public void run() { java.util.Set<MetricsViewInfo> metrics = null; @@ -1166,17 +1086,20 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato { IceMX.Callback_MetricsAdmin_getMetricsView cb = new IceMX.Callback_MetricsAdmin_getMetricsView() { + @Override public void response(final java.util.Map<java.lang.String, IceMX.Metrics[]> data, long timestamp) { addData(m, data, timestamp); } + @Override public void exception(final Ice.LocalException e) { addData(m, null, 0); } + @Override public void exception(final Ice.UserException e) { addData(m, null, 0); @@ -1205,6 +1128,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } } + @Override public synchronized int getRefreshPeriod() { return _refreshPeriod; @@ -1313,22 +1237,26 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato class LegendTableModel extends javax.swing.table.AbstractTableModel { + @Override public String getColumnName(int col) { return _columnNames[col]; } + @Override public int getRowCount() { return _rows.size(); } + @Override public int getColumnCount() { return _columnNames.length; } - public Class getColumnClass(int columnIndex) + @Override + public Class<?> getColumnClass(int columnIndex) { switch(columnIndex) { @@ -1391,6 +1319,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } } + @Override public Object getValueAt(int rowIndex, int columnIndex) { if(rowIndex > _rows.size() || columnIndex > _columnNames.length) @@ -1459,6 +1388,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } } + @Override public boolean isCellEditable(int row, int col) { if(col < _columnNames.length && (_columnNames[col].equals("Show") || @@ -1473,6 +1403,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } } + @Override public void setValueAt(final Object value, int rowIndex, int columnIndex) { if(isCellEditable(rowIndex, columnIndex)) @@ -1691,6 +1622,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato private void enqueueJFX(final Runnable runnable) { _queue.submit(new Runnable() { + @Override public void run() { Platform.runLater(new Runnable() @@ -1716,6 +1648,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato private void enqueueSwing(final Runnable runnable) { _queue.submit(new Runnable() { + @Override public void run() { SwingUtilities.invokeLater(new Runnable() @@ -1738,6 +1671,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato }); } + @SuppressWarnings("rawtypes") static class DecimalRenderer extends DefaultListCellRenderer { public DecimalRenderer(ListCellRenderer renderer) @@ -1791,6 +1725,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } + @Override public void actionPerformed(ActionEvent e) { if(EDIT.equals(e.getActionCommand())) @@ -1807,11 +1742,13 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } } + @Override public Object getCellEditorValue() { return _currentColor; } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { @@ -1838,6 +1775,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato setOpaque(true); //MUST do this for background to show up. } + @Override public Component getTableCellRendererComponent(JTable table, Object color, boolean isSelected, boolean hasFocus, int row, int column) { @@ -1882,7 +1820,6 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato private String[] _dateFormats = new String[]{"HH:mm:ss", "mm:ss"}; private String _dateFormat = _dateFormats[0]; private final TimeFormatter _timeFormater = new TimeFormatter(_dateFormat); - private final Object _monitor = new Object(); private LineChart<Number, Number> _chart; private NumberAxis _xAxis; @@ -1909,9 +1846,6 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato Map<String, MetricsRow>>>> _series = new HashMap<MetricsViewInfo, Map<String, Map<String, Map<String, MetricsRow>>>>(); - private final static String MetricsCellFlavor = - "application/x-icegridadmin-metrics-cells; class=java.io.InputStream"; - private final static String[] DefaultColors = new String[] { "#FF0000", // Red @@ -1962,6 +1896,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato private final java.util.concurrent.ExecutorService _queue = java.util.concurrent.Executors.newSingleThreadExecutor( new java.util.concurrent.ThreadFactory() { + @Override public Thread newThread(Runnable r) { Thread t = new Thread(r); diff --git a/java/src/IceGridGUI/LiveDeployment/ListArrayTreeNode.java b/java/src/IceGridGUI/LiveDeployment/ListArrayTreeNode.java index 8566ec3b057..92421951d96 100644 --- a/java/src/IceGridGUI/LiveDeployment/ListArrayTreeNode.java +++ b/java/src/IceGridGUI/LiveDeployment/ListArrayTreeNode.java @@ -11,18 +11,17 @@ package IceGridGUI.LiveDeployment; import java.util.Enumeration; -import IceGrid.*; -import IceGridGUI.*; - // // A TreeNode that holds an array of list of children // abstract class ListArrayTreeNode extends TreeNode { + @Override public Enumeration children() { return new Enumeration() { + @Override public boolean hasMoreElements() { if(_p.hasNext()) @@ -41,6 +40,7 @@ abstract class ListArrayTreeNode extends TreeNode return false; } + @Override public Object nextElement() { try @@ -65,11 +65,13 @@ abstract class ListArrayTreeNode extends TreeNode }; } + @Override public boolean getAllowsChildren() { return true; } + @Override public javax.swing.tree.TreeNode getChildAt(int childIndex) { if(childIndex < 0) @@ -91,6 +93,7 @@ abstract class ListArrayTreeNode extends TreeNode throw new ArrayIndexOutOfBoundsException(childIndex); } + @Override public int getChildCount() { int result = 0; @@ -101,6 +104,7 @@ abstract class ListArrayTreeNode extends TreeNode return result; } + @Override public int getIndex(javax.swing.tree.TreeNode node) { int offset = 0; @@ -119,6 +123,7 @@ abstract class ListArrayTreeNode extends TreeNode return -1; } + @Override public boolean isLeaf() { for(java.util.List l : _childrenArray) diff --git a/java/src/IceGridGUI/LiveDeployment/ListTreeNode.java b/java/src/IceGridGUI/LiveDeployment/ListTreeNode.java index d043c234770..9c9f8da2f25 100644 --- a/java/src/IceGridGUI/LiveDeployment/ListTreeNode.java +++ b/java/src/IceGridGUI/LiveDeployment/ListTreeNode.java @@ -11,23 +11,23 @@ package IceGridGUI.LiveDeployment; import java.util.Enumeration; -import IceGrid.*; -import IceGridGUI.*; - // // An TreeNode that holds a list of children // abstract class ListTreeNode extends TreeNode { + @Override public Enumeration children() { return new Enumeration() { + @Override public boolean hasMoreElements() { return _p.hasNext(); } + @Override public Object nextElement() { return _p.next(); @@ -37,11 +37,13 @@ abstract class ListTreeNode extends TreeNode }; } + @Override public boolean getAllowsChildren() { return true; } + @Override public javax.swing.tree.TreeNode getChildAt(int childIndex) { if(childIndex < 0) @@ -50,7 +52,7 @@ abstract class ListTreeNode extends TreeNode } else if(childIndex < _children.size()) { - return (javax.swing.tree.TreeNode)_children.get(childIndex); + return _children.get(childIndex); } else { @@ -58,16 +60,19 @@ abstract class ListTreeNode extends TreeNode } } + @Override public int getChildCount() { return _children.size(); } + @Override public int getIndex(javax.swing.tree.TreeNode node) { return _children.indexOf(node); } + @Override public boolean isLeaf() { return _children.isEmpty(); diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsView.java b/java/src/IceGridGUI/LiveDeployment/MetricsView.java index 0ce60746390..2840f21de09 100644 --- a/java/src/IceGridGUI/LiveDeployment/MetricsView.java +++ b/java/src/IceGridGUI/LiveDeployment/MetricsView.java @@ -14,20 +14,15 @@ import java.awt.Component; import javax.swing.Icon; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; import javax.swing.SwingUtilities; import javax.swing.JOptionPane; import javax.swing.JPopupMenu; -import java.util.Map; -import java.util.Enumeration; - -import IceGrid.*; import IceGridGUI.*; class MetricsView extends TreeNode { + @Override public Editor getEditor() { return _editor; @@ -36,6 +31,7 @@ class MetricsView extends TreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT]; @@ -44,6 +40,7 @@ class MetricsView extends TreeNode return actions; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -75,6 +72,7 @@ class MetricsView extends TreeNode _enabled = enabled; } + @Override public void enableMetricsView(boolean enabled) { IceMX.MetricsAdminPrx metricsAdmin = getMetricsAdmin(); @@ -84,10 +82,12 @@ class MetricsView extends TreeNode { IceMX.Callback_MetricsAdmin_enableMetricsView cb = new IceMX.Callback_MetricsAdmin_enableMetricsView() { + @Override public void response() { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _enabled = true; @@ -105,11 +105,13 @@ class MetricsView extends TreeNode }); } + @Override public void exception(final Ice.LocalException e) { MetricsViewEditor.stopRefresh(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(e instanceof Ice.ObjectNotExistException || @@ -131,11 +133,13 @@ class MetricsView extends TreeNode }); } + @Override public void exception(final Ice.UserException e) { MetricsViewEditor.stopRefresh(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { e.printStackTrace(); @@ -152,10 +156,12 @@ class MetricsView extends TreeNode { IceMX.Callback_MetricsAdmin_disableMetricsView cb = new IceMX.Callback_MetricsAdmin_disableMetricsView() { + @Override public void response() { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _enabled = false; @@ -174,11 +180,13 @@ class MetricsView extends TreeNode }); } + @Override public void exception(final Ice.LocalException e) { MetricsViewEditor.stopRefresh(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(e instanceof Ice.ObjectNotExistException || @@ -200,11 +208,13 @@ class MetricsView extends TreeNode }); } + @Override public void exception(final Ice.UserException e) { MetricsViewEditor.stopRefresh(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { e.printStackTrace(); @@ -235,6 +245,7 @@ class MetricsView extends TreeNode return _admin; } + @Override public JPopupMenu getPopupMenu() { LiveActions la = getCoordinator().getLiveActionsForPopup(); @@ -274,11 +285,13 @@ class MetricsView extends TreeNode { IceMX.Callback_MetricsAdmin_getMetricsView cb = new IceMX.Callback_MetricsAdmin_getMetricsView() { + @Override public void response(final java.util.Map<java.lang.String, IceMX.Metrics[]> data, final long timestamp) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _editor.show(MetricsView.this, data, timestamp); @@ -286,11 +299,13 @@ class MetricsView extends TreeNode }); } + @Override public void exception(final Ice.LocalException e) { MetricsViewEditor.stopRefresh(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(e instanceof Ice.ObjectNotExistException || @@ -316,11 +331,13 @@ class MetricsView extends TreeNode }); } + @Override public void exception(final Ice.UserException e) { MetricsViewEditor.stopRefresh(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { e.printStackTrace(); @@ -340,7 +357,7 @@ class MetricsView extends TreeNode } catch(Ice.LocalException e) { - _editor.stopRefresh(); + MetricsViewEditor.stopRefresh(); JOptionPane.showMessageDialog(getCoordinator().getMainFrame(), "Error: " + e.toString(), "Error", JOptionPane.ERROR_MESSAGE); } diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java index a1e02833a58..05e7ebf3963 100644 --- a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java @@ -20,12 +20,7 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseAdapter; -import java.awt.event.MouseListener; import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.event.ComponentEvent; -import java.awt.event.ComponentAdapter; import java.awt.BorderLayout; import java.util.List; @@ -41,12 +36,7 @@ import java.text.DecimalFormat; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; -import javax.swing.AbstractCellEditor; -import javax.swing.DefaultCellEditor; import javax.swing.JOptionPane; import javax.swing.BorderFactory; @@ -58,8 +48,6 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; import javax.swing.ListSelectionModel; import javax.swing.JComponent; -import javax.swing.JFrame; -import javax.swing.SwingConstants; import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.JTable; @@ -71,20 +59,11 @@ import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JPanel; -import javax.swing.table.TableColumnModel; import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.DefaultTableColumnModel; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableColumn; -import javax.swing.table.TableRowSorter; import javax.swing.table.JTableHeader; -import com.jgoodies.forms.builder.DefaultFormBuilder; -import com.jgoodies.forms.layout.CellConstraints; - -import IceGrid.*; import IceGridGUI.*; public class MetricsViewEditor extends Editor implements MetricsFieldContext @@ -128,6 +107,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _format = new DecimalFormat(format); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) @@ -189,6 +169,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext private static class SelectionListener implements TreeSelectionListener { + @Override public void valueChanged(TreeSelectionEvent e) { // @@ -258,6 +239,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext } } + @Override public int getRefreshPeriod() { return _refreshPeriod; @@ -268,6 +250,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext assert(_refreshFuture == null); _refreshFuture = node.getCoordinator().getExecutor().scheduleAtFixedRate(new Runnable() { + @Override public void run() { node.fetchMetricsView(); @@ -483,6 +466,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext } } + @Override public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException { if(!isDataFlavorSupported(flavor)) @@ -492,11 +476,13 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext return _data; } + @Override public DataFlavor[] getTransferDataFlavors() { return _flavors; } + @Override public boolean isDataFlavorSupported(DataFlavor flavor) { return _flavors[0].equals(flavor); @@ -677,10 +663,12 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext // //Implement table header tool tips. // + @Override protected JTableHeader createDefaultTableHeader() { return new JTableHeader(columnModel) { + @Override public String getToolTipText(MouseEvent e) { int index = columnModel.getColumn(columnModel.getColumnIndexAtX(e.getPoint().x)).getModelIndex(); @@ -732,6 +720,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext JMenuItem newGraph = new JMenuItem("New Metrics Graph"); newGraph.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { Coordinator.IGraphView view = node.getCoordinator().createGraphView(); @@ -751,6 +740,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext addToGraph.add(item); item.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { view.addSeries(new MetricsViewTransferableData(new MetricsViewInfo(node), @@ -904,6 +894,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext return null; } + @Override protected JComponent createPropertiesPanel() { JSplitPane current = null; @@ -990,6 +981,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext return splitPane; } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); @@ -1041,11 +1033,13 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _fields.put(_fields.size(), field); } + @Override public boolean isCellEditable(int row, int column) { return false; } + @Override public Class getColumnClass(int index) { return _fields.get(index).getColumnClass(); @@ -1149,21 +1143,25 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _objectField = objectField; } + @Override public MetricsView getMetricsNode() { return _node; } + @Override public String getMetricsName() { return _metricsName; } + @Override public String getFieldName() { return _fieldName; } + @Override public String getColumnName() { return _columnName == null ? _fieldName : _columnName; @@ -1174,6 +1172,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _columnName = columnName; } + @Override public String getColumnToolTip() { return _columnToolTip; @@ -1184,21 +1183,25 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _columnToolTip = columnToolTip; } + @Override public MetricsField createField() { return MetricsViewEditor.createField(_node, _prefix, _metricsName, _fieldName, _objectField, _context); } + @Override public String getPropertyPrefix() { return _prefix; } + @Override public MetricsFieldContext getContext() { return _context; } + @Override public void setContext(MetricsFieldContext context) { _context = context; @@ -1249,6 +1252,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext } } + @Override public Class getColumnClass() { return _columnClass; @@ -1259,11 +1263,13 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _cellRenderer = new FormatedNumberRenderer(format); } + @Override public TableCellRenderer getCellRenderer() { return _cellRenderer; } + @Override public Object getValue(IceMX.Metrics m, long timestamp) { try @@ -1298,11 +1304,13 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _cellRenderer = new FormatedNumberRenderer(format); } + @Override public Class getColumnClass() { return Float.class; } + @Override public TableCellRenderer getCellRenderer() { return _cellRenderer; @@ -1313,6 +1321,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _scaleFactor = Double.parseDouble(scaleFactor); } + @Override public Object getValue(IceMX.Metrics m2, long timestamp) { IceMX.Metrics m1 = _deltas.get(m2.id); @@ -1359,11 +1368,13 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _cellRenderer = new FormatedNumberRenderer(format); } + @Override public Class getColumnClass() { return Double.class; } + @Override public TableCellRenderer getCellRenderer() { return _cellRenderer; @@ -1379,6 +1390,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _scaleFactor = Double.parseDouble(scaleFactor); } + @Override public Object getValue(IceMX.Metrics m, long timestamp) { DeltaMeasurement d1 = _deltas.get(m.id); @@ -1450,7 +1462,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext } else { - last = (double)((d2.value - d1.value) / (double)((d2.timestamp - d1.timestamp) / _scaleFactor)); + last = (double)((d2.value - d1.value) / ((d2.timestamp - d1.timestamp) / _scaleFactor)); } } _last.put(m.id, last); @@ -1471,16 +1483,19 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext super(node, prefix, metricsName, fieldName, field); } + @Override public Class getColumnClass() { return JButton.class; } + @Override public TableCellRenderer getCellRenderer() { return _cellRenderer; } + @Override public Object getValue(final IceMX.Metrics m, long timestamp) { JButton button = new JButton(Integer.toString(m.failures)); @@ -1488,6 +1503,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext { button.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { final DefaultTableModel model = new DefaultTableModel(); @@ -1521,10 +1537,12 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext IceMX.Callback_MetricsAdmin_getMetricsFailures cb = new IceMX.Callback_MetricsAdmin_getMetricsFailures() { + @Override public void response(final IceMX.MetricsFailures data) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(Map.Entry<String, Integer> entry : data.failures.entrySet()) @@ -1541,10 +1559,12 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { getMetricsNode().getCoordinator().getMainFrame().setCursor( @@ -1569,10 +1589,12 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext }); } + @Override public void exception(final Ice.UserException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { getMetricsNode().getCoordinator().getMainFrame().setCursor( @@ -1615,16 +1637,19 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext super(node, prefix, metricsName, fieldName, field); } + @Override public Class getColumnClass() { return JButton.class; } + @Override public TableCellRenderer getCellRenderer() { return _cellRenderer; } + @Override public Object getValue(final IceMX.Metrics m, final long timestamp) { try @@ -1636,6 +1661,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext { button.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { final TableModel model = new TableModel(getMetricsName()); @@ -1671,10 +1697,12 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext // //Implement table header tool tips. // + @Override protected JTableHeader createDefaultTableHeader() { return new JTableHeader(columnModel) { + @Override public String getToolTipText(MouseEvent e) { int index = columnModel.getColumn(columnModel.getColumnIndexAtX( diff --git a/java/src/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/LiveDeployment/Node.java index 079d69344ff..5170055c3bc 100644 --- a/java/src/IceGridGUI/LiveDeployment/Node.java +++ b/java/src/IceGridGUI/LiveDeployment/Node.java @@ -13,18 +13,12 @@ import java.awt.Component; import java.awt.Cursor; import javax.swing.Icon; -import javax.swing.JOptionPane; import javax.swing.JPopupMenu; import javax.swing.JTree; import javax.swing.SwingUtilities; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; - import java.text.NumberFormat; -import java.util.Enumeration; - import IceGrid.*; import IceGridGUI.*; @@ -33,6 +27,7 @@ class Node extends ListTreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT]; @@ -42,10 +37,12 @@ class Node extends ListTreeNode return actions; } + @Override public void retrieveOutput(final boolean stdout) { getRoot().openShowLogDialog(new ShowLogDialog.FileIteratorFactory() { + @Override public FileIteratorPrx open(int count) throws FileNotAvailableException, NodeNotExistException, NodeUnreachableException { @@ -62,11 +59,13 @@ class Node extends ListTreeNode return result; } + @Override public String getTitle() { return "Node " + _id + " " + (stdout ? "stdout" : "stderr"); } + @Override public String getDefaultFilename() { return _id + (stdout ? ".out" : ".err"); @@ -74,6 +73,7 @@ class Node extends ListTreeNode }); } + @Override public void shutdownNode() { final String prefix = "Shutting down node '" + _id + "'..."; @@ -84,16 +84,19 @@ class Node extends ListTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to shutdown " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to shutdown " + _id, @@ -119,6 +122,7 @@ class Node extends ListTreeNode } } + @Override public JPopupMenu getPopupMenu() { LiveActions la = getCoordinator().getLiveActionsForPopup(); @@ -136,6 +140,7 @@ class Node extends ListTreeNode return _popup; } + @Override public Editor getEditor() { if(_editor == null) @@ -146,6 +151,7 @@ class Node extends ListTreeNode return _editor; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -244,7 +250,7 @@ class Node extends ListTreeNode if(appData != null) { NodeDescriptor descriptor = appData.descriptor; - PropertySetDescriptor result = (PropertySetDescriptor)descriptor.propertySets.get(name); + PropertySetDescriptor result = descriptor.propertySets.get(name); if(result != null) { return result; @@ -313,7 +319,7 @@ class Node extends ListTreeNode void update(ApplicationDescriptor appDesc, NodeUpdateDescriptor update, boolean variablesChanged, java.util.Set<String> serviceTemplates, java.util.Set<String> serverTemplates) { - ApplicationData data = (ApplicationData)_map.get(appDesc.name); + ApplicationData data = _map.get(appDesc.name); if(data == null) { @@ -678,6 +684,7 @@ class Node extends ListTreeNode { Callback_Admin_getNodeLoad cb = new Callback_Admin_getNodeLoad() { + @Override public void response(LoadInfo loadInfo) { NumberFormat format; @@ -701,6 +708,7 @@ class Node extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _editor.setLoad(load, Node.this); @@ -708,10 +716,12 @@ class Node extends ListTreeNode }); } + @Override public void exception(final Ice.UserException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(e instanceof IceGrid.NodeNotExistException) @@ -732,10 +742,12 @@ class Node extends ListTreeNode }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _editor.setLoad("Error: " + e.toString(), Node.this); @@ -777,7 +789,7 @@ class Node extends ListTreeNode // Find template // TemplateDescriptor templateDescriptor = - (TemplateDescriptor)application.serverTemplates.get(instanceDescriptor.template); + application.serverTemplates.get(instanceDescriptor.template); assert templateDescriptor != null; ServerDescriptor serverDescriptor = (ServerDescriptor)templateDescriptor.descriptor; diff --git a/java/src/IceGridGUI/LiveDeployment/NodeEditor.java b/java/src/IceGridGUI/LiveDeployment/NodeEditor.java index 0f20d12843d..9f8b58e8003 100644 --- a/java/src/IceGridGUI/LiveDeployment/NodeEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/NodeEditor.java @@ -22,7 +22,6 @@ import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.layout.CellConstraints; import IceGrid.*; -import IceGridGUI.*; class NodeEditor extends Editor { @@ -35,6 +34,7 @@ class NodeEditor extends Editor Action refresh = new AbstractAction("Refresh") { + @Override public void actionPerformed(ActionEvent e) { _target.showLoad(); @@ -97,6 +97,7 @@ class NodeEditor extends Editor // } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.appendSeparator("System Information"); @@ -134,6 +135,7 @@ class NodeEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); diff --git a/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java b/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java index 8aace6265f2..47516374d64 100644 --- a/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java +++ b/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java @@ -9,11 +9,7 @@ package IceGridGUI.LiveDeployment; -import java.awt.BorderLayout; import java.awt.Container; -import java.awt.Dimension; -import java.awt.Frame; - import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -23,10 +19,10 @@ import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFrame; -import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JTextField; +import javax.swing.WindowConstants; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.builder.ButtonBarBuilder; @@ -43,7 +39,7 @@ class ObjectDialog extends JDialog super(root.getCoordinator().getMainFrame(), (readOnly ? "" : "New ") + "Dynamic Well-Known Object - IceGrid Admin", true); - setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); _mainFrame = root.getCoordinator().getMainFrame(); _proxy.setLineWrap(true); @@ -95,6 +91,7 @@ class ObjectDialog extends JDialog JButton okButton = new JButton("OK"); ActionListener okListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { if(_proxy.isEditable()) @@ -122,6 +119,7 @@ class ObjectDialog extends JDialog JButton cancelButton = new JButton("Cancel"); ActionListener cancelListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { setVisible(false); @@ -169,6 +167,7 @@ class ObjectDialog extends JDialog static private final Object QUERY_OBJECT = new Object() { + @Override public String toString() { return "Query object to retrieve type"; diff --git a/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java b/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java index 51aaaf5b43a..a3940cc0c67 100644 --- a/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java @@ -10,15 +10,10 @@ package IceGridGUI.LiveDeployment; import java.awt.event.ActionEvent; -import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; - import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JButton; -import javax.swing.JLabel; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPopupMenu; @@ -40,6 +35,7 @@ class RegistryEditor extends Editor Action openDefinition = new AbstractAction("Open definition") { + @Override public void actionPerformed(ActionEvent e) { int selectedRow = _applications.getSelectedRow(); @@ -58,6 +54,7 @@ class RegistryEditor extends Editor Action showDetails = new AbstractAction("Show details") { + @Override public void actionPerformed(ActionEvent e) { int selectedRow = _applications.getSelectedRow(); @@ -71,6 +68,7 @@ class RegistryEditor extends Editor final Action patch = new AbstractAction("Patch distribution") { + @Override public void actionPerformed(ActionEvent e) { int selectedRow = _applications.getSelectedRow(); @@ -84,6 +82,7 @@ class RegistryEditor extends Editor Action removeApplication = new AbstractAction("Remove from registry") { + @Override public void actionPerformed(ActionEvent e) { int selectedRow = _applications.getSelectedRow(); @@ -121,6 +120,7 @@ class RegistryEditor extends Editor _applications.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { if(e.getClickCount() == 2) @@ -134,11 +134,13 @@ class RegistryEditor extends Editor } } + @Override public void mousePressed(MouseEvent e) { maybeShowPopup(e); } + @Override public void mouseReleased(MouseEvent e) { maybeShowPopup(e); @@ -160,6 +162,7 @@ class RegistryEditor extends Editor Action deleteObject = new AbstractAction("Remove selected object") { + @Override public void actionPerformed(ActionEvent e) { if(_target.getCoordinator().connectedToMaster()) @@ -179,6 +182,7 @@ class RegistryEditor extends Editor Action showObject = new AbstractAction("Show details") { + @Override public void actionPerformed(ActionEvent e) { int selectedRow = _objects.getSelectedRow(); @@ -193,6 +197,7 @@ class RegistryEditor extends Editor Action addObject = new AbstractAction("Add a new well-known object") { + @Override public void actionPerformed(ActionEvent e) { if(_target.getCoordinator().connectedToMaster()) @@ -219,6 +224,7 @@ class RegistryEditor extends Editor _objects.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { if(e.getClickCount() == 2) @@ -233,11 +239,13 @@ class RegistryEditor extends Editor } } + @Override public void mousePressed(MouseEvent e) { maybeShowPopup(e); } + @Override public void mouseReleased(MouseEvent e) { maybeShowPopup(e); @@ -256,6 +264,7 @@ class RegistryEditor extends Editor Action deleteAdapter = new AbstractAction("Remove selected adapter") { + @Override public void actionPerformed(ActionEvent e) { if(_target.getCoordinator().connectedToMaster()) @@ -279,11 +288,13 @@ class RegistryEditor extends Editor _adapters.addMouseListener(new MouseAdapter() { + @Override public void mousePressed(MouseEvent e) { maybeShowPopup(e); } + @Override public void mouseReleased(MouseEvent e) { maybeShowPopup(e); @@ -299,6 +310,7 @@ class RegistryEditor extends Editor }); } + @Override protected void appendProperties(DefaultFormBuilder builder) { CellConstraints cc = new CellConstraints(); @@ -377,6 +389,7 @@ class RegistryEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); diff --git a/java/src/IceGridGUI/LiveDeployment/Root.java b/java/src/IceGridGUI/LiveDeployment/Root.java index 0542c07d737..3c580e3bb5a 100644 --- a/java/src/IceGridGUI/LiveDeployment/Root.java +++ b/java/src/IceGridGUI/LiveDeployment/Root.java @@ -19,11 +19,6 @@ import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.TreePath; - -import javax.swing.JComponent; - -import java.util.Enumeration; import java.util.prefs.Preferences; import IceGrid.*; @@ -58,6 +53,7 @@ public class Root extends ListArrayTreeNode fireTreeStructureChanged(this, path, childIndices, children); } + @Override public int getChildCount(Object parent) { @@ -78,6 +74,7 @@ public class Root extends ListArrayTreeNode return q; } + @Override public Object getChild(Object parent, int index) { if(!filterEnabled()) @@ -171,6 +168,7 @@ public class Root extends ListArrayTreeNode _tree.addTreeWillExpandListener(new javax.swing.event.TreeWillExpandListener() { + @Override public void treeWillExpand(javax.swing.event.TreeExpansionEvent event) { // @@ -187,6 +185,7 @@ public class Root extends ListArrayTreeNode } } + @Override public void treeWillCollapse(javax.swing.event.TreeExpansionEvent event) throws javax.swing.tree.ExpandVetoException { @@ -200,6 +199,7 @@ public class Root extends ListArrayTreeNode loadLogPrefs(); } + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT]; @@ -210,6 +210,7 @@ public class Root extends ListArrayTreeNode return actions; } + @Override public void shutdownRegistry() { final String prefix = "Shutting down registry '" + _replicaName + "'..."; @@ -220,16 +221,19 @@ public class Root extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to shutdown " + _replicaName, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to shutdown " + _replicaName, @@ -299,6 +303,7 @@ public class Root extends ListArrayTreeNode return r; } + @Override public Editor getEditor() { if(_editor == null) @@ -309,6 +314,7 @@ public class Root extends ListArrayTreeNode return _editor; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -389,17 +395,20 @@ public class Root extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to patch '" + applicationName + "'", e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to patch '" + @@ -746,6 +755,7 @@ public class Root extends ListArrayTreeNode } } + @Override public JPopupMenu getPopupMenu() { LiveActions la = _coordinator.getLiveActionsForPopup(); @@ -780,11 +790,13 @@ public class Root extends ListArrayTreeNode return _treeModel; } + @Override public Coordinator getCoordinator() { return _coordinator; } + @Override public String toString() { return _label; @@ -810,6 +822,7 @@ public class Root extends ListArrayTreeNode return true; } + @Override public void addObject() { _addObjectDialog.showDialog(); @@ -820,6 +833,7 @@ public class Root extends ListArrayTreeNode _showObjectDialog.showDialog(proxy, type); } + @Override Root getRoot() { return this; @@ -944,16 +958,19 @@ public class Root extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to remove object '" + strIdentity + "'", e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to remove object '" + strIdentity + "'", @@ -986,16 +1003,19 @@ public class Root extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to remove adapter '" + adapterId + "'", e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to remove adapter '" + adapterId + "'", @@ -1018,10 +1038,12 @@ public class Root extends ListArrayTreeNode } } + @Override public void retrieveOutput(final boolean stdout) { getRoot().openShowLogDialog(new ShowLogDialog.FileIteratorFactory() { + @Override public FileIteratorPrx open(int count) throws FileNotAvailableException, RegistryNotExistException, RegistryUnreachableException { @@ -1039,11 +1061,13 @@ public class Root extends ListArrayTreeNode return result; } + @Override public String getTitle() { return "Registry " + _label + " " + (stdout ? "stdout" : "stderr"); } + @Override public String getDefaultFilename() { return _replicaName + (stdout ? ".out" : ".err"); @@ -1053,8 +1077,8 @@ public class Root extends ListArrayTreeNode PropertySetDescriptor findNamedPropertySet(String name, String applicationName) { - ApplicationInfo app = (ApplicationInfo)_infoMap.get(applicationName); - return (PropertySetDescriptor)app.descriptor.propertySets.get(name); + ApplicationInfo app = _infoMap.get(applicationName); + return app.descriptor.propertySets.get(name); } void openShowLogDialog(ShowLogDialog.FileIteratorFactory factory) diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/LiveDeployment/Server.java index 02bee2354ed..0d1542258c0 100644 --- a/java/src/IceGridGUI/LiveDeployment/Server.java +++ b/java/src/IceGridGUI/LiveDeployment/Server.java @@ -19,10 +19,6 @@ import javax.swing.JPopupMenu; import javax.swing.JTree; import javax.swing.SwingUtilities; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; -import java.util.Enumeration; - import IceGrid.*; import IceGridGUI.*; @@ -31,6 +27,7 @@ public class Server extends ListArrayTreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT]; @@ -69,6 +66,7 @@ public class Server extends ListArrayTreeNode return actions; } + @Override public void start() { final String prefix = "Starting server '" + _id + "'..."; @@ -79,16 +77,19 @@ public class Server extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to start " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to start " + _id, e.toString()); @@ -110,6 +111,7 @@ public class Server extends ListArrayTreeNode } } + @Override public void stop() { final String prefix = "Stopping server '" + _id + "'..."; @@ -120,17 +122,20 @@ public class Server extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); rebuild(Server.this, false); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to stop " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to stop " + _id, e.toString()); @@ -152,16 +157,19 @@ public class Server extends ListArrayTreeNode } } + @Override public void enable() { enableServer(true); } + @Override public void disable() { enableServer(false); } + @Override public void writeMessage() { if(_writeMessageDialog == null) @@ -171,10 +179,12 @@ public class Server extends ListArrayTreeNode _writeMessageDialog.showDialog(_id); } + @Override public void retrieveOutput(final boolean stdout) { getRoot().openShowLogDialog(new ShowLogDialog.FileIteratorFactory() { + @Override public FileIteratorPrx open(int count) throws FileNotAvailableException, ServerNotExistException, NodeUnreachableException, DeploymentException @@ -192,11 +202,13 @@ public class Server extends ListArrayTreeNode return result; } + @Override public String getTitle() { return "Server " + _id + " " + (stdout ? "stdout" : "stderr"); } + @Override public String getDefaultFilename() { return _id + (stdout ? ".out" : ".err"); @@ -204,6 +216,7 @@ public class Server extends ListArrayTreeNode }); } + @Override public void retrieveLog() { assert _serverDescriptor.logs.length > 0; @@ -237,6 +250,7 @@ public class Server extends ListArrayTreeNode getRoot().openShowLogDialog(new ShowLogDialog.FileIteratorFactory() { + @Override public FileIteratorPrx open(int count) throws FileNotAvailableException, ServerNotExistException, NodeUnreachableException, DeploymentException @@ -245,11 +259,13 @@ public class Server extends ListArrayTreeNode return session.openServerLog(_id, fPath, count); } + @Override public String getTitle() { return "Server " + _id + " " + new java.io.File(fPath).getName(); } + @Override public String getDefaultFilename() { return new java.io.File(fPath).getName(); @@ -258,6 +274,7 @@ public class Server extends ListArrayTreeNode } } + @Override public void signal(final String s) { final String prefix = "Sending '" + s + "' to server '" + _id + "'..."; @@ -268,16 +285,19 @@ public class Server extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to deliver signal " + s + " to " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to deliver signal " + s + " to " + _id, e.toString()); @@ -294,6 +314,7 @@ public class Server extends ListArrayTreeNode } } + @Override public void patchServer() { String message = _serverDescriptor.applicationDistrib ? @@ -322,16 +343,19 @@ public class Server extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to patch " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to patch " + _id, e.toString()); @@ -366,16 +390,19 @@ public class Server extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to " + action + " " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to " + action + " " + _id, e.toString()); @@ -414,10 +441,12 @@ public class Server extends ListArrayTreeNode IceMX.MetricsAdminPrxHelper.uncheckedCast(admin.ice_facet("Metrics")); IceMX.Callback_MetricsAdmin_getMetricsViewNames cb = new IceMX.Callback_MetricsAdmin_getMetricsViewNames() { + @Override public void response(final String[] enabledViews, final String[] disabledViews) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(String name : enabledViews) @@ -433,10 +462,12 @@ public class Server extends ListArrayTreeNode }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _metricsRetrieved = false; @@ -483,10 +514,12 @@ public class Server extends ListArrayTreeNode { Ice.Callback_PropertiesAdmin_getPropertiesForPrefix cb = new Ice.Callback_PropertiesAdmin_getPropertiesForPrefix() { + @Override public void response(final java.util.Map<String, String> properties) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _editor.setRuntimeProperties((java.util.SortedMap<String, String>)properties, @@ -495,10 +528,12 @@ public class Server extends ListArrayTreeNode }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(e instanceof Ice.ObjectNotExistException) @@ -535,6 +570,7 @@ public class Server extends ListArrayTreeNode } } + @Override public void openDefinition() { ApplicationPane app = getCoordinator().openLiveApplication(_application.name); @@ -544,6 +580,7 @@ public class Server extends ListArrayTreeNode } } + @Override public JPopupMenu getPopupMenu() { LiveActions la = getCoordinator().getLiveActionsForPopup(); @@ -585,6 +622,7 @@ public class Server extends ListArrayTreeNode return _popup; } + @Override public Editor getEditor() { if(_editor == null) @@ -595,6 +633,7 @@ public class Server extends ListArrayTreeNode return _editor; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -939,6 +978,7 @@ public class Server extends ListArrayTreeNode { IceBox.ServiceObserver servant = new IceBox._ServiceObserverDisp() { + @Override public void servicesStarted(final String[] services, Ice.Current current) { final java.util.Set<String> serviceSet = @@ -946,6 +986,7 @@ public class Server extends ListArrayTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(Service service: _services) @@ -961,6 +1002,7 @@ public class Server extends ListArrayTreeNode }); } + @Override public void servicesStopped(final String[] services, Ice.Current current) { final java.util.Set<String> serviceSet = @@ -968,6 +1010,7 @@ public class Server extends ListArrayTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(Service service: _services) @@ -1008,11 +1051,13 @@ public class Server extends ListArrayTreeNode IceBox.Callback_ServiceManager_addObserver cb = new IceBox.Callback_ServiceManager_addObserver() { + @Override public void response() { // all is good } + @Override public void exception(Ice.LocalException e) { JOptionPane.showMessageDialog( @@ -1213,7 +1258,7 @@ public class Server extends ListArrayTreeNode if(descriptor.template.length() > 0) { TemplateDescriptor templateDescriptor - = (TemplateDescriptor)_application.serviceTemplates.get(descriptor.template); + = _application.serviceTemplates.get(descriptor.template); assert templateDescriptor != null; @@ -1236,7 +1281,7 @@ public class Server extends ListArrayTreeNode serviceResolver.put("service", serviceName); } - PropertySetDescriptor serverInstancePSDescriptor = (PropertySetDescriptor)_servicePropertySets.get(serviceName); + PropertySetDescriptor serverInstancePSDescriptor = _servicePropertySets.get(serviceName); _services.add(new Service(this, serviceName, serviceResolver, descriptor, serviceDescriptor, serverInstancePSDescriptor)); diff --git a/java/src/IceGridGUI/LiveDeployment/ServerEditor.java b/java/src/IceGridGUI/LiveDeployment/ServerEditor.java index ed466c28942..900920d8c21 100644 --- a/java/src/IceGridGUI/LiveDeployment/ServerEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/ServerEditor.java @@ -33,6 +33,7 @@ import IceGridGUI.*; class ServerEditor extends CommunicatorEditor { + @Override public JToolBar getToolBar() { if(_toolBar == null) @@ -69,6 +70,7 @@ class ServerEditor extends CommunicatorEditor Action refresh = new AbstractAction("Refresh") { + @Override public void actionPerformed(ActionEvent e) { _buildId.setText("Retrieving..."); @@ -81,6 +83,7 @@ class ServerEditor extends CommunicatorEditor Action gotoApplication = new AbstractAction("", Utils.getIcon("/icons/16x16/goto.png")) { + @Override public void actionPerformed(ActionEvent e) { _target.openDefinition(); @@ -165,6 +168,7 @@ class ServerEditor extends CommunicatorEditor Ice.StringHolder toolTipHolder = new Ice.StringHolder(); Utils.Stringifier stringifier = new Utils.Stringifier() { + @Override public String toString(Object obj) { return resolver.substitute((String)obj); @@ -240,6 +244,7 @@ class ServerEditor extends CommunicatorEditor // } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.appendSeparator("Runtime Status"); @@ -341,6 +346,7 @@ class ServerEditor extends CommunicatorEditor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); diff --git a/java/src/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/LiveDeployment/Service.java index 917d776df37..e4c9d5e7367 100644 --- a/java/src/IceGridGUI/LiveDeployment/Service.java +++ b/java/src/IceGridGUI/LiveDeployment/Service.java @@ -16,10 +16,6 @@ import javax.swing.JPopupMenu; import javax.swing.JTree; import javax.swing.SwingUtilities; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; -import java.util.Enumeration; - import IceGrid.*; import IceGridGUI.*; @@ -28,6 +24,7 @@ public class Service extends ListArrayTreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT]; @@ -55,6 +52,7 @@ public class Service extends ListArrayTreeNode return actions; } + @Override public void start() { Ice.ObjectPrx serverAdmin = ((Server)_parent).getServerAdmin(); @@ -69,11 +67,13 @@ public class Service extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { if(e instanceof IceBox.AlreadyStartedException) @@ -86,6 +86,7 @@ public class Service extends ListArrayTreeNode } } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to start service " + _id, e.toString()); @@ -106,6 +107,7 @@ public class Service extends ListArrayTreeNode } } + @Override public void stop() { Ice.ObjectPrx serverAdmin = ((Server)_parent).getServerAdmin(); @@ -120,11 +122,13 @@ public class Service extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { if(e instanceof IceBox.AlreadyStoppedException) @@ -137,6 +141,7 @@ public class Service extends ListArrayTreeNode } } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to stop service " + _id, e.toString()); @@ -157,6 +162,7 @@ public class Service extends ListArrayTreeNode } } + @Override public void retrieveLog() { assert _serviceDescriptor.logs.length > 0; @@ -190,6 +196,7 @@ public class Service extends ListArrayTreeNode getRoot().openShowLogDialog(new ShowLogDialog.FileIteratorFactory() { + @Override public FileIteratorPrx open(int count) throws FileNotAvailableException, ServerNotExistException, NodeUnreachableException, DeploymentException @@ -198,11 +205,13 @@ public class Service extends ListArrayTreeNode return session.openServerLog(_parent.getId(), fPath, count); } + @Override public String getTitle() { return "Service " + _parent.getId() + "/" + _id + " " + new java.io.File(fPath).getName(); } + @Override public String getDefaultFilename() { return new java.io.File(fPath).getName(); @@ -211,6 +220,7 @@ public class Service extends ListArrayTreeNode } } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -242,6 +252,7 @@ public class Service extends ListArrayTreeNode return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public Editor getEditor() { if(_editor == null) @@ -252,6 +263,7 @@ public class Service extends ListArrayTreeNode return _editor; } + @Override public JPopupMenu getPopupMenu() { LiveActions la = getCoordinator().getLiveActionsForPopup(); @@ -367,10 +379,12 @@ public class Service extends ListArrayTreeNode { Ice.Callback_PropertiesAdmin_getPropertiesForPrefix cb = new Ice.Callback_PropertiesAdmin_getPropertiesForPrefix() { + @Override public void response(final java.util.Map<String, String> properties) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _editor.setRuntimeProperties((java.util.SortedMap<String, String>)properties, @@ -379,10 +393,12 @@ public class Service extends ListArrayTreeNode }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(e instanceof Ice.ObjectNotExistException) @@ -500,10 +516,12 @@ public class Service extends ListArrayTreeNode IceMX.Callback_MetricsAdmin_getMetricsViewNames cb = new IceMX.Callback_MetricsAdmin_getMetricsViewNames() { + @Override public void response(final String[] enabledViews, final String[] disabledViews) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(String name : enabledViews) @@ -519,10 +537,12 @@ public class Service extends ListArrayTreeNode }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _metricsRetrieved = false; diff --git a/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java b/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java index 42530adcb5c..d43a1dec103 100644 --- a/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java @@ -32,6 +32,7 @@ import IceGridGUI.*; class ServiceEditor extends CommunicatorEditor { + @Override public JToolBar getToolBar() { if(_toolBar == null) @@ -51,6 +52,7 @@ class ServiceEditor extends CommunicatorEditor Action refresh = new AbstractAction("Refresh") { + @Override public void actionPerformed(ActionEvent e) { _buildId.setText("Retrieving..."); @@ -96,6 +98,7 @@ class ServiceEditor extends CommunicatorEditor } } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.appendSeparator("Runtime Status"); @@ -132,6 +135,7 @@ class ServiceEditor extends CommunicatorEditor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); @@ -159,7 +163,7 @@ class ServiceEditor extends CommunicatorEditor { _properties.setSortedMap(map); - String buildString = (String)map.get("BuildId"); + String buildString = map.get("BuildId"); if(buildString == null) { _buildId.setText(""); diff --git a/java/src/IceGridGUI/LiveDeployment/ShowLogDialog.java b/java/src/IceGridGUI/LiveDeployment/ShowLogDialog.java index 89564c92363..a102ebcfb2d 100644 --- a/java/src/IceGridGUI/LiveDeployment/ShowLogDialog.java +++ b/java/src/IceGridGUI/LiveDeployment/ShowLogDialog.java @@ -9,33 +9,27 @@ package IceGridGUI.LiveDeployment; -import java.awt.Cursor; import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.Frame; - import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ButtonGroup; -import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JOptionPane; -import javax.swing.JPanel; import javax.swing.JRadioButtonMenuItem; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JToggleButton; import javax.swing.JToolBar; import javax.swing.KeyStroke; +import javax.swing.ScrollPaneConstants; import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; import com.jgoodies.looks.BorderStyle; import com.jgoodies.looks.HeaderStyle; @@ -70,6 +64,7 @@ class ShowLogDialog extends JDialog { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(int i = 0; i < lines.length; ++i) @@ -137,6 +132,7 @@ class ShowLogDialog extends JDialog SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { if(_textArea.getText() == null || _textArea.getText().length() == 0) @@ -157,6 +153,7 @@ class ShowLogDialog extends JDialog }); } + @Override public void run() { // @@ -187,6 +184,7 @@ class ShowLogDialog extends JDialog SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { if(isVisible()) @@ -280,6 +278,7 @@ class ShowLogDialog extends JDialog SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { stopReading(); @@ -299,6 +298,7 @@ class ShowLogDialog extends JDialog SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { stopReading(); @@ -402,6 +402,7 @@ class ShowLogDialog extends JDialog Action save = new AbstractAction("Save As...") { + @Override public void actionPerformed(ActionEvent e) { JFileChooser fileChooser = _root.getCoordinator().getSaveLogChooser(); @@ -474,6 +475,7 @@ class ShowLogDialog extends JDialog fileMenu.add(new AbstractAction("Close") { + @Override public void actionPerformed(ActionEvent e) { close(true); @@ -485,6 +487,7 @@ class ShowLogDialog extends JDialog Action copy = new AbstractAction("Copy") { + @Override public void actionPerformed(ActionEvent e) { _textArea.copy(); @@ -498,6 +501,7 @@ class ShowLogDialog extends JDialog editMenu.addSeparator(); Action selectAll = new AbstractAction("Select All") { + @Override public void actionPerformed(ActionEvent e) { _textArea.grabFocus(); @@ -511,6 +515,7 @@ class ShowLogDialog extends JDialog editMenu.addSeparator(); editMenu.add(new AbstractAction("Preferences...") { + @Override public void actionPerformed(ActionEvent e) { new ShowLogPrefsDialog(ShowLogDialog.this); @@ -561,9 +566,10 @@ class ShowLogDialog extends JDialog _factory = factory; _root = root; - setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); addWindowListener(new java.awt.event.WindowAdapter() { + @Override public void windowClosing(java.awt.event.WindowEvent e) { close(true); @@ -572,6 +578,7 @@ class ShowLogDialog extends JDialog _pause = new AbstractAction("Pause") { + @Override public void actionPerformed(ActionEvent e) { pause(); @@ -580,6 +587,7 @@ class ShowLogDialog extends JDialog _play = new AbstractAction("Play") { + @Override public void actionPerformed(ActionEvent e) { play(); @@ -588,6 +596,7 @@ class ShowLogDialog extends JDialog _stop = new AbstractAction("Stop") { + @Override public void actionPerformed(ActionEvent e) { stopReading(); @@ -598,8 +607,8 @@ class ShowLogDialog extends JDialog getContentPane().add(new ToolBar(), BorderLayout.PAGE_START); JScrollPane scrollPane = new JScrollPane(_textArea, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); getContentPane().add(scrollPane); diff --git a/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java b/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java index 5524c475b0a..1b450d5fdf2 100644 --- a/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java +++ b/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java @@ -17,8 +17,8 @@ import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JOptionPane; -import javax.swing.JPanel; import javax.swing.JTextField; +import javax.swing.WindowConstants; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.builder.ButtonBarBuilder; @@ -26,15 +26,12 @@ import com.jgoodies.forms.factories.Borders; import com.jgoodies.forms.layout.FormLayout; import com.jgoodies.forms.util.LayoutStyle; -import IceGrid.*; -import IceGridGUI.*; - class ShowLogPrefsDialog extends JDialog { ShowLogPrefsDialog(final ShowLogDialog sld) { super(sld, "Preferences - IceGrid Admin", true); - setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); final JTextField maxLinesField = new JTextField(10); maxLinesField.setText(Integer.toString(sld.getMaxLines())); @@ -59,6 +56,7 @@ class ShowLogPrefsDialog extends JDialog JButton okButton = new JButton("OK"); ActionListener okListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { try @@ -84,6 +82,7 @@ class ShowLogPrefsDialog extends JDialog JButton cancelButton = new JButton("Cancel"); ActionListener cancelListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { dispose(); diff --git a/java/src/IceGridGUI/LiveDeployment/Slave.java b/java/src/IceGridGUI/LiveDeployment/Slave.java index e7e88a07b01..652775efbb5 100644 --- a/java/src/IceGridGUI/LiveDeployment/Slave.java +++ b/java/src/IceGridGUI/LiveDeployment/Slave.java @@ -12,13 +12,9 @@ package IceGridGUI.LiveDeployment; import java.awt.Component; import java.awt.Cursor; -import javax.swing.Icon; import javax.swing.JPopupMenu; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; - import IceGrid.*; import IceGridGUI.*; @@ -27,6 +23,7 @@ class Slave extends TreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT]; @@ -36,6 +33,7 @@ class Slave extends TreeNode return actions; } + @Override public void shutdownRegistry() { final String prefix = "Shutting down registry '" + _id + "'..."; @@ -46,16 +44,19 @@ class Slave extends TreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to shutdown " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to shutdown " + _id, @@ -79,10 +80,12 @@ class Slave extends TreeNode } } + @Override public void retrieveOutput(final boolean stdout) { getRoot().openShowLogDialog(new ShowLogDialog.FileIteratorFactory() { + @Override public FileIteratorPrx open(int count) throws FileNotAvailableException, RegistryNotExistException, RegistryUnreachableException { @@ -100,11 +103,13 @@ class Slave extends TreeNode return result; } + @Override public String getTitle() { return "Registry " + _title + " " + (stdout ? "stdout" : "stderr"); } + @Override public String getDefaultFilename() { return _id + (stdout ? ".out" : ".err"); @@ -112,6 +117,7 @@ class Slave extends TreeNode }); } + @Override public JPopupMenu getPopupMenu() { LiveActions la = getCoordinator().getLiveActionsForPopup(); @@ -129,6 +135,7 @@ class Slave extends TreeNode return _popup; } + @Override public Editor getEditor() { if(_editor == null) @@ -139,6 +146,7 @@ class Slave extends TreeNode return _editor; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, diff --git a/java/src/IceGridGUI/LiveDeployment/SlaveEditor.java b/java/src/IceGridGUI/LiveDeployment/SlaveEditor.java index 43b1a9ce200..25d3081ae51 100644 --- a/java/src/IceGridGUI/LiveDeployment/SlaveEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/SlaveEditor.java @@ -14,7 +14,6 @@ import javax.swing.JTextField; import com.jgoodies.forms.builder.DefaultFormBuilder; import IceGrid.*; -import IceGridGUI.*; class SlaveEditor extends Editor { @@ -28,6 +27,7 @@ class SlaveEditor extends Editor _hostname.setText(info.hostname); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Hostname" ); @@ -35,6 +35,7 @@ class SlaveEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); diff --git a/java/src/IceGridGUI/LiveDeployment/TableField.java b/java/src/IceGridGUI/LiveDeployment/TableField.java index 9ac1a4dea03..405bb90553f 100644 --- a/java/src/IceGridGUI/LiveDeployment/TableField.java +++ b/java/src/IceGridGUI/LiveDeployment/TableField.java @@ -12,16 +12,7 @@ package IceGridGUI.LiveDeployment; import IceGrid.*; import IceGridGUI.*; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.DefaultCellEditor; import javax.swing.JTable; -import javax.swing.JTextField; -import javax.swing.KeyStroke; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; @@ -56,6 +47,7 @@ public class TableField extends JTable { _model = new DefaultTableModel() { + @Override public boolean isCellEditable(int row, int column) { return false; diff --git a/java/src/IceGridGUI/LiveDeployment/TreeNode.java b/java/src/IceGridGUI/LiveDeployment/TreeNode.java index 8c613c69a3d..43a477268a1 100644 --- a/java/src/IceGridGUI/LiveDeployment/TreeNode.java +++ b/java/src/IceGridGUI/LiveDeployment/TreeNode.java @@ -12,7 +12,6 @@ package IceGridGUI.LiveDeployment; import javax.swing.SwingUtilities; import javax.swing.JOptionPane; -import IceGrid.*; import IceGridGUI.*; public abstract class TreeNode extends TreeNodeBase @@ -136,6 +135,7 @@ public abstract class TreeNode extends TreeNodeBase { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { getCoordinator().getStatusBar().setText(prefix + "done."); @@ -201,6 +201,7 @@ public abstract class TreeNode extends TreeNodeBase { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { failure(prefix, title, message); diff --git a/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java b/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java index 242cb688105..7645fb1435f 100644 --- a/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java +++ b/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java @@ -9,33 +9,27 @@ package IceGridGUI.LiveDeployment; -import java.awt.Cursor; -import java.awt.BorderLayout; import java.awt.Container; -import java.awt.Dimension; -import java.awt.Frame; - import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.ButtonGroup; import javax.swing.BoxLayout; import javax.swing.JButton; -import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JOptionPane; -import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JScrollPane; import javax.swing.JTextArea; +import javax.swing.ScrollPaneConstants; import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.builder.ButtonBarBuilder; import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; import com.jgoodies.forms.util.LayoutStyle; @@ -47,7 +41,7 @@ class WriteMessageDialog extends JDialog WriteMessageDialog(final Root root) { super(root.getCoordinator().getMainFrame(), "Write Message - IceGrid Admin", true); - setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); _mainFrame = root.getCoordinator().getMainFrame(); @@ -61,6 +55,7 @@ class WriteMessageDialog extends JDialog JButton okButton = new JButton("OK"); ActionListener okListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { final Coordinator c = root.getCoordinator(); @@ -87,10 +82,12 @@ class WriteMessageDialog extends JDialog Ice.Callback_Process_writeMessage cb = new Ice.Callback_Process_writeMessage() { + @Override public void response() { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { c.getStatusBar().setText(prefix + "done."); @@ -98,10 +95,12 @@ class WriteMessageDialog extends JDialog }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { handleFailure("Communication exception: " + e.toString()); @@ -147,6 +146,7 @@ class WriteMessageDialog extends JDialog JButton cancelButton = new JButton("Cancel"); ActionListener cancelListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { setVisible(false); @@ -162,8 +162,8 @@ class WriteMessageDialog extends JDialog _message.setLineWrap(true); JScrollPane scrollPane = new JScrollPane(_message, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); builder.append(scrollPane, 3); builder.nextLine(); builder.append(_stdOut); diff --git a/java/src/IceGridGUI/LiveDeploymentPane.java b/java/src/IceGridGUI/LiveDeploymentPane.java index 15fda0e34a9..eda638a63e2 100644 --- a/java/src/IceGridGUI/LiveDeploymentPane.java +++ b/java/src/IceGridGUI/LiveDeploymentPane.java @@ -10,14 +10,10 @@ package IceGridGUI; import java.awt.*; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import javax.swing.*; -import javax.swing.border.AbstractBorder; import javax.swing.border.EmptyBorder; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; @@ -26,25 +22,22 @@ import javax.swing.plaf.basic.BasicSplitPaneUI; import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreeSelectionModel; import javax.swing.tree.TreePath; -import javax.swing.event.TreeWillExpandListener; -import javax.swing.event.TreeExpansionEvent; - import com.jgoodies.forms.factories.Borders; -import IceGrid.*; import IceGridGUI.LiveDeployment.Editor; import IceGridGUI.LiveDeployment.Root; import IceGridGUI.LiveDeployment.TreeNode; -import IceGridGUI.LiveDeployment.Server; public class LiveDeploymentPane extends JSplitPane implements Tab { + @Override public void updateUI() { super.updateUI(); setEmptyDividerBorder(); } + @Override public void selected() { Coordinator c = _root.getCoordinator(); @@ -65,6 +58,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab c.showActions(_currentNode); } + @Override public void refresh() { if(_currentNode != null) @@ -81,6 +75,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab } } + @Override public void showNode(TreeNodeBase node) { TreeNode newNode = (TreeNode)node; @@ -115,6 +110,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab } } + @Override public void back() { TreeNode previousNode = null; @@ -144,6 +140,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab } } + @Override public void forward() { TreeNode nextNode = null; @@ -173,26 +170,31 @@ public class LiveDeploymentPane extends JSplitPane implements Tab } } + @Override public void save() { assert false; } + @Override public void saveToRegistry(boolean restart) { assert false; } + @Override public void saveToFile() { assert false; } + @Override public void discardUpdates() { assert false; } + @Override public boolean close() { return false; @@ -225,8 +227,8 @@ public class LiveDeploymentPane extends JSplitPane implements Tab JScrollPane leftScroll = new JScrollPane(tree, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); leftScroll.setBorder(Borders.EMPTY); _leftPane = new SimpleInternalFrame("Runtime Components"); @@ -279,6 +281,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab private class SelectionListener implements TreeSelectionListener { + @Override public void valueChanged(TreeSelectionEvent e) { if(_selectionListenerEnabled) @@ -303,11 +306,13 @@ public class LiveDeploymentPane extends JSplitPane implements Tab private class PopupListener extends MouseAdapter { + @Override public void mousePressed(MouseEvent e) { maybeShowPopup(e); } + @Override public void mouseReleased(MouseEvent e) { maybeShowPopup(e); diff --git a/java/src/IceGridGUI/Logger.java b/java/src/IceGridGUI/Logger.java index affad493c74..7e914d17502 100644 --- a/java/src/IceGridGUI/Logger.java +++ b/java/src/IceGridGUI/Logger.java @@ -23,6 +23,7 @@ public class Logger extends Ice.LoggerI _mainFrame = mainFrame; } + @Override public void warning(final String message) { @@ -35,6 +36,7 @@ public class Logger extends Ice.LoggerI } SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog( @@ -46,11 +48,13 @@ public class Logger extends Ice.LoggerI }); } + @Override public void error(final String message) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog( diff --git a/java/src/IceGridGUI/Main.java b/java/src/IceGridGUI/Main.java index a2662a56ddb..a6617acee37 100644 --- a/java/src/IceGridGUI/Main.java +++ b/java/src/IceGridGUI/Main.java @@ -9,17 +9,14 @@ package IceGridGUI; -import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.swing.Icon; import javax.swing.JFrame; import javax.swing.JOptionPane; - import javax.swing.SwingUtilities; import javax.swing.UIManager; +import javax.swing.WindowConstants; import java.util.prefs.Preferences; @@ -54,6 +51,7 @@ public class Main extends JFrame SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { try @@ -84,9 +82,10 @@ public class Main extends JFrame setIconImage(icon.getImage()); } - setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { if(_coordinator != null) diff --git a/java/src/IceGridGUI/MainPane.java b/java/src/IceGridGUI/MainPane.java index d36cc1129d4..2a7dffccc96 100644 --- a/java/src/IceGridGUI/MainPane.java +++ b/java/src/IceGridGUI/MainPane.java @@ -9,8 +9,6 @@ package IceGridGUI; -import java.awt.Component; - import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -24,6 +22,7 @@ public class MainPane extends JTabbedPane super.addTab(computeTitle(root.getId()), getIcon(root), application); } + @Override public void setTitleAt(int index, String title) { super.setTitleAt(index, computeTitle(title)); @@ -93,6 +92,7 @@ public class MainPane extends JTabbedPane addChangeListener(new ChangeListener() { + @Override public void stateChanged(ChangeEvent evt) { Tab tab = (Tab)getSelectedComponent(); diff --git a/java/src/IceGridGUI/NodeObserverI.java b/java/src/IceGridGUI/NodeObserverI.java index 772fcec7e36..8bb9d9dddf9 100644 --- a/java/src/IceGridGUI/NodeObserverI.java +++ b/java/src/IceGridGUI/NodeObserverI.java @@ -20,6 +20,7 @@ class NodeObserverI extends _NodeObserverDisp _trace = _coordinator.traceObservers(); } + @Override public void nodeInit(final NodeDynamicInfo[] nodes, Ice.Current current) { if(_trace) @@ -41,6 +42,7 @@ class NodeObserverI extends _NodeObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(NodeDynamicInfo node : nodes) @@ -51,6 +53,7 @@ class NodeObserverI extends _NodeObserverDisp }); } + @Override public void nodeUp(final NodeDynamicInfo nodeInfo, Ice.Current current) { if(_trace) @@ -60,6 +63,7 @@ class NodeObserverI extends _NodeObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.nodeUp(nodeInfo); @@ -67,6 +71,7 @@ class NodeObserverI extends _NodeObserverDisp }); } + @Override public void nodeDown(final String nodeName, Ice.Current current) { if(_trace) @@ -76,6 +81,7 @@ class NodeObserverI extends _NodeObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.nodeDown(nodeName); @@ -83,6 +89,7 @@ class NodeObserverI extends _NodeObserverDisp }); } + @Override public void updateServer(final String node, final ServerDynamicInfo updatedInfo, Ice.Current current) { if(_trace) @@ -94,6 +101,7 @@ class NodeObserverI extends _NodeObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.updateServer(node, updatedInfo); @@ -101,6 +109,7 @@ class NodeObserverI extends _NodeObserverDisp }); } + @Override public void updateAdapter(final String node, final AdapterDynamicInfo updatedInfo, Ice.Current current) { if(_trace) @@ -113,6 +122,7 @@ class NodeObserverI extends _NodeObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.updateAdapter(node, updatedInfo); diff --git a/java/src/IceGridGUI/ObjectObserverI.java b/java/src/IceGridGUI/ObjectObserverI.java index 73d7e030426..2d721d0769d 100644 --- a/java/src/IceGridGUI/ObjectObserverI.java +++ b/java/src/IceGridGUI/ObjectObserverI.java @@ -20,6 +20,7 @@ class ObjectObserverI extends _ObjectObserverDisp _trace = coordinator.traceObservers(); } + @Override public synchronized void objectInit(final ObjectInfo[] objects, Ice.Current current) { if(_trace) @@ -42,6 +43,7 @@ class ObjectObserverI extends _ObjectObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.objectInit(objects); @@ -49,6 +51,7 @@ class ObjectObserverI extends _ObjectObserverDisp }); } + @Override public void objectAdded(final ObjectInfo info, Ice.Current current) { if(_trace) @@ -58,6 +61,7 @@ class ObjectObserverI extends _ObjectObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.objectAdded(info); @@ -65,6 +69,7 @@ class ObjectObserverI extends _ObjectObserverDisp }); } + @Override public void objectUpdated(final ObjectInfo info, Ice.Current current) { if(_trace) @@ -74,6 +79,7 @@ class ObjectObserverI extends _ObjectObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.objectUpdated(info); @@ -81,6 +87,7 @@ class ObjectObserverI extends _ObjectObserverDisp }); } + @Override public void objectRemoved(final Ice.Identity id, Ice.Current current) { if(_trace) @@ -90,6 +97,7 @@ class ObjectObserverI extends _ObjectObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.objectRemoved(id); diff --git a/java/src/IceGridGUI/RegistryObserverI.java b/java/src/IceGridGUI/RegistryObserverI.java index 4a01f29db04..5013a4cd0c5 100644 --- a/java/src/IceGridGUI/RegistryObserverI.java +++ b/java/src/IceGridGUI/RegistryObserverI.java @@ -20,6 +20,7 @@ class RegistryObserverI extends _RegistryObserverDisp _trace = _coordinator.traceObservers(); } + @Override public void registryInit(final RegistryInfo[] registryInfos, Ice.Current current) { if(_trace) @@ -43,6 +44,7 @@ class RegistryObserverI extends _RegistryObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(RegistryInfo info : registryInfos) @@ -53,6 +55,7 @@ class RegistryObserverI extends _RegistryObserverDisp }); } + @Override public void registryUp(final RegistryInfo registryInfo, Ice.Current current) { if(_trace) @@ -62,6 +65,7 @@ class RegistryObserverI extends _RegistryObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.registryUp(registryInfo); @@ -69,6 +73,7 @@ class RegistryObserverI extends _RegistryObserverDisp }); } + @Override public void registryDown(final String registryName, Ice.Current current) { if(_trace) @@ -78,6 +83,7 @@ class RegistryObserverI extends _RegistryObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.registryDown(registryName); diff --git a/java/src/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/SessionKeeper.java index 1841005bcc0..2fd50db7f0f 100644 --- a/java/src/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/SessionKeeper.java @@ -9,7 +9,6 @@ package IceGridGUI; import javax.swing.*; -import javax.swing.border.TitledBorder; import javax.swing.border.EmptyBorder; import javax.swing.event.DocumentListener; import javax.swing.event.DocumentEvent; @@ -20,35 +19,25 @@ import javax.swing.filechooser.FileFilter; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.InputStream; import java.io.File; import java.awt.Container; -import java.awt.Frame; import java.awt.Component; import java.awt.Cursor; import java.awt.Dimension; import java.awt.event.ActionEvent; -import java.awt.event.ItemEvent; import java.awt.event.ActionListener; -import java.awt.event.ItemListener; import java.awt.CardLayout; import java.awt.BorderLayout; import java.awt.Insets; -import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseAdapter; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.builder.ButtonBarBuilder; import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.factories.DefaultComponentFactory; import com.jgoodies.forms.layout.FormLayout; import com.jgoodies.forms.layout.CellConstraints; -import com.jgoodies.forms.layout.Sizes; import com.jgoodies.forms.util.LayoutStyle; import java.util.prefs.Preferences; @@ -66,13 +55,9 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.security.MessageDigest; -import javax.security.auth.x500.X500Principal; -import javax.net.ssl.KeyManagerFactory; import javax.naming.ldap.LdapName; import javax.naming.ldap.Rdn; -import Ice.LocatorFinderPrxHelper; -import Ice.Instrumentation._DispatchObserverOperationsNC; import IceGrid.*; // @@ -86,6 +71,7 @@ public class SessionKeeper private class LookupReplyI extends _LookupReplyDisp { + @Override public synchronized void foundLocator(LocatorPrx locator, Ice.Current curr) { @@ -149,6 +135,7 @@ public class SessionKeeper { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { logout(true); @@ -210,6 +197,7 @@ public class SessionKeeper { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { logout(true); @@ -242,6 +230,7 @@ public class SessionKeeper { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { logout(true); @@ -277,11 +266,13 @@ public class SessionKeeper _session.ice_getConnection().setCallback( new Ice.ConnectionCallback() { + @Override public void heartbeat(Ice.Connection con) { } + @Override public void closed(Ice.Connection con) { @@ -295,6 +286,7 @@ public class SessionKeeper SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { sessionLost("Failed to contact the IceGrid registry: " + ex.toString()); @@ -311,6 +303,7 @@ public class SessionKeeper { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { sessionLost("Failed to contact the IceGrid registry: " + e.toString()); @@ -318,26 +311,23 @@ public class SessionKeeper }); } + @Override public void run() { _session.begin_keepAlive(new Callback_AdminSession_keepAlive() { + @Override public void response() { } + @Override public void exception(Ice.LocalException ex) { error(ex); } - - public void - exception(Ice.UserException ex) - { - error(ex); - } }); } }, sessionTimeout / 2, sessionTimeout / 2, java.util.concurrent.TimeUnit.SECONDS); @@ -355,6 +345,7 @@ public class SessionKeeper { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { logout(true); @@ -542,6 +533,7 @@ public class SessionKeeper { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { ApplicationObserverI applicationObserverServant = new ApplicationObserverI( @@ -633,7 +625,7 @@ public class SessionKeeper private static JScrollPane createStrippedScrollPane(Component component) { JScrollPane scrollPane = new JScrollPane(component); - scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); return scrollPane; } @@ -650,6 +642,7 @@ public class SessionKeeper load(); } + @Override public synchronized String toString() { @@ -680,6 +673,7 @@ public class SessionKeeper return name; } + @Override public int compareTo(ConnectionInfo other) { return _instanceName.compareTo(other._instanceName); @@ -1152,11 +1146,13 @@ public class SessionKeeper _field = field; } + @Override public void focusGained(java.awt.event.FocusEvent fe) { _field.setCaretPosition(_field.getDocument().getLength()); } + @Override public void focusLost(java.awt.event.FocusEvent fe) { @@ -1210,6 +1206,7 @@ public class SessionKeeper _directConnection = new JRadioButton(new AbstractAction("Direct Connection") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1219,6 +1216,7 @@ public class SessionKeeper group.add(_directConnection); _routedConnection = new JRadioButton(new AbstractAction("Routed Connection") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1247,7 +1245,8 @@ public class SessionKeeper _directDiscoveryEndpointList.addListSelectionListener(new ListSelectionListener() { - public void valueChanged(ListSelectionEvent event) + @Override + public void valueChanged(ListSelectionEvent event) { validatePanel(); } @@ -1258,7 +1257,8 @@ public class SessionKeeper ButtonGroup group = new ButtonGroup(); _directDiscoveryDiscoveredEndpoint = new JRadioButton(new AbstractAction("Discovered Endpoints") { - public void actionPerformed(ActionEvent e) + @Override + public void actionPerformed(ActionEvent e) { _directDiscoveryEndpointList.setEnabled(true); validatePanel(); @@ -1269,7 +1269,8 @@ public class SessionKeeper _directDiscoveryManualEndpoint = new JRadioButton(new AbstractAction("Manual Endpoint") { - public void actionPerformed(ActionEvent e) + @Override + public void actionPerformed(ActionEvent e) { _directDiscoveryEndpointList.setEnabled(false); validatePanel(); @@ -1312,6 +1313,7 @@ public class SessionKeeper _directDefaultEndpoints = new JRadioButton( new AbstractAction("A hostname and a port number?") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1321,6 +1323,7 @@ public class SessionKeeper group.add(_directDefaultEndpoints); _directCustomEndpoints = new JRadioButton(new AbstractAction("An endpoint string?") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1347,6 +1350,7 @@ public class SessionKeeper _routedDefaultEndpoints = new JRadioButton( new AbstractAction("A hostname and a port number?") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1356,6 +1360,7 @@ public class SessionKeeper group.add(_routedDefaultEndpoints); _routedCustomEndpoints = new JRadioButton(new AbstractAction("An endpoint string?") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1382,16 +1387,19 @@ public class SessionKeeper _directDefaultEndpointHost = new JTextField(20); _directDefaultEndpointHost.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); _directDefaultEndpointHost.requestFocusInWindow(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); _directDefaultEndpointHost.requestFocusInWindow(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1406,16 +1414,19 @@ public class SessionKeeper _directDefaultEndpointPort.addFocusListener(new FocusListener(_directDefaultEndpointPort)); _directDefaultEndpointPort.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); _directDefaultEndpointPort.requestFocusInWindow(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); _directDefaultEndpointPort.requestFocusInWindow(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1429,6 +1440,7 @@ public class SessionKeeper ButtonGroup group = new ButtonGroup(); _directDefaultEndpointTCP = new JRadioButton(new AbstractAction("TCP") { + @Override public void actionPerformed(ActionEvent e) { } @@ -1437,6 +1449,7 @@ public class SessionKeeper _directDefaultEndpointSSL = new JRadioButton(new AbstractAction("SSL") { + @Override public void actionPerformed(ActionEvent e) { } @@ -1465,16 +1478,19 @@ public class SessionKeeper _routedDefaultEndpointHost.addFocusListener(new FocusListener(_routedDefaultEndpointHost)); _routedDefaultEndpointHost.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); _routedDefaultEndpointHost.requestFocusInWindow(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); _routedDefaultEndpointHost.requestFocusInWindow(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1489,16 +1505,19 @@ public class SessionKeeper _routedDefaultEndpointPort.addFocusListener(new FocusListener(_routedDefaultEndpointPort)); _routedDefaultEndpointPort.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); _routedDefaultEndpointPort.requestFocusInWindow(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); _routedDefaultEndpointPort.requestFocusInWindow(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1513,6 +1532,7 @@ public class SessionKeeper ButtonGroup group = new ButtonGroup(); _routedDefaultEndpointTCP = new JRadioButton(new AbstractAction("TCP") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1522,6 +1542,7 @@ public class SessionKeeper _routedDefaultEndpointSSL = new JRadioButton(new AbstractAction("SSL") { + @Override public void actionPerformed(ActionEvent e) { } @@ -1550,14 +1571,17 @@ public class SessionKeeper _directCustomEndpointValue.addFocusListener(new FocusListener(_directCustomEndpointValue)); _directCustomEndpointValue.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1582,14 +1606,17 @@ public class SessionKeeper _routedCustomEndpointValue.addFocusListener(new FocusListener(_routedCustomEndpointValue)); _routedCustomEndpointValue.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1614,6 +1641,7 @@ public class SessionKeeper _x509CertificateNoButton = new JRadioButton(new AbstractAction("No") { + @Override public void actionPerformed(ActionEvent e) { _x509CertificateDefault = false; @@ -1625,6 +1653,7 @@ public class SessionKeeper group.add(_x509CertificateNoButton); _x509CertificateYesButton = new JRadioButton(new AbstractAction("Yes") { + @Override public void actionPerformed(ActionEvent e) { _x509CertificateDefault = false; @@ -1645,6 +1674,7 @@ public class SessionKeeper _directCertificateAliases = new JComboBox(); _directCertificateAliases.addActionListener (new ActionListener () { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1653,6 +1683,7 @@ public class SessionKeeper _directImportCertificate = new JButton(new AbstractAction("Import...") { + @Override public void actionPerformed(ActionEvent e) { CertificateManagerDialog d = certificateManager(ConnectionWizardDialog.this); @@ -1682,8 +1713,6 @@ public class SessionKeeper DefaultFormBuilder builder = new DefaultFormBuilder(layout); builder.rowGroupingEnabled(true); - ButtonGroup group = new ButtonGroup(); - builder.append("<html><b>Alias:</b></html>", alias); builder.append("", new JLabel("<html><p>Your X.509 certificate for SSL authentication.</p></html>")); @@ -1709,6 +1738,7 @@ public class SessionKeeper _routedCertificateAliases = new JComboBox(); _routedCertificateAliases.addActionListener (new ActionListener () { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1717,6 +1747,7 @@ public class SessionKeeper _routedImportCertificate = new JButton(new AbstractAction("Import...") { + @Override public void actionPerformed(ActionEvent e) { CertificateManagerDialog d = certificateManager(ConnectionWizardDialog.this); @@ -1746,8 +1777,6 @@ public class SessionKeeper DefaultFormBuilder builder = new DefaultFormBuilder(layout); builder.rowGroupingEnabled(true); - ButtonGroup group = new ButtonGroup(); - builder.append("<html><b>Alias:</b></html>", alias); builder.append("", new JLabel("<html><p>Your X.509 certificate for SSL authentication.</p></html>")); @@ -1780,6 +1809,7 @@ public class SessionKeeper _usernamePasswordAuthButton = new JRadioButton( new AbstractAction("Log in with a username and password") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1789,6 +1819,7 @@ public class SessionKeeper group.add(_usernamePasswordAuthButton); _certificateAuthButton = new JRadioButton(new AbstractAction("Log in with my X.509 certificate") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1810,21 +1841,22 @@ public class SessionKeeper builder.border(Borders.DIALOG); builder.rowGroupingEnabled(true); - ButtonGroup group = new ButtonGroup(); - _directUsername = new JTextField(); _directUsername.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); _directUsername.requestFocusInWindow(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); _directUsername.requestFocusInWindow(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1848,21 +1880,22 @@ public class SessionKeeper builder.border(Borders.DIALOG); builder.rowGroupingEnabled(true); - ButtonGroup group = new ButtonGroup(); - _routedUsername = new JTextField(); _routedUsername.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); _routedUsername.requestFocusInWindow(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); _routedUsername.requestFocusInWindow(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1882,6 +1915,7 @@ public class SessionKeeper _backButton = new JButton(); AbstractAction backAction = new AbstractAction("< Back") { + @Override public void actionPerformed(ActionEvent e) { if(_wizardSteps.size() <= 1) @@ -1906,6 +1940,7 @@ public class SessionKeeper _nextButton = new JButton(); AbstractAction nextAction = new AbstractAction("Next >") { + @Override public void actionPerformed(ActionEvent e) { _nextButton.setEnabled(false); @@ -1936,11 +1971,12 @@ public class SessionKeeper null); final JDialog searchingDialog = messagePane.createDialog(ConnectionWizardDialog.this, "Please wait..."); - searchingDialog.setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE); + searchingDialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); new Thread(new Runnable() { - public void run() + @Override + public void run() { // Search for endpoints Ice.Properties properties = _coordinator.getCommunicator().getProperties(); @@ -2046,7 +2082,8 @@ public class SessionKeeper } SwingUtilities.invokeLater(new Runnable() { - public void run() + @Override + public void run() { searchingDialog.dispose(); _cardLayout.show(_cardPanel, @@ -2363,9 +2400,9 @@ public class SessionKeeper _finishButton = new JButton(); AbstractAction finishAction = new AbstractAction("Finish") { + @Override public void actionPerformed(ActionEvent e) { - boolean secureEndpoints = false; ConnectionInfo inf = getConfiguration(); if(inf == null) { @@ -2534,6 +2571,7 @@ public class SessionKeeper _cancelButton = new JButton(); AbstractAction cancelAction = new AbstractAction("Cancel") { + @Override public void actionPerformed(ActionEvent e) { dispose(); @@ -3103,7 +3141,6 @@ public class SessionKeeper private JButton _backButton; private JButton _nextButton; private JButton _finishButton; - private JButton _connectButton; private JButton _cancelButton; // Connection type components @@ -3316,6 +3353,7 @@ public class SessionKeeper JButton closeButton = new JButton("Close"); closeButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { dispose(); @@ -3328,15 +3366,6 @@ public class SessionKeeper pack(); setResizable(false); } - - void showDialog() - { - if(isVisible() == false) - { - setLocationRelativeTo(_coordinator.getMainFrame()); - setVisible(true); - } - } } @@ -3345,7 +3374,7 @@ public class SessionKeeper ConnectionManagerDialog() { super(_coordinator.getMainFrame(), "Saved Connections - IceGrid Admin", true); - setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); JPanel connectionActionPanel = null; { @@ -3357,6 +3386,7 @@ public class SessionKeeper _newConnectionButton.setToolTipText("Configure a new connection with IceGrid registry"); _newConnectionButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { JDialog dialog = new ConnectionWizardDialog(ConnectionManagerDialog.this); @@ -3373,6 +3403,7 @@ public class SessionKeeper _viewConnectionButton.setEnabled(false); _viewConnectionButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { Object obj = _connectionList.getSelectedValue(); @@ -3395,6 +3426,7 @@ public class SessionKeeper _editConnectionButton.setEnabled(false); _editConnectionButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { Object obj = _connectionList.getSelectedValue(); @@ -3417,6 +3449,7 @@ public class SessionKeeper _setDefaultConnectionButton.setEnabled(false); _setDefaultConnectionButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { _connectionListModel.setDefault(); @@ -3430,6 +3463,7 @@ public class SessionKeeper _removeConnectionButton.setEnabled(false); _removeConnectionButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { int index = _connectionList.getSelectedIndex(); @@ -3498,6 +3532,7 @@ public class SessionKeeper class ConnectionListRenderer extends DefaultListCellRenderer { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean selected, boolean hasFocus) @@ -3517,6 +3552,7 @@ public class SessionKeeper } _connectionList = new JList(_connectionListModel) { + @Override public String getToolTipText(MouseEvent evt) { int index = locationToIndex(evt.getPoint()); @@ -3537,6 +3573,7 @@ public class SessionKeeper _connectionList.setVisibleRowCount(7); _connectionList.addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent event) { if(!event.getValueIsAdjusting()) @@ -3562,6 +3599,7 @@ public class SessionKeeper _connectionList.addMouseListener( new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { if(e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) @@ -3600,6 +3638,7 @@ public class SessionKeeper _connectButton = new JButton("Connect"); _connectButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { Object obj = _connectionList.getSelectedValue(); @@ -3616,6 +3655,7 @@ public class SessionKeeper JButton closeButton = new JButton("Close"); closeButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { setVisible(false); @@ -3749,7 +3789,7 @@ public class SessionKeeper keyStore.load(new FileInputStream(_coordinator.getDataDirectory() + File.separator + "MyCerts.jks"), null); if(keyStore.isKeyEntry(alias)) { - Key key = keyStore.getKey(alias, new char[]{}); + keyStore.getKey(alias, new char[]{}); } } catch(java.security.UnrecoverableKeyException ex) @@ -3770,7 +3810,7 @@ public class SessionKeeper keyStore.load(new FileInputStream(_coordinator.getDataDirectory() + File.separator + "MyCerts.jks"), null); if(keyStore.isKeyEntry(alias)) { - Key key = keyStore.getKey(alias, password); + keyStore.getKey(alias, password); } } catch(Exception ex) @@ -3832,11 +3872,13 @@ public class SessionKeeper final String columnNames[] = new String[]{"Alias", "Subject", "Issuer"}; _tableModel = new AbstractTableModel() { + @Override public String getColumnName(int col) { return columnNames[col].toString(); } + @Override public int getRowCount() { if(_aliases == null) @@ -3846,11 +3888,13 @@ public class SessionKeeper return _aliases.size(); } + @Override public int getColumnCount() { return columnNames.length; } + @Override public Object getValueAt(int row, int col) { if(_aliases == null) @@ -3885,11 +3929,13 @@ public class SessionKeeper return ""; } + @Override public boolean isCellEditable(int row, int col) { return false; } + @Override public void setValueAt(Object value, int row, int col) { } @@ -3906,6 +3952,7 @@ public class SessionKeeper _importButton = new JButton(); AbstractAction importAction = new AbstractAction("Import") { + @Override public void actionPerformed(ActionEvent e) { String defaultPath = _coordinator.getPrefs().node("Configurations").get("importDirectory", ""); @@ -3913,6 +3960,7 @@ public class SessionKeeper chooser.setFileFilter(new FileFilter() { //Accept all directories and *.pfx, *.p12 files. + @Override public boolean accept(File f) { if(f.isDirectory()) @@ -3928,6 +3976,7 @@ public class SessionKeeper return false; } + @Override public String getDescription() { return "PKCS12 Files (*.pfx, *.p12)"; @@ -3937,6 +3986,7 @@ public class SessionKeeper chooser.setFileFilter(new FileFilter() { //Accept all directories and *.pem, *.crt files. + @Override public boolean accept(File f) { if(f.isDirectory()) @@ -3952,6 +4002,7 @@ public class SessionKeeper return false; } + @Override public String getDescription() { return "PEM Files (*.pem, *.crt)"; @@ -3961,6 +4012,7 @@ public class SessionKeeper chooser.setFileFilter(new FileFilter() { //Accept all directories and *.jks files. + @Override public boolean accept(File f) { if(f.isDirectory()) @@ -3975,6 +4027,7 @@ public class SessionKeeper return false; } + @Override public String getDescription() { return "Java Key Store Files (*.jks)"; @@ -4116,6 +4169,7 @@ public class SessionKeeper _viewButton = new JButton(); AbstractAction viewAction = new AbstractAction("View") { + @Override public void actionPerformed(ActionEvent e) { int index = _certificatesTable.getSelectionModel().getMinSelectionIndex(); @@ -4146,6 +4200,7 @@ public class SessionKeeper _removeButton = new JButton(); AbstractAction removeAction = new AbstractAction("Remove") { + @Override public void actionPerformed(ActionEvent e) { int index = _certificatesTable.getSelectionModel().getMinSelectionIndex(); @@ -4192,9 +4247,9 @@ public class SessionKeeper java.io.FileNotFoundException, java.io.IOException { - for(Enumeration aliases = keyStore.aliases(); aliases.hasMoreElements(); ) + for(Enumeration<String> aliases = keyStore.aliases(); aliases.hasMoreElements(); ) { - String alias = aliases.nextElement().toString(); + String alias = aliases.nextElement(); if(keyStore.isKeyEntry(alias)) { char[] password = null; @@ -4303,9 +4358,9 @@ public class SessionKeeper } _aliases = new java.util.Vector<String>(); - for(Enumeration e = _keyStore.aliases(); e.hasMoreElements() ;) + for(Enumeration<String> e = _keyStore.aliases(); e.hasMoreElements() ;) { - _aliases.add(e.nextElement().toString()); + _aliases.add(e.nextElement()); } _tableModel.fireTableStructureChanged(); } @@ -4468,15 +4523,22 @@ public class SessionKeeper StringBuilder sb = new StringBuilder(digest.length * 2); Formatter formatter = new Formatter(sb); - for(int i = 0; i < digest.length;) + try { - formatter.format("%02x", digest[i]); - i++; - if(i < digest.length) + for(int i = 0; i < digest.length;) { - sb.append(":"); + formatter.format("%02x", digest[i]); + i++; + if(i < digest.length) + { + sb.append(":"); + } } } + finally + { + formatter.close(); + } sha1Fingerprint = sb.toString().toUpperCase(); } @@ -4495,15 +4557,22 @@ public class SessionKeeper StringBuilder sb = new StringBuilder(digest.length * 2); Formatter formatter = new Formatter(sb); - for(int i = 0; i < digest.length;) + try { - formatter.format("%02x", digest[i]); - i++; - if(i < digest.length) + for(int i = 0; i < digest.length;) { - sb.append(":"); + formatter.format("%02x", digest[i]); + i++; + if(i < digest.length) + { + sb.append(":"); + } } } + finally + { + formatter.close(); + } md5Fingerprint = sb.toString().toUpperCase(); } builder.append(new JLabel("<html><b>MD5 Fingerprint:</b></html>"), @@ -4524,12 +4593,11 @@ public class SessionKeeper builder.addSeparator("Subject Alternate Names"); builder.nextLine(); - Collection altNames = cert.getSubjectAlternativeNames(); + Collection<List<?>> altNames = cert.getSubjectAlternativeNames(); if(altNames != null) { - for(Object o : altNames) + for(List<?> l : altNames) { - java.util.List l = (java.util.List)o; Integer kind = (Integer)l.get(0); String value = l.get(1).toString(); if(kind == 2) @@ -4566,6 +4634,7 @@ public class SessionKeeper JButton closeButton = new JButton("Close"); closeButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { dispose(); @@ -4612,6 +4681,7 @@ public class SessionKeeper JButton closeButton = new JButton("Close"); closeButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { setVisible(false); @@ -4662,7 +4732,6 @@ public class SessionKeeper } } - private String _dataDir; private JTabbedPane _tabs; private KeyStorePanel _identityCertificatesPanel; private KeyStorePanel _serverCertificatesPanel; @@ -4672,7 +4741,6 @@ public class SessionKeeper SessionKeeper(Coordinator coordinator) { _coordinator = coordinator; - _loginPrefs = coordinator.getPrefs().node("Connection"); } void connectionManager() @@ -4716,7 +4784,7 @@ public class SessionKeeper public AuthDialog(JDialog parent, String title) { super(parent, title, true); - setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); } public void showDialog() @@ -4766,16 +4834,19 @@ public class SessionKeeper _password.getPassword().length > 0); _password.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { _storePassword.setEnabled(_password.getPassword() != null && _password.getPassword().length > 0); } + @Override public void removeUpdate(DocumentEvent e) { _storePassword.setEnabled(_password.getPassword() != null && _password.getPassword().length > 0); } + @Override public void insertUpdate(DocumentEvent e) { _storePassword.setEnabled(_password.getPassword() != null && @@ -4802,16 +4873,19 @@ public class SessionKeeper _keyPassword.getPassword().length > 0); _keyPassword.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && _keyPassword.getPassword().length > 0); } + @Override public void removeUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && _keyPassword.getPassword().length > 0); } + @Override public void insertUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && @@ -4828,6 +4902,7 @@ public class SessionKeeper JButton okButton = new JButton(); AbstractAction okAction = new AbstractAction("OK") { + @Override public void actionPerformed(ActionEvent e) { if(_session != null) @@ -4866,6 +4941,7 @@ public class SessionKeeper JButton cancelButton = new JButton(); AbstractAction cancelAction = new AbstractAction("Cancel") { + @Override public void actionPerformed(ActionEvent e) { dispose(); @@ -4947,16 +5023,19 @@ public class SessionKeeper _storeKeyPassword.setEnabled(false); _keyPassword.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && _keyPassword.getPassword().length > 0); } + @Override public void removeUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && _keyPassword.getPassword().length > 0); } + @Override public void insertUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && @@ -4971,6 +5050,7 @@ public class SessionKeeper JButton okButton = new JButton(); AbstractAction okAction = new AbstractAction("OK") { + @Override public void actionPerformed(ActionEvent e) { if(_session != null) @@ -5001,6 +5081,7 @@ public class SessionKeeper JButton cancelButton = new JButton(); AbstractAction cancelAction = new AbstractAction("Cancel") { + @Override public void actionPerformed(ActionEvent e) { dispose(); @@ -5092,6 +5173,7 @@ public class SessionKeeper // new Thread(new Runnable() { + @Override public void run() { try @@ -5102,6 +5184,7 @@ public class SessionKeeper { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _connectionManagerDialog.setCursor(oldCursor); @@ -5112,6 +5195,7 @@ public class SessionKeeper SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _connectionManagerDialog.setCursor(oldCursor); @@ -5183,16 +5267,19 @@ public class SessionKeeper _password.getPassword().length > 0); _password.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { _storePassword.setEnabled(_password.getPassword() != null && _password.getPassword().length > 0); } + @Override public void removeUpdate(DocumentEvent e) { _storePassword.setEnabled(_password.getPassword() != null && _password.getPassword().length > 0); } + @Override public void insertUpdate(DocumentEvent e) { _storePassword.setEnabled(_password.getPassword() != null && @@ -5223,16 +5310,19 @@ public class SessionKeeper _keyPassword.getPassword().length > 0); _keyPassword.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && _keyPassword.getPassword().length > 0); } + @Override public void removeUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && _keyPassword.getPassword().length > 0); } + @Override public void insertUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && @@ -5248,6 +5338,7 @@ public class SessionKeeper JButton okButton = new JButton(new AbstractAction("OK") { + @Override public void actionPerformed(ActionEvent e) { if(_session != null) @@ -5287,6 +5378,7 @@ public class SessionKeeper JButton editConnectionButton = new JButton(new AbstractAction("Edit Connection") { + @Override public void actionPerformed(ActionEvent e) { info.load(); @@ -5301,6 +5393,7 @@ public class SessionKeeper JButton cancelButton = new JButton(new AbstractAction("Cancel") { + @Override public void actionPerformed(ActionEvent e) { info.load(); @@ -5410,8 +5503,7 @@ public class SessionKeeper private static AuthDialog _authDialog; private final Coordinator _coordinator; - private Preferences _loginPrefs; - + private Session _session; private boolean _connectedToMaster = false; private String _replicaName = ""; diff --git a/java/src/IceGridGUI/SimpleInternalFrame.java b/java/src/IceGridGUI/SimpleInternalFrame.java index 8f3b017ac55..14b0a514911 100644 --- a/java/src/IceGridGUI/SimpleInternalFrame.java +++ b/java/src/IceGridGUI/SimpleInternalFrame.java @@ -319,6 +319,7 @@ public class SimpleInternalFrame extends JPanel { * Updates the UI. In addition to the superclass behavior, we need * to update the header component. */ + @Override public void updateUI() { super.updateUI(); if (titleLabel != null) { @@ -388,8 +389,10 @@ public class SimpleInternalFrame extends JPanel { private static final Insets INSETS = new Insets(1, 1, 1, 0); + @Override public Insets getBorderInsets(Component c) { return INSETS; } + @Override public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { @@ -408,8 +411,10 @@ public class SimpleInternalFrame extends JPanel { private static final Insets INSETS = new Insets(1, 1, 3, 3); + @Override public Insets getBorderInsets(Component c) { return INSETS; } + @Override public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { @@ -457,6 +462,7 @@ public class SimpleInternalFrame extends JPanel { setBackground(background); } + @Override public void paintComponent(Graphics g) { super.paintComponent(g); if (!isOpaque()) { diff --git a/java/src/IceGridGUI/TreeNodeBase.java b/java/src/IceGridGUI/TreeNodeBase.java index 22ad2dfc906..0da28bb420a 100644 --- a/java/src/IceGridGUI/TreeNodeBase.java +++ b/java/src/IceGridGUI/TreeNodeBase.java @@ -29,15 +29,18 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer return _parent.getCoordinator(); } - public Enumeration children() + @Override + public Enumeration<Object> children() { - return new Enumeration() + return new Enumeration<Object>() { + @Override public boolean hasMoreElements() { return false; } + @Override public Object nextElement() { throw new java.util.NoSuchElementException(); @@ -45,36 +48,43 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer }; } + @Override public boolean getAllowsChildren() { return false; } + @Override public javax.swing.tree.TreeNode getChildAt(int childIndex) { return null; } + @Override public int getChildCount() { return 0; } + @Override public int getIndex(javax.swing.tree.TreeNode node) { return -1; } + @Override public javax.swing.tree.TreeNode getParent() { return _parent; } + @Override public boolean isLeaf() { return true; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -87,6 +97,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer return null; } + @Override public String toString() { return _id; @@ -161,7 +172,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer protected boolean insertSortedChild(TreeNodeBase newChild, java.util.List c, DefaultTreeModel treeModel) { @SuppressWarnings("unchecked") - java.util.List<TreeNodeBase> children = (java.util.List<TreeNodeBase>)c; + java.util.List<TreeNodeBase> children = c; String id = newChild.getId(); int i; @@ -190,9 +201,9 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer protected String insertSortedChildren(java.util.List nc, java.util.List ic, DefaultTreeModel treeModel) { @SuppressWarnings("unchecked") - java.util.List<TreeNodeBase> newChildren = (java.util.List<TreeNodeBase>)nc; + java.util.List<TreeNodeBase> newChildren = nc; @SuppressWarnings("unchecked") - java.util.List<TreeNodeBase> intoChildren = (java.util.List<TreeNodeBase>)ic; + java.util.List<TreeNodeBase> intoChildren = ic; TreeNodeBase[] children = newChildren.toArray(new TreeNodeBase[0]); java.util.Arrays.sort(children, _childComparator); @@ -266,7 +277,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer protected void removeSortedChildren(String[] childIds, java.util.List fc, DefaultTreeModel treeModel) { @SuppressWarnings("unchecked") - java.util.List<TreeNodeBase> fromChildren = (java.util.List<TreeNodeBase>)fc; + java.util.List<TreeNodeBase> fromChildren = fc; if(childIds.length == 0) { @@ -274,7 +285,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer } assert fromChildren.size() > 0; - String[] ids = (String[])childIds.clone(); + String[] ids = childIds.clone(); java.util.Arrays.sort(ids); Object[] childrenToRemove = new Object[ids.length]; @@ -311,7 +322,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer protected void childrenChanged(java.util.List c, DefaultTreeModel treeModel) { @SuppressWarnings("unchecked") - java.util.List<TreeNodeBase> children = (java.util.List<TreeNodeBase>)c; + java.util.List<TreeNodeBase> children = c; for(TreeNodeBase child : children) { @@ -329,7 +340,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer protected TreeNodeBase find(String id, java.util.List il) { @SuppressWarnings("unchecked") - java.util.List<TreeNodeBase> inList = (java.util.List<TreeNodeBase>)il; + java.util.List<TreeNodeBase> inList = il; for(TreeNodeBase node : inList) { @@ -346,6 +357,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer protected java.util.Comparator<TreeNodeBase> _childComparator = new java.util.Comparator<TreeNodeBase>() { + @Override public int compare(TreeNodeBase o1, TreeNodeBase o2) { return o1.getId().compareTo(o2.getId()); diff --git a/java/src/IceGridGUI/Utils.java b/java/src/IceGridGUI/Utils.java index 3cb5cc24231..3126875cb96 100644 --- a/java/src/IceGridGUI/Utils.java +++ b/java/src/IceGridGUI/Utils.java @@ -71,6 +71,7 @@ public class Utils dialog.getRootPane().registerKeyboardAction( new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { dialog.dispose(); @@ -209,6 +210,7 @@ public class Utils Stringifier stringifier = new Stringifier() { + @Override public String toString(Object obj) { return (String)obj; @@ -231,6 +233,7 @@ public class Utils { Stringifier stringifier = new Stringifier() { + @Override public String toString(Object obj) { @SuppressWarnings("unchecked") diff --git a/java/test/Freeze/dbmap/Client.java b/java/test/Freeze/dbmap/Client.java index 36c83c9e0e6..fe6c9a06680 100644 --- a/java/test/Freeze/dbmap/Client.java +++ b/java/test/Freeze/dbmap/Client.java @@ -15,6 +15,7 @@ public class Client { static class ReadThread extends Thread { + @Override public void run() { @@ -59,7 +60,7 @@ public class Client } finally { - ((Freeze.Map)_map).close(); + ((Freeze.Map<Byte, Integer>)_map).close(); _connection.close(); } } @@ -76,6 +77,7 @@ public class Client static class WriteThread extends Thread { + @Override public void run() { @@ -128,7 +130,7 @@ public class Client } finally { - ((Freeze.Map)_map).close(); + ((Freeze.Map<Byte, Integer>)_map).close(); _connection.close(); } } @@ -279,7 +281,7 @@ public class Client // // The iterator should have already been closed when we reached the last entry. // - int count = ((Freeze.Map)m).closeAllIterators(); + int count = ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); test(count == 0); try @@ -292,7 +294,7 @@ public class Client // Expected - no transaction. } - count = ((Freeze.Map)m).closeAllIterators(); + count = ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); test(count == 1); // Opened by keys.remove() Transaction tx = connection.beginTransaction(); @@ -331,7 +333,7 @@ public class Client // // The iterator should have already been closed when we reached the last entry. // - int count = ((Freeze.Map)m).closeAllIterators(); + int count = ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); test(count == 0); try @@ -344,7 +346,7 @@ public class Client // Expected - no transaction. } - count = ((Freeze.Map)m).closeAllIterators(); + count = ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); test(count == 1); // Opened by keys.remove() Transaction tx = connection.beginTransaction(); @@ -379,7 +381,7 @@ public class Client // // The iterator should have already been closed when we reached the last entry. // - int count = ((Freeze.Map)m).closeAllIterators(); + int count = ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); test(count == 0); System.out.println("ok"); } @@ -478,12 +480,12 @@ public class Client e = nm.firstEntry(); test(e != null); - test(e.getKey().byteValue() == (byte)firstByte); + test(e.getKey().byteValue() == firstByte); test(e.getValue().intValue() == 0); e = nm.lastEntry(); test(e != null); - test(e.getKey().byteValue() == (byte)lastByte); + test(e.getKey().byteValue() == lastByte); test(e.getValue().intValue() == length - 1); try @@ -528,13 +530,13 @@ public class Client e = nm.pollFirstEntry(); test(e != null); - test(e.getKey().byteValue() == (byte)firstByte); + test(e.getKey().byteValue() == firstByte); test(e.getValue().intValue() == 0); test(!nm.containsKey(firstByte)); e = nm.pollLastEntry(); test(e != null); - test(e.getKey().byteValue() == (byte)lastByte); + test(e.getKey().byteValue() == lastByte); test(e.getValue().intValue() == length - 1); test(!nm.containsKey(lastByte)); @@ -600,7 +602,7 @@ public class Client // // The iterator should have already been closed when we reached the last entry. // - int count = ((Freeze.Map)m).closeAllIterators(); + int count = ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); test(count == 0); System.out.println("ok"); @@ -918,7 +920,7 @@ public class Client System.out.println("ok"); } - ((Freeze.Map)m).closeAllIterators(); + ((Freeze.Map<Byte, Integer>)m).closeAllIterators(); { System.out.print("testing concurrent access... "); @@ -1037,6 +1039,7 @@ public class Client final java.util.Comparator<Integer> less = new java.util.Comparator<Integer>() { + @Override public int compare(Integer i1, Integer i2) { if(i1 == i2) @@ -1056,6 +1059,7 @@ public class Client java.util.Comparator<String> greater = new java.util.Comparator<String>() { + @Override public int compare(String s1, String s2) { if(s1 == s2) @@ -1102,7 +1106,6 @@ public class Client { final Integer first = sm.firstKey(); - final Integer last = sm.lastKey(); // // fastRemove diff --git a/java/test/Freeze/evictor/Client.java b/java/test/Freeze/evictor/Client.java index e397a0c4223..a5e649fdf48 100644 --- a/java/test/Freeze/evictor/Client.java +++ b/java/test/Freeze/evictor/Client.java @@ -272,14 +272,14 @@ public class Client extends test.Util.Application } else { - ServantPrx servant = _evictor.createServant(id, i); + _evictor.createServant(id, i); // // Twice // try { - servant = _evictor.createServant(id, 0); + _evictor.createServant(id, 0); test(false); } catch(AlreadyRegisteredException e) @@ -584,7 +584,7 @@ public class Client extends test.Util.Application // try { - int balance = AccountPrxHelper.uncheckedCast(servants[0]).getBalance(); + AccountPrxHelper.uncheckedCast(servants[0]).getBalance(); test(false); } catch(Ice.OperationNotExistException ex) @@ -894,7 +894,7 @@ public class Client extends test.Util.Application try { - Thread.currentThread().sleep(500); + Thread.sleep(500); } catch(InterruptedException e) { @@ -949,7 +949,7 @@ public class Client extends test.Util.Application try { - Thread.currentThread().sleep(500); + Thread.sleep(500); } catch(InterruptedException e) { diff --git a/java/test/Freeze/fileLock/Client.java b/java/test/Freeze/fileLock/Client.java index 886ed7e8ae6..8b8fd8c13a2 100644 --- a/java/test/Freeze/fileLock/Client.java +++ b/java/test/Freeze/fileLock/Client.java @@ -12,8 +12,6 @@ package test.Freeze.fileLock; import java.io.BufferedReader; import java.io.InputStreamReader; -import Freeze.*; - public class Client { private static void @@ -53,7 +51,7 @@ public class Client BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); try { - String dummy = br.readLine(); + br.readLine(); } catch(java.io.IOException ex) { diff --git a/java/test/Freeze/fileLock/ClientFail.java b/java/test/Freeze/fileLock/ClientFail.java index 4fc19d88a20..2c589a90eb1 100644 --- a/java/test/Freeze/fileLock/ClientFail.java +++ b/java/test/Freeze/fileLock/ClientFail.java @@ -9,11 +9,6 @@ package test.Freeze.fileLock; -import java.io.BufferedReader; -import java.io.InputStreamReader; - -import Freeze.*; - public class ClientFail { private static void @@ -44,10 +39,9 @@ public class ClientFail envName += "db"; } - Freeze.Connection connection = null; try { - connection = Freeze.Util.createConnection(communicator, envName); + Freeze.Util.createConnection(communicator, envName); test(false); } catch(IceUtil.FileLockException ex) diff --git a/java/test/Glacier2/router/Client.java b/java/test/Glacier2/router/Client.java index 63090711dff..257e81c12cd 100644 --- a/java/test/Glacier2/router/Client.java +++ b/java/test/Glacier2/router/Client.java @@ -115,14 +115,12 @@ public class Client extends test.Util.Application } } - Glacier2.SessionPrx session; - { out.print("trying to create session with wrong password... "); out.flush(); try { - session = router.createSession("userid", "xxx"); + router.createSession("userid", "xxx"); test(false); } catch(Glacier2.PermissionDeniedException ex) @@ -154,7 +152,7 @@ public class Client extends test.Util.Application out.flush(); try { - session = router.createSession("userid", "abc123"); + router.createSession("userid", "abc123"); } catch(Glacier2.PermissionDeniedException ex) { diff --git a/java/test/Glacier2/sessionHelper/Client.java b/java/test/Glacier2/sessionHelper/Client.java index 2a93f6c5d1e..faaf05536a3 100644 --- a/java/test/Glacier2/sessionHelper/Client.java +++ b/java/test/Glacier2/sessionHelper/Client.java @@ -11,13 +11,8 @@ package test.Glacier2.sessionHelper; import javax.swing.SwingUtilities; import java.io.PrintWriter; -import java.io.StringWriter; - -import test.Glacier2.sessionHelper.Test.CallbackException; import test.Glacier2.sessionHelper.Test.CallbackPrx; import test.Glacier2.sessionHelper.Test.CallbackPrxHelper; -import test.Glacier2.sessionHelper.Test.CallbackReceiverPrx; -import test.Glacier2.sessionHelper.Test.CallbackReceiverPrxHelper; public class Client extends test.Util.Application { @@ -36,6 +31,7 @@ public class Client extends test.Util.Application } } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { _initData = new Ice.InitializationData(); @@ -43,6 +39,7 @@ public class Client extends test.Util.Application _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:default -p 12347"); _initData.dispatcher = new Ice.Dispatcher() { + @Override public void dispatch(Runnable runnable, Ice.Connection connection) { @@ -53,10 +50,12 @@ public class Client extends test.Util.Application return _initData; } + @Override public int run(String[] args) { _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback() { + @Override public void connected(Glacier2.SessionHelper session) throws Glacier2.SessionNotExistException @@ -64,12 +63,14 @@ public class Client extends test.Util.Application test(false); } + @Override public void disconnected(Glacier2.SessionHelper session) { test(false); } + @Override public void connectFailed(Glacier2.SessionHelper session, Throwable exception) { @@ -91,6 +92,7 @@ public class Client extends test.Util.Application } } + @Override public void createdCommunicator(Glacier2.SessionHelper session) { @@ -126,6 +128,7 @@ public class Client extends test.Util.Application _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback() { + @Override public void connected(Glacier2.SessionHelper session) throws Glacier2.SessionNotExistException @@ -137,6 +140,7 @@ public class Client extends test.Util.Application } } + @Override public void disconnected(Glacier2.SessionHelper session) { @@ -147,12 +151,14 @@ public class Client extends test.Util.Application } } + @Override public void connectFailed(Glacier2.SessionHelper session, Throwable ex) { test(false); } + @Override public void createdCommunicator(Glacier2.SessionHelper session) { @@ -264,7 +270,7 @@ public class Client extends test.Util.Application out.print("testing SessionHelper session after destroy... "); try { - Glacier2.SessionPrx session = _session.session(); + _session.session(); test(false); } catch(Glacier2.SessionNotExistException ex) @@ -314,6 +320,7 @@ public class Client extends test.Util.Application _factory = new Glacier2.SessionFactoryHelper(_initData, new Glacier2.SessionCallback() { + @Override public void connected(Glacier2.SessionHelper session) throws Glacier2.SessionNotExistException @@ -321,12 +328,14 @@ public class Client extends test.Util.Application test(false); } + @Override public void disconnected(Glacier2.SessionHelper session) { test(false); } + @Override public void connectFailed(Glacier2.SessionHelper session, Throwable exception) { @@ -348,6 +357,7 @@ public class Client extends test.Util.Application } } + @Override public void createdCommunicator(Glacier2.SessionHelper session) { diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/Ice/adapterDeactivation/AllTests.java index c89910e36a2..05cbc8f3d59 100644 --- a/java/test/Ice/adapterDeactivation/AllTests.java +++ b/java/test/Ice/adapterDeactivation/AllTests.java @@ -9,8 +9,6 @@ package test.Ice.adapterDeactivation; -import java.io.PrintStream; - import test.Ice.adapterDeactivation.Test.TestIntfPrx; import test.Ice.adapterDeactivation.Test.TestIntfPrxHelper; diff --git a/java/test/Ice/ami/AMI.java b/java/test/Ice/ami/AMI.java index 9a067ea6bcc..67c6920d142 100644 --- a/java/test/Ice/ami/AMI.java +++ b/java/test/Ice/ami/AMI.java @@ -14,7 +14,6 @@ import java.io.PrintWriter; import test.Ice.ami.Test.TestIntfPrx; import test.Ice.ami.Test.TestIntfPrxHelper; import test.Ice.ami.Test.TestIntfControllerPrx; -import test.Ice.ami.Test.TestIntfControllerPrxHelper; import test.Ice.ami.Test.TestIntfException; import test.Ice.ami.Test.Callback_TestIntf_op; import test.Ice.ami.Test.Callback_TestIntf_opWithResult; @@ -619,6 +618,7 @@ public class AMI p.begin_ice_isA("::Test::TestIntf", new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -629,6 +629,7 @@ public class AMI p.begin_ice_isA("::Test::TestIntf", ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -639,6 +640,7 @@ public class AMI p.begin_ice_ping(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -648,6 +650,7 @@ public class AMI cb.check(); p.begin_ice_ping(ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -658,6 +661,7 @@ public class AMI p.begin_ice_id(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -667,6 +671,7 @@ public class AMI cb.check(); p.begin_ice_id(ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -677,6 +682,7 @@ public class AMI p.begin_ice_ids(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -686,6 +692,7 @@ public class AMI cb.check(); p.begin_ice_ids(ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -696,6 +703,7 @@ public class AMI p.begin_op(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -705,6 +713,7 @@ public class AMI cb.check(); p.begin_op(ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -715,6 +724,7 @@ public class AMI p.begin_opWithResult(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -724,6 +734,7 @@ public class AMI cb.check(); p.begin_opWithResult(ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -734,6 +745,7 @@ public class AMI p.begin_opWithUE(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -743,6 +755,7 @@ public class AMI cb.check(); p.begin_opWithUE(ctx, new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -761,12 +774,14 @@ public class AMI p.begin_ice_isA("::Test::TestIntf", new Ice.Callback_Object_ice_isA() { + @Override public void response(boolean r) { cb.isA(r); } + @Override public void exception(Ice.LocalException ex) { @@ -776,12 +791,14 @@ public class AMI cb.check(); p.begin_ice_isA("::Test::TestIntf", ctx, new Ice.Callback_Object_ice_isA() { + @Override public void response(boolean r) { cb.isA(r); } + @Override public void exception(Ice.LocalException ex) { @@ -792,12 +809,14 @@ public class AMI p.begin_ice_ping(new Ice.Callback_Object_ice_ping() { + @Override public void response() { cb.ping(); } + @Override public void exception(Ice.LocalException ex) { @@ -807,12 +826,14 @@ public class AMI cb.check(); p.begin_ice_ping(ctx, new Ice.Callback_Object_ice_ping() { + @Override public void response() { cb.ping(); } + @Override public void exception(Ice.LocalException ex) { @@ -823,12 +844,14 @@ public class AMI p.begin_ice_id(new Ice.Callback_Object_ice_id() { + @Override public void response(String id) { cb.id(id); } + @Override public void exception(Ice.LocalException ex) { @@ -838,12 +861,14 @@ public class AMI cb.check(); p.begin_ice_id(ctx, new Ice.Callback_Object_ice_id() { + @Override public void response(String id) { cb.id(id); } + @Override public void exception(Ice.LocalException ex) { @@ -854,12 +879,14 @@ public class AMI p.begin_ice_ids(new Ice.Callback_Object_ice_ids() { + @Override public void response(String[] ids) { cb.ids(ids); } + @Override public void exception(Ice.LocalException ex) { @@ -869,12 +896,14 @@ public class AMI cb.check(); p.begin_ice_ids(ctx, new Ice.Callback_Object_ice_ids() { + @Override public void response(String[] ids) { cb.ids(ids); } + @Override public void exception(Ice.LocalException ex) { @@ -885,12 +914,14 @@ public class AMI p.begin_op(new Callback_TestIntf_op() { + @Override public void response() { cb.op(); } + @Override public void exception(Ice.LocalException ex) { @@ -900,12 +931,14 @@ public class AMI cb.check(); p.begin_op(ctx, new Callback_TestIntf_op() { + @Override public void response() { cb.op(); } + @Override public void exception(Ice.LocalException ex) { @@ -916,12 +949,14 @@ public class AMI p.begin_opWithResult(new Callback_TestIntf_opWithResult() { + @Override public void response(int r) { cb.opWithResult(r); } + @Override public void exception(Ice.LocalException ex) { @@ -931,12 +966,14 @@ public class AMI cb.check(); p.begin_opWithResult(ctx, new Callback_TestIntf_opWithResult() { + @Override public void response(int r) { cb.opWithResult(r); } + @Override public void exception(Ice.LocalException ex) { @@ -947,18 +984,21 @@ public class AMI p.begin_opWithUE(new Callback_TestIntf_opWithUE() { + @Override public void response() { test(false); } + @Override public void exception(Ice.UserException ex) { cb.opWithUE(ex); } + @Override public void exception(Ice.LocalException ex) { @@ -968,18 +1008,21 @@ public class AMI cb.check(); p.begin_opWithUE(ctx, new Callback_TestIntf_opWithUE() { + @Override public void response() { test(false); } + @Override public void exception(Ice.UserException ex) { cb.opWithUE(ex); } + @Override public void exception(Ice.LocalException ex) { @@ -1046,6 +1089,7 @@ public class AMI i.begin_ice_isA("::Test::TestIntf", new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -1056,6 +1100,7 @@ public class AMI i.begin_ice_ping(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -1066,6 +1111,7 @@ public class AMI i.begin_ice_id(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -1076,6 +1122,7 @@ public class AMI i.begin_ice_ids(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -1086,6 +1133,7 @@ public class AMI i.begin_op(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult r) { @@ -1104,12 +1152,14 @@ public class AMI i.begin_ice_isA("::Test::TestIntf", new Ice.Callback_Object_ice_isA() { + @Override public void response(boolean r) { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -1120,12 +1170,14 @@ public class AMI i.begin_ice_ping(new Ice.Callback_Object_ice_ping() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -1136,12 +1188,14 @@ public class AMI i.begin_ice_id(new Ice.Callback_Object_ice_id() { + @Override public void response(String id) { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -1152,12 +1206,14 @@ public class AMI i.begin_ice_ids(new Ice.Callback_Object_ice_ids() { + @Override public void response(String[] ids) { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -1168,12 +1224,14 @@ public class AMI i.begin_op(new Callback_TestIntf_op() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -1191,18 +1249,21 @@ public class AMI p.begin_ice_isA("", new Ice.Callback_Object_ice_isA() { + @Override public void response(boolean r) { cb.isA(r); } + @Override public void exception(Ice.LocalException ex) { cb.ex(ex); } + @Override public void sent(boolean ss) { @@ -1213,18 +1274,21 @@ public class AMI p.begin_ice_ping(new Ice.Callback_Object_ice_ping() { + @Override public void response() { cb.ping(); } + @Override public void exception(Ice.LocalException ex) { cb.ex(ex); } + @Override public void sent(boolean ss) { @@ -1235,18 +1299,21 @@ public class AMI p.begin_ice_id(new Ice.Callback_Object_ice_id() { + @Override public void response(String id) { cb.id(id); } + @Override public void exception(Ice.LocalException ex) { cb.ex(ex); } + @Override public void sent(boolean ss) { @@ -1257,18 +1324,21 @@ public class AMI p.begin_ice_ids(new Ice.Callback_Object_ice_ids() { + @Override public void response(String[] ids) { cb.ids(ids); } + @Override public void exception(Ice.LocalException ex) { cb.ex(ex); } + @Override public void sent(boolean ss) { @@ -1279,18 +1349,21 @@ public class AMI p.begin_op(new Callback_TestIntf_op() { + @Override public void response() { cb.op(); } + @Override public void exception(Ice.LocalException ex) { cb.ex(ex); } + @Override public void sent(boolean ss) { @@ -1301,12 +1374,14 @@ public class AMI p.begin_op(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult result) { cb.opAsync(result); } + @Override public void sent(Ice.AsyncResult result) { @@ -1327,17 +1402,20 @@ public class AMI final SentCallback cb2 = new SentCallback(); r = p.begin_opWithPayload(seq, new Callback_TestIntf_opWithPayload() { + @Override public void response() { } + @Override public void exception(Ice.LocalException ex) { cb2.ex(ex); } + @Override public void sent(boolean ss) { @@ -1426,6 +1504,7 @@ public class AMI p.begin_op(new Ice.Callback() { + @Override public void completed(Ice.AsyncResult result) { @@ -1436,12 +1515,14 @@ public class AMI p.begin_op(new Callback_TestIntf_op() { + @Override public void response() { cb.op(); } + @Override public void exception(Ice.LocalException ex) { @@ -1451,12 +1532,14 @@ public class AMI q.begin_op(new Callback_TestIntf_op() { + @Override public void response() { cb.op(); } + @Override public void exception(Ice.LocalException ex) { @@ -1467,16 +1550,19 @@ public class AMI p.begin_op(new Callback_TestIntf_op() { + @Override public void response() { } + @Override public void exception(Ice.LocalException ex) { } + @Override public void sent(boolean ss) { diff --git a/java/test/Ice/ami/AllTests.java b/java/test/Ice/ami/AllTests.java index 878f946b4a1..8e98a2e7667 100644 --- a/java/test/Ice/ami/AllTests.java +++ b/java/test/Ice/ami/AllTests.java @@ -15,11 +15,6 @@ import test.Ice.ami.Test.TestIntfPrx; import test.Ice.ami.Test.TestIntfPrxHelper; import test.Ice.ami.Test.TestIntfControllerPrx; import test.Ice.ami.Test.TestIntfControllerPrxHelper; -import test.Ice.ami.Test.TestIntfException; -import test.Ice.ami.Test.Callback_TestIntf_op; -import test.Ice.ami.Test.Callback_TestIntf_opWithResult; -import test.Ice.ami.Test.Callback_TestIntf_opWithUE; -import test.Ice.ami.Test.Callback_TestIntf_opWithPayload; import test.Util.Application; public class AllTests diff --git a/java/test/Ice/ami/Client.java b/java/test/Ice/ami/Client.java index 4fb5d0c49a4..e95e0e9bfb6 100644 --- a/java/test/Ice/ami/Client.java +++ b/java/test/Ice/ami/Client.java @@ -11,12 +11,14 @@ package test.Ice.ami; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(this); return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/ami/Collocated.java b/java/test/Ice/ami/Collocated.java index d51620a84f8..765c8944413 100644 --- a/java/test/Ice/ami/Collocated.java +++ b/java/test/Ice/ami/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.ami; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); @@ -25,6 +26,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/ami/Server.java b/java/test/Ice/ami/Server.java index 601cbb71186..c5c732b69de 100644 --- a/java/test/Ice/ami/Server.java +++ b/java/test/Ice/ami/Server.java @@ -11,6 +11,7 @@ package test.Ice.ami; public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -25,6 +26,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/ami/TestControllerI.java b/java/test/Ice/ami/TestControllerI.java index abc4d3ec57d..9eebceb7214 100644 --- a/java/test/Ice/ami/TestControllerI.java +++ b/java/test/Ice/ami/TestControllerI.java @@ -12,12 +12,14 @@ import test.Ice.ami.Test._TestIntfControllerDisp; class TestControllerI extends _TestIntfControllerDisp { + @Override public void holdAdapter(Ice.Current current) { _adapter.hold(); } + @Override public void resumeAdapter(Ice.Current current) { diff --git a/java/test/Ice/ami/TestI.java b/java/test/Ice/ami/TestI.java index 912eac7d919..cc4f2a2040d 100644 --- a/java/test/Ice/ami/TestI.java +++ b/java/test/Ice/ami/TestI.java @@ -18,17 +18,20 @@ public class TestI extends _TestIntfDisp { } + @Override public void op(Ice.Current current) { } + @Override public int opWithResult(Ice.Current current) { return 15; } + @Override public void opWithUE(Ice.Current current) throws TestIntfException @@ -36,11 +39,13 @@ public class TestI extends _TestIntfDisp throw new TestIntfException(); } + @Override public void opWithPayload(byte[] seq, Ice.Current current) { } + @Override public synchronized void opBatch(Ice.Current current) { @@ -48,12 +53,14 @@ public class TestI extends _TestIntfDisp notify(); } + @Override public synchronized int opBatchCount(Ice.Current current) { return _batchCount; } + @Override public synchronized boolean waitForBatch(int count, Ice.Current current) { @@ -72,12 +79,14 @@ public class TestI extends _TestIntfDisp return result; } + @Override public void close(boolean force, Ice.Current current) { current.con.close(force); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/background/Acceptor.java b/java/test/Ice/background/Acceptor.java index 02a33c49506..9c9b43231af 100644 --- a/java/test/Ice/background/Acceptor.java +++ b/java/test/Ice/background/Acceptor.java @@ -11,36 +11,42 @@ package test.Ice.background; class Acceptor implements IceInternal.Acceptor { + @Override public java.nio.channels.ServerSocketChannel fd() { return _acceptor.fd(); } + @Override public void close() { _acceptor.close(); } + @Override public void listen() { _acceptor.listen(); } + @Override public IceInternal.Transceiver accept() { return new Transceiver(_configuration, _acceptor.accept()); } + @Override public String protocol() { return _acceptor.protocol(); } + @Override public String toString() { diff --git a/java/test/Ice/background/AllTests.java b/java/test/Ice/background/AllTests.java index e029f2a8056..ba04e6421b7 100644 --- a/java/test/Ice/background/AllTests.java +++ b/java/test/Ice/background/AllTests.java @@ -8,7 +8,6 @@ // ********************************************************************** package test.Ice.background; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.background.Test.BackgroundControllerPrx; @@ -142,12 +141,6 @@ public class AllTests } } - public void responseAndSent() - { - _sent.check(); - _response.check(); - } - private Callback _response = new Callback(); private Callback _sent = new Callback(); } @@ -223,6 +216,7 @@ public class AllTests start(); } + @Override public void run() { diff --git a/java/test/Ice/background/BackgroundControllerI.java b/java/test/Ice/background/BackgroundControllerI.java index 64cefee73ca..fb1a591e193 100644 --- a/java/test/Ice/background/BackgroundControllerI.java +++ b/java/test/Ice/background/BackgroundControllerI.java @@ -12,12 +12,14 @@ import test.Ice.background.Test._BackgroundControllerDisp; class BackgroundControllerI extends _BackgroundControllerDisp { + @Override synchronized public void pauseCall(String opName, Ice.Current current) { _pausedCalls.add(opName); } + @Override synchronized public void resumeCall(String opName, Ice.Current current) { @@ -41,54 +43,63 @@ class BackgroundControllerI extends _BackgroundControllerDisp } } + @Override public void holdAdapter(Ice.Current current) { _adapter.hold(); } + @Override public void resumeAdapter(Ice.Current current) { _adapter.activate(); } + @Override public void initializeSocketStatus(int status, Ice.Current current) { _configuration.initializeSocketStatus(status); } + @Override public void initializeException(boolean enable, Ice.Current current) { _configuration.initializeException(enable ? new Ice.SocketException() : null); } + @Override public void readReady(boolean enable, Ice.Current current) { _configuration.readReady(enable); } + @Override public void readException(boolean enable, Ice.Current current) { _configuration.readException(enable ? new Ice.SocketException() : null); } + @Override public void writeReady(boolean enable, Ice.Current current) { _configuration.writeReady(enable); } + @Override public void writeException(boolean enable, Ice.Current current) { _configuration.writeException(enable ? new Ice.SocketException() : null); } + @Override public void buffered(boolean enable, Ice.Current current) { diff --git a/java/test/Ice/background/BackgroundI.java b/java/test/Ice/background/BackgroundI.java index e6e8b70add2..57adf958ca5 100644 --- a/java/test/Ice/background/BackgroundI.java +++ b/java/test/Ice/background/BackgroundI.java @@ -12,18 +12,21 @@ import test.Ice.background.Test._BackgroundDisp; class BackgroundI extends _BackgroundDisp { + @Override public void op(Ice.Current current) { _controller.checkCallPause(current); } + @Override public void opWithPayload(byte[] seq, Ice.Current current) { _controller.checkCallPause(current); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/background/Client.java b/java/test/Ice/background/Client.java index fd7df429b42..1955472ebab 100644 --- a/java/test/Ice/background/Client.java +++ b/java/test/Ice/background/Client.java @@ -13,6 +13,7 @@ import test.Ice.background.Test.BackgroundPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { @@ -26,6 +27,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/background/Collocated.java b/java/test/Ice/background/Collocated.java index 0c468a0d65c..ac3e4622f17 100644 --- a/java/test/Ice/background/Collocated.java +++ b/java/test/Ice/background/Collocated.java @@ -20,6 +20,7 @@ public class Collocated final Server server = new Server(); Thread t = new Thread(new Runnable() { + @Override public void run() { String[] args = @@ -35,10 +36,12 @@ public class Collocated }; server.setServerReadyListener(new test.Util.Application.ServerReadyListener() { + @Override public void serverReady() { _clientThread = new Thread(new Runnable() { + @Override public void run() { String[] args = diff --git a/java/test/Ice/background/Connector.java b/java/test/Ice/background/Connector.java index 22e5d9e7edb..afc3db49abe 100644 --- a/java/test/Ice/background/Connector.java +++ b/java/test/Ice/background/Connector.java @@ -10,6 +10,7 @@ package test.Ice.background; final class Connector implements IceInternal.Connector { + @Override public IceInternal.Transceiver connect() { @@ -17,18 +18,21 @@ final class Connector implements IceInternal.Connector return new Transceiver(_configuration, _connector.connect()); } + @Override public short type() { return (short)(EndpointI.TYPE_BASE + _connector.type()); } + @Override public String toString() { return _connector.toString(); } + @Override public int hashCode() { @@ -44,6 +48,7 @@ final class Connector implements IceInternal.Connector _connector = connector; } + @Override public boolean equals(java.lang.Object obj) { diff --git a/java/test/Ice/background/EndpointFactory.java b/java/test/Ice/background/EndpointFactory.java index 55aba553082..09a8f35290b 100644 --- a/java/test/Ice/background/EndpointFactory.java +++ b/java/test/Ice/background/EndpointFactory.java @@ -16,24 +16,28 @@ final class EndpointFactory implements IceInternal.EndpointFactory _factory = factory; } + @Override public short type() { return (short)(EndpointI.TYPE_BASE + _factory.type()); } + @Override public String protocol() { return "test-" + _factory.protocol(); } + @Override public IceInternal.EndpointI create(java.util.ArrayList<String> args, boolean server) { return new EndpointI(_configuration, _factory.create(args, server)); } + @Override public IceInternal.EndpointI read(IceInternal.BasicStream s) { @@ -46,11 +50,13 @@ final class EndpointFactory implements IceInternal.EndpointFactory return endpoint; } + @Override public void destroy() { } + @Override public IceInternal.EndpointFactory clone(IceInternal.ProtocolInstance instance) { diff --git a/java/test/Ice/background/EndpointI.java b/java/test/Ice/background/EndpointI.java index d364e0b32a8..c670ed30feb 100644 --- a/java/test/Ice/background/EndpointI.java +++ b/java/test/Ice/background/EndpointI.java @@ -19,18 +19,21 @@ final class EndpointI extends IceInternal.EndpointI _configuration = configuration; } + @Override public String _toString() { return "test-" + _endpoint.toString(); } + @Override public Ice.EndpointInfo getInfo() { return _endpoint.getInfo(); } + @Override public void streamWrite(IceInternal.BasicStream s) { @@ -40,24 +43,28 @@ final class EndpointI extends IceInternal.EndpointI s.endWriteEncaps(); } + @Override public short type() { return (short)(TYPE_BASE + _endpoint.type()); } + @Override public String protocol() { return _endpoint.protocol(); } + @Override public int timeout() { return _endpoint.timeout(); } + @Override public IceInternal.EndpointI timeout(int timeout) { @@ -72,12 +79,14 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public String connectionId() { return _endpoint.connectionId(); } + @Override public IceInternal.EndpointI connectionId(String connectionId) { @@ -92,12 +101,14 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public boolean compress() { return _endpoint.compress(); } + @Override public IceInternal.EndpointI compress(boolean compress) { @@ -112,18 +123,21 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public boolean datagram() { return _endpoint.datagram(); } + @Override public boolean secure() { return _endpoint.secure(); } + @Override public IceInternal.Transceiver transceiver(IceInternal.EndpointIHolder endpoint) { @@ -147,6 +161,7 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public java.util.List<IceInternal.Connector> connectors(Ice.EndpointSelectionType selType) { @@ -159,11 +174,13 @@ final class EndpointI extends IceInternal.EndpointI return connectors; } + @Override public void connectors_async(Ice.EndpointSelectionType selType, final IceInternal.EndpointI_connectors cb) { class Callback implements IceInternal.EndpointI_connectors { + @Override public void connectors(java.util.List<IceInternal.Connector> cons) { @@ -175,6 +192,7 @@ final class EndpointI extends IceInternal.EndpointI cb.connectors(connectors); } + @Override public void exception(Ice.LocalException exception) { @@ -193,6 +211,7 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public IceInternal.Acceptor acceptor(IceInternal.EndpointIHolder endpoint, String adapterName) { @@ -201,6 +220,7 @@ final class EndpointI extends IceInternal.EndpointI return p; } + @Override public java.util.List<IceInternal.EndpointI> expand() { @@ -212,6 +232,7 @@ final class EndpointI extends IceInternal.EndpointI return endps; } + @Override public boolean equivalent(IceInternal.EndpointI endpoint) { @@ -227,12 +248,14 @@ final class EndpointI extends IceInternal.EndpointI return testEndpoint._endpoint.equivalent(_endpoint); } + @Override public String options() { return _endpoint.options(); } + @Override public int hashCode() { @@ -242,6 +265,7 @@ final class EndpointI extends IceInternal.EndpointI // // Compare endpoints for sorting purposes // + @Override public boolean equals(java.lang.Object obj) { @@ -256,6 +280,7 @@ final class EndpointI extends IceInternal.EndpointI } } + @Override public int compareTo(IceInternal.EndpointI obj) // From java.lang.Comparable { diff --git a/java/test/Ice/background/PluginFactory.java b/java/test/Ice/background/PluginFactory.java index 9d39830bc0f..9edd6c8fa38 100644 --- a/java/test/Ice/background/PluginFactory.java +++ b/java/test/Ice/background/PluginFactory.java @@ -19,6 +19,7 @@ public class PluginFactory implements Ice.PluginFactory _communicator = communicator; } + @Override public void initialize() { @@ -34,6 +35,7 @@ public class PluginFactory implements Ice.PluginFactory } } + @Override public void destroy() { @@ -49,6 +51,7 @@ public class PluginFactory implements Ice.PluginFactory private Configuration _configuration; } + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { diff --git a/java/test/Ice/background/Server.java b/java/test/Ice/background/Server.java index d9b3ddad18a..52aaf1f1f49 100644 --- a/java/test/Ice/background/Server.java +++ b/java/test/Ice/background/Server.java @@ -14,6 +14,7 @@ public class Server extends test.Util.Application { static public class LocatorI extends Ice._LocatorDisp { + @Override public void findAdapterById_async(Ice.AMD_Locator_findAdapterById response, String adapter, Ice.Current current) throws Ice.AdapterNotFoundException @@ -23,6 +24,7 @@ public class Server extends test.Util.Application response.ice_response(current.adapter.createDirectProxy(communicator.stringToIdentity("dummy"))); } + @Override public void findObjectById_async(Ice.AMD_Locator_findObjectById response, Ice.Identity id, Ice.Current current) throws Ice.ObjectNotFoundException @@ -31,6 +33,7 @@ public class Server extends test.Util.Application response.ice_response(current.adapter.createDirectProxy(id)); } + @Override public Ice.LocatorRegistryPrx getRegistry(Ice.Current current) { @@ -47,6 +50,7 @@ public class Server extends test.Util.Application static public class RouterI extends Ice._RouterDisp { + @Override public Ice.ObjectPrx getClientProxy(Ice.Current current) { @@ -54,6 +58,7 @@ public class Server extends test.Util.Application return null; } + @Override public Ice.ObjectPrx getServerProxy(Ice.Current current) { @@ -64,11 +69,14 @@ public class Server extends test.Util.Application /** * @deprecated addProxy() is deprecated, use addProxies() instead. **/ + @Deprecated + @Override public void addProxy(Ice.ObjectPrx proxy, Ice.Current current) { } + @Override public Ice.ObjectPrx[] addProxies(Ice.ObjectPrx[] proxies, Ice.Current current) { @@ -83,6 +91,7 @@ public class Server extends test.Util.Application final private BackgroundControllerI _controller; } + @Override public int run(String[] args) { @@ -107,6 +116,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/background/Transceiver.java b/java/test/Ice/background/Transceiver.java index cc176b6a80b..81359113c41 100644 --- a/java/test/Ice/background/Transceiver.java +++ b/java/test/Ice/background/Transceiver.java @@ -11,12 +11,14 @@ package test.Ice.background; final class Transceiver implements IceInternal.Transceiver { + @Override public java.nio.channels.SelectableChannel fd() { return _transceiver.fd(); } + @Override public int initialize(IceInternal.Buffer readBuffer, IceInternal.Buffer writeBuffer, Ice.Holder<Boolean> moreData) { @@ -56,18 +58,21 @@ final class Transceiver implements IceInternal.Transceiver return IceInternal.SocketOperation.None; } + @Override public int closing(boolean initiator, Ice.LocalException ex) { return _transceiver.closing(initiator, ex); } + @Override public void close() { _transceiver.close(); } + @Override public int write(IceInternal.Buffer buf) { @@ -80,6 +85,7 @@ final class Transceiver implements IceInternal.Transceiver return _transceiver.write(buf); } + @Override public int read(IceInternal.Buffer buf, Ice.Holder<Boolean> moreData) { @@ -131,24 +137,28 @@ final class Transceiver implements IceInternal.Transceiver } } + @Override public String protocol() { return "test-" + _transceiver.protocol(); } + @Override public String toString() { return _transceiver.toString(); } + @Override public Ice.ConnectionInfo getInfo() { return _transceiver.getInfo(); } + @Override public void checkSendSize(IceInternal.Buffer buf, int messageSizeMax) { diff --git a/java/test/Ice/binding/AllTests.java b/java/test/Ice/binding/AllTests.java index 006f118460e..88aa196b157 100644 --- a/java/test/Ice/binding/AllTests.java +++ b/java/test/Ice/binding/AllTests.java @@ -16,7 +16,6 @@ import test.Ice.binding.Test.RemoteCommunicatorPrxHelper; import test.Ice.binding.Test.RemoteObjectAdapterPrx; import test.Ice.binding.Test.TestIntfPrx; import test.Ice.binding.Test.TestIntfPrxHelper; -import test.Ice.binding.Test.Callback_TestIntf_getAdapterName; public class AllTests { @@ -31,6 +30,7 @@ public class AllTests static class GetAdapterNameCB extends Ice.Callback { + @Override synchronized public void completed(Ice.AsyncResult result) { @@ -84,7 +84,7 @@ public class AllTests endpoints.addAll(java.util.Arrays.asList(edpts)); } return TestIntfPrxHelper.uncheckedCast( - test.ice_endpoints((Ice.Endpoint[])endpoints.toArray(new Ice.Endpoint[endpoints.size()]))); + test.ice_endpoints(endpoints.toArray(new Ice.Endpoint[endpoints.size()]))); } private static void diff --git a/java/test/Ice/binding/Client.java b/java/test/Ice/binding/Client.java index 4a12d29f628..30d087baac3 100644 --- a/java/test/Ice/binding/Client.java +++ b/java/test/Ice/binding/Client.java @@ -11,12 +11,14 @@ package test.Ice.binding; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(communicator(), getWriter()); return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/binding/RemoteCommunicatorI.java b/java/test/Ice/binding/RemoteCommunicatorI.java index 8eccc8449ee..fbebb72cd59 100644 --- a/java/test/Ice/binding/RemoteCommunicatorI.java +++ b/java/test/Ice/binding/RemoteCommunicatorI.java @@ -13,6 +13,7 @@ import test.Ice.binding.Test._RemoteCommunicatorDisp; public class RemoteCommunicatorI extends _RemoteCommunicatorDisp { + @Override public RemoteObjectAdapterPrx createObjectAdapter(String name, String endpts, Ice.Current current) { @@ -30,12 +31,14 @@ public class RemoteCommunicatorI extends _RemoteCommunicatorDisp current.adapter.addWithUUID(new RemoteObjectAdapterI(adapter))); } + @Override public void deactivateObjectAdapter(RemoteObjectAdapterPrx adapter, Ice.Current current) { adapter.deactivate(); // Collocated call. } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/binding/RemoteObjectAdapterI.java b/java/test/Ice/binding/RemoteObjectAdapterI.java index 2a2aae7a56d..a8b22ec5197 100644 --- a/java/test/Ice/binding/RemoteObjectAdapterI.java +++ b/java/test/Ice/binding/RemoteObjectAdapterI.java @@ -24,12 +24,14 @@ public class RemoteObjectAdapterI extends _RemoteObjectAdapterDisp _adapter.activate(); } + @Override public TestIntfPrx getTestIntf(Ice.Current current) { return _testIntf; } + @Override public void deactivate(Ice.Current current) { diff --git a/java/test/Ice/binding/Server.java b/java/test/Ice/binding/Server.java index 1aa01bc58da..9c2926cdc3b 100644 --- a/java/test/Ice/binding/Server.java +++ b/java/test/Ice/binding/Server.java @@ -11,6 +11,7 @@ package test.Ice.binding; public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -23,6 +24,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/binding/TestI.java b/java/test/Ice/binding/TestI.java index 40556d06761..23a13b96ff8 100644 --- a/java/test/Ice/binding/TestI.java +++ b/java/test/Ice/binding/TestI.java @@ -16,6 +16,7 @@ public class TestI extends _TestIntfDisp { } + @Override public String getAdapterName(Ice.Current current) { diff --git a/java/test/Ice/checksum/AllTests.java b/java/test/Ice/checksum/AllTests.java index 221381e51d8..3fb2c711746 100644 --- a/java/test/Ice/checksum/AllTests.java +++ b/java/test/Ice/checksum/AllTests.java @@ -73,7 +73,7 @@ public class AllTests } } - String value = (String)SliceChecksums.checksums.get(key); + String value = SliceChecksums.checksums.get(key); test(value != null); if(n <= 1) diff --git a/java/test/Ice/checksum/ChecksumI.java b/java/test/Ice/checksum/ChecksumI.java index cd591fe4e69..a85707f400e 100644 --- a/java/test/Ice/checksum/ChecksumI.java +++ b/java/test/Ice/checksum/ChecksumI.java @@ -18,12 +18,14 @@ public final class ChecksumI extends _ChecksumDisp { } + @Override public java.util.Map<String, String> getSliceChecksums(Ice.Current current) { return SliceChecksums.checksums; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/checksum/Client.java b/java/test/Ice/checksum/Client.java index d4d1db9549b..34d4f3ab1b8 100644 --- a/java/test/Ice/checksum/Client.java +++ b/java/test/Ice/checksum/Client.java @@ -13,6 +13,7 @@ import test.Ice.checksum.Test.ChecksumPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { @@ -23,6 +24,7 @@ public class Client extends test.Util.Application } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/checksum/Server.java b/java/test/Ice/checksum/Server.java index b0e76a1ed44..c64042283e4 100644 --- a/java/test/Ice/checksum/Server.java +++ b/java/test/Ice/checksum/Server.java @@ -11,6 +11,7 @@ package test.Ice.checksum; public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -23,6 +24,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/classLoader/AbstractClassI.java b/java/test/Ice/classLoader/AbstractClassI.java index db3b9b347f3..df7bcf8a4c4 100644 --- a/java/test/Ice/classLoader/AbstractClassI.java +++ b/java/test/Ice/classLoader/AbstractClassI.java @@ -13,6 +13,7 @@ import test.Ice.classLoader.Test.AbstractClass; class AbstractClassI extends AbstractClass { + @Override public void op(Ice.Current current) { diff --git a/java/test/Ice/classLoader/AllTests.java b/java/test/Ice/classLoader/AllTests.java index f5d127be9c2..d0181cff1a6 100644 --- a/java/test/Ice/classLoader/AllTests.java +++ b/java/test/Ice/classLoader/AllTests.java @@ -22,6 +22,7 @@ public class AllTests { private static class MyObjectFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { if(type.equals("::Test::AbstractClass")) @@ -33,6 +34,7 @@ public class AllTests return null; } + @Override public void destroy() { // Nothing to do @@ -41,6 +43,7 @@ public class AllTests private static class MyClassLoader extends ClassLoader { + @Override protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { diff --git a/java/test/Ice/classLoader/CertificateVerifierI.java b/java/test/Ice/classLoader/CertificateVerifierI.java index ada4f00e86b..3e681297f84 100644 --- a/java/test/Ice/classLoader/CertificateVerifierI.java +++ b/java/test/Ice/classLoader/CertificateVerifierI.java @@ -11,6 +11,7 @@ package test.Ice.classLoader; public class CertificateVerifierI implements IceSSL.CertificateVerifier { + @Override public boolean verify(IceSSL.NativeConnectionInfo info) { return true; diff --git a/java/test/Ice/classLoader/Client.java b/java/test/Ice/classLoader/Client.java index 33384192655..20152d6b598 100644 --- a/java/test/Ice/classLoader/Client.java +++ b/java/test/Ice/classLoader/Client.java @@ -11,12 +11,14 @@ package test.Ice.classLoader; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(this, false); return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { _initData = new Ice.InitializationData(); diff --git a/java/test/Ice/classLoader/InitialI.java b/java/test/Ice/classLoader/InitialI.java index d8e2ddf44d8..a8056715aad 100644 --- a/java/test/Ice/classLoader/InitialI.java +++ b/java/test/Ice/classLoader/InitialI.java @@ -22,18 +22,21 @@ public final class InitialI extends _InitialDisp _adapter = adapter; } + @Override public ConcreteClass getConcreteClass(Ice.Current current) { return new ConcreteClass(); } + @Override public AbstractClass getAbstractClass(Ice.Current current) { return new AbstractClassI(); } + @Override public void throwException(Ice.Current current) throws E @@ -41,6 +44,7 @@ public final class InitialI extends _InitialDisp throw new E(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/classLoader/PasswordCallbackI.java b/java/test/Ice/classLoader/PasswordCallbackI.java index 2312fb390a9..e5eba1462dd 100644 --- a/java/test/Ice/classLoader/PasswordCallbackI.java +++ b/java/test/Ice/classLoader/PasswordCallbackI.java @@ -11,16 +11,19 @@ package test.Ice.classLoader; public class PasswordCallbackI implements IceSSL.PasswordCallback { + @Override public char[] getPassword(String alias) { return "password".toCharArray(); } + @Override public char[] getTruststorePassword() { return "password".toCharArray(); } + @Override public char[] getKeystorePassword() { return "password".toCharArray(); diff --git a/java/test/Ice/classLoader/PluginFactoryI.java b/java/test/Ice/classLoader/PluginFactoryI.java index 6f672614ca5..2416e04c420 100644 --- a/java/test/Ice/classLoader/PluginFactoryI.java +++ b/java/test/Ice/classLoader/PluginFactoryI.java @@ -13,15 +13,18 @@ public class PluginFactoryI implements Ice.PluginFactory { static class PluginI implements Ice.Plugin { + @Override public void initialize() { } + @Override public void destroy() { } } + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginI(); diff --git a/java/test/Ice/classLoader/Server.java b/java/test/Ice/classLoader/Server.java index e8499a15f86..79abca86364 100644 --- a/java/test/Ice/classLoader/Server.java +++ b/java/test/Ice/classLoader/Server.java @@ -11,6 +11,7 @@ package test.Ice.classLoader; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -22,6 +23,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/custom/Client.java b/java/test/Ice/custom/Client.java index a3159d17c77..da5808ca6a5 100644 --- a/java/test/Ice/custom/Client.java +++ b/java/test/Ice/custom/Client.java @@ -13,6 +13,7 @@ import test.Ice.custom.Test.TestIntfPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/custom/Collocated.java b/java/test/Ice/custom/Collocated.java index 0d130a24321..a770a6af49b 100644 --- a/java/test/Ice/custom/Collocated.java +++ b/java/test/Ice/custom/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.custom; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -23,6 +24,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/custom/Server.java b/java/test/Ice/custom/Server.java index 2c6060c24aa..f7e76de4050 100644 --- a/java/test/Ice/custom/Server.java +++ b/java/test/Ice/custom/Server.java @@ -11,6 +11,7 @@ package test.Ice.custom; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -23,6 +24,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/custom/TestI.java b/java/test/Ice/custom/TestI.java index c3f3d47e85f..5392561c044 100644 --- a/java/test/Ice/custom/TestI.java +++ b/java/test/Ice/custom/TestI.java @@ -42,6 +42,7 @@ public final class TestI extends TestIntf _communicator = communicator; } + @Override public List<C> opCArray(List<C> inSeq, CArrayHolder outSeq, Ice.Current current) { @@ -49,6 +50,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<C> opCList(List<C> inSeq, CListHolder outSeq, Ice.Current current) { @@ -56,6 +58,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public C[] opCSeq(C[] inSeq, CSeqHolder outSeq, Ice.Current current) { @@ -65,6 +68,7 @@ public final class TestI extends TestIntf return outSeq.value; } + @Override public List<Boolean> opBoolSeq(List<Boolean> inSeq, BoolSeqHolder outSeq, Ice.Current current) { @@ -72,6 +76,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Byte> opByteSeq(List<Byte> inSeq, ByteSeqHolder outSeq, Ice.Current current) { @@ -79,6 +84,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Map<Integer,String>> opDSeq(List<Map<Integer,String>> inSeq, DSeqHolder outSeq, Ice.Current current) { @@ -86,6 +92,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Double> opDoubleSeq(List<Double> inSeq, DoubleSeqHolder outSeq, Ice.Current current) { @@ -93,6 +100,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<E> opESeq(List<E> inSeq, ESeqHolder outSeq, Ice.Current current) { @@ -100,6 +108,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Float> opFloatSeq(List<Float> inSeq, FloatSeqHolder outSeq, Ice.Current current) { @@ -107,6 +116,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Integer> opIntSeq(List<Integer> inSeq, IntSeqHolder outSeq, Ice.Current current) { @@ -114,6 +124,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Long> opLongSeq(List<Long> inSeq, LongSeqHolder outSeq, Ice.Current current) { @@ -121,6 +132,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<S> opSSeq(List<S> inSeq, SSeqHolder outSeq, Ice.Current current) { @@ -128,6 +140,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<Short> opShortSeq(List<Short> inSeq, ShortSeqHolder outSeq, Ice.Current current) { @@ -135,6 +148,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<String> opStringSeq(List<String> inSeq, StringSeqHolder outSeq, Ice.Current current) { @@ -142,6 +156,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public List<List<String>> opStringSeqSeq(List<List<String>> inSeq, StringSeqSeqHolder outSeq, Ice.Current current) { @@ -149,6 +164,7 @@ public final class TestI extends TestIntf return inSeq; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/defaultServant/AllTests.java b/java/test/Ice/defaultServant/AllTests.java index e68a38e42c7..50589050baf 100644 --- a/java/test/Ice/defaultServant/AllTests.java +++ b/java/test/Ice/defaultServant/AllTests.java @@ -30,7 +30,7 @@ public class AllTests Ice.ObjectAdapter oa = communicator.createObjectAdapterWithEndpoints("MyOA", "tcp -h localhost"); oa.activate(); - Ice.Object servant = (Ice.Object)new MyObjectI(); + Ice.Object servant = new MyObjectI(); // // Register default servant with category "foo" diff --git a/java/test/Ice/defaultServant/Client.java b/java/test/Ice/defaultServant/Client.java index f1c01ea801b..4f9b3be9ec4 100644 --- a/java/test/Ice/defaultServant/Client.java +++ b/java/test/Ice/defaultServant/Client.java @@ -11,6 +11,7 @@ package test.Ice.defaultServant; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(this, getWriter()); diff --git a/java/test/Ice/defaultServant/MyObjectI.java b/java/test/Ice/defaultServant/MyObjectI.java index c9a0cef7e93..64d4548f920 100644 --- a/java/test/Ice/defaultServant/MyObjectI.java +++ b/java/test/Ice/defaultServant/MyObjectI.java @@ -12,6 +12,7 @@ import test.Ice.defaultServant.Test.*; public final class MyObjectI extends _MyObjectDisp { + @Override public void ice_ping(Ice.Current current) { @@ -27,6 +28,7 @@ public final class MyObjectI extends _MyObjectDisp } } + @Override public String getName(Ice.Current current) { diff --git a/java/test/Ice/defaultValue/Client.java b/java/test/Ice/defaultValue/Client.java index 8f08a585eeb..78685aa1939 100644 --- a/java/test/Ice/defaultValue/Client.java +++ b/java/test/Ice/defaultValue/Client.java @@ -11,6 +11,7 @@ package test.Ice.defaultValue; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(this, getWriter()); diff --git a/java/test/Ice/dispatcher/AllTests.java b/java/test/Ice/dispatcher/AllTests.java index 843b93d70b4..e1badc24a9a 100644 --- a/java/test/Ice/dispatcher/AllTests.java +++ b/java/test/Ice/dispatcher/AllTests.java @@ -91,6 +91,7 @@ public class AllTests OpCallback cb = new OpCallback() { + @Override public void response() { @@ -98,6 +99,7 @@ public class AllTests called(); } + @Override public void exception(Ice.LocalException ex) { @@ -111,12 +113,14 @@ public class AllTests TestIntfPrx i = (TestIntfPrx)p.ice_adapterId("dummy"); cb = new OpCallback() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -135,12 +139,14 @@ public class AllTests TestIntfPrx to = TestIntfPrxHelper.uncheckedCast(p.ice_invocationTimeout(250)); class Callback_TestIntf_sleepImpl extends Callback_TestIntf_sleep { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { @@ -149,6 +155,7 @@ public class AllTests called(); } + @Override public void sent(boolean sentSynchronously) { @@ -186,18 +193,21 @@ public class AllTests testController.holdAdapter(); Callback_TestIntf_opWithPayload callback = new Callback_TestIntf_opWithPayload() { + @Override public void response() { test(dispatcher.isDispatcherThread()); } + @Override public void exception(Ice.LocalException ex) { test(ex instanceof Ice.CommunicatorDestroyedException); } + @Override public void sent(boolean sentSynchronously) { diff --git a/java/test/Ice/dispatcher/Client.java b/java/test/Ice/dispatcher/Client.java index 483eb703906..9b490d763c1 100644 --- a/java/test/Ice/dispatcher/Client.java +++ b/java/test/Ice/dispatcher/Client.java @@ -11,12 +11,14 @@ package test.Ice.dispatcher; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(communicator(), getWriter(), _dispatcher); return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { assert(_dispatcher == null); diff --git a/java/test/Ice/dispatcher/Collocated.java b/java/test/Ice/dispatcher/Collocated.java index 6a856c75375..453311a3584 100644 --- a/java/test/Ice/dispatcher/Collocated.java +++ b/java/test/Ice/dispatcher/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.dispatcher; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); @@ -26,6 +27,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { assert(_dispatcher == null); diff --git a/java/test/Ice/dispatcher/Dispatcher.java b/java/test/Ice/dispatcher/Dispatcher.java index fef7a4a1e38..2ee5dbb6f4d 100644 --- a/java/test/Ice/dispatcher/Dispatcher.java +++ b/java/test/Ice/dispatcher/Dispatcher.java @@ -26,6 +26,7 @@ public class Dispatcher implements Runnable, Ice.Dispatcher _thread.start(); } + @Override public void run() { @@ -71,6 +72,7 @@ public class Dispatcher implements Runnable, Ice.Dispatcher } } + @Override synchronized public void dispatch(Runnable call, Ice.Connection con) { diff --git a/java/test/Ice/dispatcher/Server.java b/java/test/Ice/dispatcher/Server.java index 408da37a650..c4ef87e7451 100644 --- a/java/test/Ice/dispatcher/Server.java +++ b/java/test/Ice/dispatcher/Server.java @@ -11,11 +11,10 @@ package test.Ice.dispatcher; public class Server extends test.Util.Application { + @Override public int run(String[] args) { - Ice.Communicator communicator = communicator(); - Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter"); @@ -28,6 +27,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { assert(_dispatcher == null); diff --git a/java/test/Ice/dispatcher/TestControllerI.java b/java/test/Ice/dispatcher/TestControllerI.java index 03b0ae23424..cd24a7982b3 100644 --- a/java/test/Ice/dispatcher/TestControllerI.java +++ b/java/test/Ice/dispatcher/TestControllerI.java @@ -13,12 +13,14 @@ import test.Ice.dispatcher.Test._TestIntfControllerDisp; class TestControllerI extends _TestIntfControllerDisp { + @Override public void holdAdapter(Ice.Current current) { _adapter.hold(); } + @Override public void resumeAdapter(Ice.Current current) { diff --git a/java/test/Ice/dispatcher/TestI.java b/java/test/Ice/dispatcher/TestI.java index a3e0e717e88..93dd8513ecc 100644 --- a/java/test/Ice/dispatcher/TestI.java +++ b/java/test/Ice/dispatcher/TestI.java @@ -27,30 +27,35 @@ public class TestI extends _TestIntfDisp _dispatcher = dispatcher; } + @Override public void op(Ice.Current current) { test(_dispatcher.isDispatcherThread()); } + @Override public void sleep(int to, Ice.Current current) { try { - Thread.currentThread().sleep(to); + Thread.currentThread(); + Thread.sleep(to); } catch(InterruptedException ex) { } } + @Override public void opWithPayload(byte[] seq, Ice.Current current) { test(_dispatcher.isDispatcherThread()); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/echo/BlobjectI.java b/java/test/Ice/echo/BlobjectI.java index 3704dcddff1..946284608c1 100644 --- a/java/test/Ice/echo/BlobjectI.java +++ b/java/test/Ice/echo/BlobjectI.java @@ -19,16 +19,19 @@ public class BlobjectI extends Ice.BlobjectAsync _twoway = twoway; } + @Override public void response(boolean ok, byte[] encaps) { _cb.ice_response(ok, encaps); } + @Override public void exception(Ice.LocalException ex) { _cb.ice_exception(ex); } + @Override public void sent(boolean sync) { if(!_twoway) @@ -54,6 +57,7 @@ public class BlobjectI extends Ice.BlobjectAsync _batchProxy = null; } + @Override public void ice_invoke_async(Ice.AMD_Object_ice_invoke amdCb, byte[] inEncaps, Ice.Current current) { diff --git a/java/test/Ice/echo/Server.java b/java/test/Ice/echo/Server.java index 4ba0968d47f..88daf466e01 100644 --- a/java/test/Ice/echo/Server.java +++ b/java/test/Ice/echo/Server.java @@ -18,16 +18,19 @@ public class Server extends test.Util.Application _blob = blob; } + @Override public void startBatch(Ice.Current current) { _blob.startBatch(); } + @Override public void flushBatch(Ice.Current current) { _blob.flushBatch(); } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); @@ -36,6 +39,7 @@ public class Server extends test.Util.Application final private BlobjectI _blob; }; + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); @@ -47,6 +51,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/enums/Client.java b/java/test/Ice/enums/Client.java index ef746a09ee3..f27ee458960 100644 --- a/java/test/Ice/enums/Client.java +++ b/java/test/Ice/enums/Client.java @@ -13,6 +13,7 @@ import test.Ice.enums.Test.TestIntfPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/enums/Server.java b/java/test/Ice/enums/Server.java index 113a5c591f5..24ef6d00730 100644 --- a/java/test/Ice/enums/Server.java +++ b/java/test/Ice/enums/Server.java @@ -11,6 +11,7 @@ package test.Ice.enums; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -23,6 +24,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/enums/TestIntfI.java b/java/test/Ice/enums/TestIntfI.java index d8f05a5ffcd..cbb511e7edd 100644 --- a/java/test/Ice/enums/TestIntfI.java +++ b/java/test/Ice/enums/TestIntfI.java @@ -13,6 +13,7 @@ import test.Ice.enums.Test.*; public final class TestIntfI extends _TestIntfDisp { + @Override public ByteEnum opByte(ByteEnum b1, ByteEnumHolder b2, Ice.Current current) { @@ -20,6 +21,7 @@ public final class TestIntfI extends _TestIntfDisp return b1; } + @Override public ShortEnum opShort(ShortEnum s1, ShortEnumHolder s2, Ice.Current current) { @@ -27,6 +29,7 @@ public final class TestIntfI extends _TestIntfDisp return s1; } + @Override public IntEnum opInt(IntEnum i1, IntEnumHolder i2, Ice.Current current) { @@ -34,6 +37,7 @@ public final class TestIntfI extends _TestIntfDisp return i1; } + @Override public SimpleEnum opSimple(SimpleEnum s1, SimpleEnumHolder s2, Ice.Current current) { @@ -41,6 +45,7 @@ public final class TestIntfI extends _TestIntfDisp return s1; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/exceptions/AMDServer.java b/java/test/Ice/exceptions/AMDServer.java index 10a4375ea9e..a4502cf0080 100644 --- a/java/test/Ice/exceptions/AMDServer.java +++ b/java/test/Ice/exceptions/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.exceptions; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/exceptions/AMDThrowerI.java b/java/test/Ice/exceptions/AMDThrowerI.java index 58a6d626918..bd1013bd589 100644 --- a/java/test/Ice/exceptions/AMDThrowerI.java +++ b/java/test/Ice/exceptions/AMDThrowerI.java @@ -42,6 +42,7 @@ public final class AMDThrowerI extends _ThrowerDisp { } + @Override public void shutdown_async(AMD_Thrower_shutdown cb, Ice.Current current) { @@ -49,18 +50,21 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_response(); } + @Override public void supportsUndeclaredExceptions_async(AMD_Thrower_supportsUndeclaredExceptions cb, Ice.Current current) { cb.ice_response(true); } + @Override public void supportsAssertException_async(AMD_Thrower_supportsAssertException cb, Ice.Current current) { cb.ice_response(true); } + @Override public void throwAasA_async(AMD_Thrower_throwAasA cb, int a, Ice.Current current) throws A @@ -70,6 +74,7 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwAorDasAorD_async(AMD_Thrower_throwAorDasAorD cb, int a, Ice.Current current) throws A, @@ -89,6 +94,7 @@ public final class AMDThrowerI extends _ThrowerDisp } } + @Override public void throwBasA_async(AMD_Thrower_throwBasA cb, int a, int b, Ice.Current current) throws A @@ -100,6 +106,7 @@ public final class AMDThrowerI extends _ThrowerDisp //cb.ice_exception(ex); } + @Override public void throwBasB_async(AMD_Thrower_throwBasB cb, int a, int b, Ice.Current current) throws B @@ -111,6 +118,7 @@ public final class AMDThrowerI extends _ThrowerDisp //cb.ice_exception(ex); } + @Override public void throwCasA_async(AMD_Thrower_throwCasA cb, int a, int b, int c, Ice.Current current) throws A @@ -122,6 +130,7 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwCasB_async(AMD_Thrower_throwCasB cb, int a, int b, int c, Ice.Current current) throws B @@ -133,6 +142,7 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwCasC_async(AMD_Thrower_throwCasC cb, int a, int b, int c, Ice.Current current) throws C @@ -144,6 +154,7 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwUndeclaredA_async(AMD_Thrower_throwUndeclaredA cb, int a, Ice.Current current) { @@ -152,6 +163,7 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwUndeclaredB_async(AMD_Thrower_throwUndeclaredB cb, int a, int b, Ice.Current current) { @@ -161,6 +173,7 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwUndeclaredC_async(AMD_Thrower_throwUndeclaredC cb, int a, int b, int c, Ice.Current current) { @@ -171,36 +184,42 @@ public final class AMDThrowerI extends _ThrowerDisp cb.ice_exception(ex); } + @Override public void throwLocalException_async(AMD_Thrower_throwLocalException cb, Ice.Current current) { cb.ice_exception(new Ice.TimeoutException()); } + @Override public void throwNonIceException_async(AMD_Thrower_throwNonIceException cb, Ice.Current current) { throw new RuntimeException(); } + @Override public void throwAssertException_async(AMD_Thrower_throwAssertException cb, Ice.Current current) { throw new java.lang.AssertionError(); } + @Override public void throwMemoryLimitException_async(AMD_Thrower_throwMemoryLimitException cb, byte[] seq, Ice.Current current) { cb.ice_response(new byte[1024 * 20]); // 20KB is over the configured 10KB message size max. } + @Override public void throwLocalExceptionIdempotent_async(AMD_Thrower_throwLocalExceptionIdempotent cb, Ice.Current current) { cb.ice_exception(new Ice.TimeoutException()); } + @Override public void throwAfterResponse_async(AMD_Thrower_throwAfterResponse cb, Ice.Current current) { @@ -209,6 +228,7 @@ public final class AMDThrowerI extends _ThrowerDisp throw new RuntimeException(); } + @Override public void throwAfterException_async(AMD_Thrower_throwAfterException cb, Ice.Current current) throws A diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java index bc556b0b5eb..eb561223bb6 100644 --- a/java/test/Ice/exceptions/AllTests.java +++ b/java/test/Ice/exceptions/AllTests.java @@ -21,7 +21,6 @@ import test.Ice.exceptions.Test.AMI_Thrower_throwCasA; import test.Ice.exceptions.Test.AMI_Thrower_throwCasB; import test.Ice.exceptions.Test.AMI_Thrower_throwCasC; import test.Ice.exceptions.Test.AMI_Thrower_throwLocalException; -import test.Ice.exceptions.Test.AMI_Thrower_throwLocalExceptionIdempotent; import test.Ice.exceptions.Test.AMI_Thrower_throwNonIceException; import test.Ice.exceptions.Test.AMI_Thrower_throwUndeclaredA; import test.Ice.exceptions.Test.AMI_Thrower_throwUndeclaredB; @@ -1394,7 +1393,7 @@ public class AllTests first = communicator.createObjectAdapter("TestAdapter0"); try { - Ice.ObjectAdapter second = communicator.createObjectAdapter("TestAdapter0"); + communicator.createObjectAdapter("TestAdapter0"); test(false); } catch(Ice.AlreadyRegisteredException ex) @@ -1404,8 +1403,7 @@ public class AllTests try { - Ice.ObjectAdapter second = - communicator.createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011"); + communicator.createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011"); test(false); } catch(Ice.AlreadyRegisteredException ex) diff --git a/java/test/Ice/exceptions/Client.java b/java/test/Ice/exceptions/Client.java index 1e17f5433a6..ef66546fa26 100644 --- a/java/test/Ice/exceptions/Client.java +++ b/java/test/Ice/exceptions/Client.java @@ -13,6 +13,7 @@ import test.Ice.exceptions.Test.ThrowerPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java index 05ddb1c1be1..004f5a67e15 100644 --- a/java/test/Ice/exceptions/Collocated.java +++ b/java/test/Ice/exceptions/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.exceptions; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { @@ -24,6 +25,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/exceptions/DummyLogger.java b/java/test/Ice/exceptions/DummyLogger.java index 1caa3ab219b..afa09a9a6fb 100644 --- a/java/test/Ice/exceptions/DummyLogger.java +++ b/java/test/Ice/exceptions/DummyLogger.java @@ -12,26 +12,31 @@ package test.Ice.exceptions; public final class DummyLogger implements Ice.Logger { + @Override public void print(String message) { } + @Override public void trace(String category, String message) { } + @Override public void warning(String message) { } + @Override public void error(String message) { } + @Override public Ice.Logger cloneWithPrefix(String prefix) { diff --git a/java/test/Ice/exceptions/ObjectFactoryI.java b/java/test/Ice/exceptions/ObjectFactoryI.java index 97778fd29dd..87dd29b637b 100644 --- a/java/test/Ice/exceptions/ObjectFactoryI.java +++ b/java/test/Ice/exceptions/ObjectFactoryI.java @@ -12,11 +12,13 @@ package test.Ice.exceptions; public final class ObjectFactoryI implements Ice.ObjectFactory { + @Override public Ice.Object create(String s) { return null; } + @Override public void destroy() { } diff --git a/java/test/Ice/exceptions/ServantLocatorI.java b/java/test/Ice/exceptions/ServantLocatorI.java index 2cda43ba9aa..6619cd8f40c 100644 --- a/java/test/Ice/exceptions/ServantLocatorI.java +++ b/java/test/Ice/exceptions/ServantLocatorI.java @@ -12,15 +12,18 @@ package test.Ice.exceptions; public final class ServantLocatorI implements Ice.ServantLocator { + @Override public Ice.Object locate(Ice.Current curr, Ice.LocalObjectHolder cookie) { return null; } + @Override public void finished(Ice.Current curr, Ice.Object servant, java.lang.Object cookie) { } + @Override public void deactivate(String category) { } diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java index fc552f80efa..99157b088b4 100644 --- a/java/test/Ice/exceptions/Server.java +++ b/java/test/Ice/exceptions/Server.java @@ -11,6 +11,7 @@ package test.Ice.exceptions; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java index f15db3be407..8859147bd36 100644 --- a/java/test/Ice/exceptions/ThrowerI.java +++ b/java/test/Ice/exceptions/ThrowerI.java @@ -22,24 +22,28 @@ public final class ThrowerI extends _ThrowerDisp { } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public boolean supportsUndeclaredExceptions(Ice.Current current) { return false; } + @Override public boolean supportsAssertException(Ice.Current current) { return true; } + @Override public void throwAasA(int a, Ice.Current current) throws A @@ -49,6 +53,7 @@ public final class ThrowerI extends _ThrowerDisp throw ex; } + @Override public void throwAorDasAorD(int a, Ice.Current current) throws A, @@ -68,6 +73,7 @@ public final class ThrowerI extends _ThrowerDisp } } + @Override public void throwBasA(int a, int b, Ice.Current current) throws A @@ -75,6 +81,7 @@ public final class ThrowerI extends _ThrowerDisp throwBasB(a, b, current); } + @Override public void throwBasB(int a, int b, Ice.Current current) throws B @@ -85,6 +92,7 @@ public final class ThrowerI extends _ThrowerDisp throw ex; } + @Override public void throwCasA(int a, int b, int c, Ice.Current current) throws A @@ -92,6 +100,7 @@ public final class ThrowerI extends _ThrowerDisp throwCasC(a, b, c, current); } + @Override public void throwCasB(int a, int b, int c, Ice.Current current) throws B @@ -99,6 +108,7 @@ public final class ThrowerI extends _ThrowerDisp throwCasC(a, b, c, current); } + @Override public void throwCasC(int a, int b, int c, Ice.Current current) throws C @@ -110,6 +120,7 @@ public final class ThrowerI extends _ThrowerDisp throw ex; } + @Override public void throwUndeclaredA(int a, Ice.Current current) { @@ -117,6 +128,7 @@ public final class ThrowerI extends _ThrowerDisp throw new Ice.UnknownUserException(); } + @Override public void throwUndeclaredB(int a, int b, Ice.Current current) { @@ -124,6 +136,7 @@ public final class ThrowerI extends _ThrowerDisp throw new Ice.UnknownUserException(); } + @Override public void throwUndeclaredC(int a, int b, int c, Ice.Current current) { @@ -131,36 +144,42 @@ public final class ThrowerI extends _ThrowerDisp throw new Ice.UnknownUserException(); } + @Override public void throwLocalException(Ice.Current current) { throw new Ice.TimeoutException(); } + @Override public void throwLocalExceptionIdempotent(Ice.Current current) { throw new Ice.TimeoutException(); } + @Override public void throwNonIceException(Ice.Current current) { throw new RuntimeException(); } + @Override public void throwAssertException(Ice.Current current) { throw new java.lang.AssertionError(); } + @Override public byte[] throwMemoryLimitException(byte[] seq, Ice.Current current) { return new byte[1024 * 20]; // 20KB is over the configured 10KB message size max. } + @Override public void throwAfterResponse(Ice.Current current) { @@ -169,6 +188,7 @@ public final class ThrowerI extends _ThrowerDisp // } + @Override public void throwAfterException(Ice.Current current) throws A diff --git a/java/test/Ice/facets/AI.java b/java/test/Ice/facets/AI.java index 4da307a5643..eb993bf3082 100644 --- a/java/test/Ice/facets/AI.java +++ b/java/test/Ice/facets/AI.java @@ -18,6 +18,7 @@ public final class AI extends _ADisp { } + @Override public String callA(Ice.Current current) { diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java index 8f59a58aa1c..79308c3b113 100644 --- a/java/test/Ice/facets/AllTests.java +++ b/java/test/Ice/facets/AllTests.java @@ -9,7 +9,6 @@ package test.Ice.facets; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.facets.Test.DPrx; diff --git a/java/test/Ice/facets/BI.java b/java/test/Ice/facets/BI.java index aa6a6d7aaf4..bcc05365e0f 100644 --- a/java/test/Ice/facets/BI.java +++ b/java/test/Ice/facets/BI.java @@ -18,12 +18,14 @@ public final class BI extends _BDisp { } + @Override public String callA(Ice.Current current) { return "A"; } + @Override public String callB(Ice.Current current) { diff --git a/java/test/Ice/facets/CI.java b/java/test/Ice/facets/CI.java index b14da689e68..fab2a5758ee 100644 --- a/java/test/Ice/facets/CI.java +++ b/java/test/Ice/facets/CI.java @@ -18,12 +18,14 @@ public final class CI extends _CDisp { } + @Override public String callA(Ice.Current current) { return "A"; } + @Override public String callC(Ice.Current current) { diff --git a/java/test/Ice/facets/Client.java b/java/test/Ice/facets/Client.java index ebb0f3eebbc..22867839eb7 100644 --- a/java/test/Ice/facets/Client.java +++ b/java/test/Ice/facets/Client.java @@ -13,6 +13,7 @@ import test.Ice.facets.Test.GPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/facets/Collocated.java b/java/test/Ice/facets/Collocated.java index 7b477639983..9503a7e7748 100644 --- a/java/test/Ice/facets/Collocated.java +++ b/java/test/Ice/facets/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.facets; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -29,6 +30,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/facets/DI.java b/java/test/Ice/facets/DI.java index faffef93149..cd4274dbaac 100644 --- a/java/test/Ice/facets/DI.java +++ b/java/test/Ice/facets/DI.java @@ -18,24 +18,28 @@ public final class DI extends _DDisp { } + @Override public String callA(Ice.Current current) { return "A"; } + @Override public String callB(Ice.Current current) { return "B"; } + @Override public String callC(Ice.Current current) { return "C"; } + @Override public String callD(Ice.Current current) { diff --git a/java/test/Ice/facets/EI.java b/java/test/Ice/facets/EI.java index be3afa6df01..6ebeb0ee8b3 100644 --- a/java/test/Ice/facets/EI.java +++ b/java/test/Ice/facets/EI.java @@ -18,6 +18,7 @@ public final class EI extends _EDisp { } + @Override public String callE(Ice.Current current) { diff --git a/java/test/Ice/facets/FI.java b/java/test/Ice/facets/FI.java index 5c8694f5b0e..5d945d86714 100644 --- a/java/test/Ice/facets/FI.java +++ b/java/test/Ice/facets/FI.java @@ -18,12 +18,14 @@ public final class FI extends _FDisp { } + @Override public String callE(Ice.Current current) { return "E"; } + @Override public String callF(Ice.Current current) { diff --git a/java/test/Ice/facets/GI.java b/java/test/Ice/facets/GI.java index c8b3902f0a2..397501ddeb7 100644 --- a/java/test/Ice/facets/GI.java +++ b/java/test/Ice/facets/GI.java @@ -19,12 +19,14 @@ public final class GI extends _GDisp _communicator = communicator; } + @Override public String callG(Ice.Current current) { return "G"; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/facets/HI.java b/java/test/Ice/facets/HI.java index 177020227d3..49bc8de2337 100644 --- a/java/test/Ice/facets/HI.java +++ b/java/test/Ice/facets/HI.java @@ -19,18 +19,21 @@ public final class HI extends _HDisp _communicator = communicator; } + @Override public String callG(Ice.Current current) { return "G"; } + @Override public String callH(Ice.Current current) { return "H"; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java index a4422d75215..0bba8b89cdf 100644 --- a/java/test/Ice/facets/Server.java +++ b/java/test/Ice/facets/Server.java @@ -11,6 +11,7 @@ package test.Ice.facets; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -28,6 +29,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java index f11f0507a16..4e334301a62 100644 --- a/java/test/Ice/faultTolerance/AllTests.java +++ b/java/test/Ice/faultTolerance/AllTests.java @@ -9,7 +9,6 @@ package test.Ice.faultTolerance; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.faultTolerance.Test.TestIntfPrx; @@ -124,6 +123,7 @@ public class AllTests private static class AbortCallback extends Ice.Callback { + @Override public void completed(Ice.AsyncResult result) { diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java index e1ffa8412bd..7f2fb23b80e 100644 --- a/java/test/Ice/faultTolerance/Client.java +++ b/java/test/Ice/faultTolerance/Client.java @@ -20,6 +20,7 @@ public class Client extends test.Util.Application System.err.println("Usage: Client port..."); } + @Override public int run(String[] args) { @@ -80,6 +81,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java index 6b8e20356e2..18d113fdeae 100644 --- a/java/test/Ice/faultTolerance/Server.java +++ b/java/test/Ice/faultTolerance/Server.java @@ -19,6 +19,7 @@ public class Server extends test.Util.Application System.err.println("Usage: Server port"); } + @Override public int run(String[] args) { @@ -69,6 +70,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/Ice/faultTolerance/TestI.java index bec0085ef3e..3d3b362bd0a 100644 --- a/java/test/Ice/faultTolerance/TestI.java +++ b/java/test/Ice/faultTolerance/TestI.java @@ -19,24 +19,28 @@ public final class TestI extends _TestIntfDisp _pseudoPid = port; // We use the port number instead of the process ID in Java. } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public void abort(Ice.Current current) { Runtime.getRuntime().halt(0); } + @Override public void idempotentAbort(Ice.Current current) { Runtime.getRuntime().halt(0); } + @Override public int pid(Ice.Current current) { diff --git a/java/test/Ice/hash/Client.java b/java/test/Ice/hash/Client.java index 4587cf34305..6a01bf62285 100644 --- a/java/test/Ice/hash/Client.java +++ b/java/test/Ice/hash/Client.java @@ -33,6 +33,7 @@ public class Client extends test.Util.Application System.exit(status); } + @Override public int run(String[] args) { PrintWriter out = getWriter(); diff --git a/java/test/Ice/hold/AllTests.java b/java/test/Ice/hold/AllTests.java index caebd64a131..d320ea52ae8 100644 --- a/java/test/Ice/hold/AllTests.java +++ b/java/test/Ice/hold/AllTests.java @@ -9,7 +9,6 @@ package test.Ice.hold; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.hold.Test.HoldPrx; @@ -74,6 +73,7 @@ public class AllTests { } + @Override synchronized public void sent(boolean sync) { diff --git a/java/test/Ice/hold/Client.java b/java/test/Ice/hold/Client.java index 65c82df0875..58e4e1abd32 100644 --- a/java/test/Ice/hold/Client.java +++ b/java/test/Ice/hold/Client.java @@ -11,6 +11,7 @@ package test.Ice.hold; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -18,6 +19,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/hold/HoldI.java b/java/test/Ice/hold/HoldI.java index 00a80469bbc..0ca55e6dac2 100644 --- a/java/test/Ice/hold/HoldI.java +++ b/java/test/Ice/hold/HoldI.java @@ -30,6 +30,7 @@ public final class HoldI extends _HoldDisp _last = 0; } + @Override public void putOnHold(int milliSeconds, Ice.Current current) { @@ -46,6 +47,7 @@ public final class HoldI extends _HoldDisp { _timer.schedule(new java.util.TimerTask() { + @Override public void run() { @@ -61,11 +63,13 @@ public final class HoldI extends _HoldDisp } } + @Override public void waitForHold(final Ice.Current current) { _timer.schedule(new java.util.TimerTask() { + @Override public void run() { @@ -87,6 +91,7 @@ public final class HoldI extends _HoldDisp } + @Override public int set(int value, int delay, Ice.Current current) { @@ -106,6 +111,7 @@ public final class HoldI extends _HoldDisp } } + @Override synchronized public void setOneway(int value, int expected, Ice.Current current) { @@ -118,6 +124,7 @@ public final class HoldI extends _HoldDisp _last = value; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/hold/Server.java b/java/test/Ice/hold/Server.java index 65106fada4f..97019f8021e 100644 --- a/java/test/Ice/hold/Server.java +++ b/java/test/Ice/hold/Server.java @@ -11,6 +11,7 @@ package test.Ice.hold; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -33,6 +34,7 @@ public class Server extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/info/Client.java b/java/test/Ice/info/Client.java index 201106f63ba..2cd0d5b1f8b 100644 --- a/java/test/Ice/info/Client.java +++ b/java/test/Ice/info/Client.java @@ -11,12 +11,14 @@ package test.Ice.info; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(communicator(), getWriter()); return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/info/Server.java b/java/test/Ice/info/Server.java index 0d96a049118..ebb4046e721 100644 --- a/java/test/Ice/info/Server.java +++ b/java/test/Ice/info/Server.java @@ -11,6 +11,7 @@ package test.Ice.info; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/info/TestI.java b/java/test/Ice/info/TestI.java index 75b1f5bb904..316cf7e438f 100644 --- a/java/test/Ice/info/TestI.java +++ b/java/test/Ice/info/TestI.java @@ -16,11 +16,13 @@ public class TestI extends _TestIntfDisp { } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public java.util.Map<String, String> getEndpointInfoAsContext(Ice.Current c) { java.util.Map<String, String> ctx = new java.util.HashMap<String, String>(); @@ -45,6 +47,7 @@ public class TestI extends _TestIntfDisp return ctx; } + @Override public java.util.Map<String, String> getConnectionInfoAsContext(Ice.Current c) { java.util.Map<String, String> ctx = new java.util.HashMap<String, String>(); diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java index 2b5f9f93873..5a53c6916a1 100644 --- a/java/test/Ice/inheritance/AllTests.java +++ b/java/test/Ice/inheritance/AllTests.java @@ -9,7 +9,6 @@ package test.Ice.inheritance; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.inheritance.Test.InitialPrx; @@ -214,7 +213,6 @@ public class AllTests out.print("ditto, but for class implementing interfaces... "); out.flush(); - CDPrx cdo; cao = cd.caop(cd); test(cao.equals(cd)); diff --git a/java/test/Ice/inheritance/CAI.java b/java/test/Ice/inheritance/CAI.java index 4db69aa0d0a..b867eb6f836 100644 --- a/java/test/Ice/inheritance/CAI.java +++ b/java/test/Ice/inheritance/CAI.java @@ -19,6 +19,7 @@ public final class CAI extends CA { } + @Override public CAPrx caop(CAPrx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/CBI.java b/java/test/Ice/inheritance/CBI.java index e6e8d9f7005..6f07ec9b167 100644 --- a/java/test/Ice/inheritance/CBI.java +++ b/java/test/Ice/inheritance/CBI.java @@ -20,12 +20,14 @@ public final class CBI extends CB { } + @Override public CAPrx caop(CAPrx p, Ice.Current current) { return p; } + @Override public CBPrx cbop(CBPrx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/CCI.java b/java/test/Ice/inheritance/CCI.java index 3f737b246f6..1d88806b959 100644 --- a/java/test/Ice/inheritance/CCI.java +++ b/java/test/Ice/inheritance/CCI.java @@ -21,18 +21,21 @@ public final class CCI extends CC { } + @Override public CAPrx caop(CAPrx p, Ice.Current current) { return p; } + @Override public CCPrx ccop(CCPrx p, Ice.Current current) { return p; } + @Override public CBPrx cbop(CBPrx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/CDI.java b/java/test/Ice/inheritance/CDI.java index 6b21b135117..a1ac62fdf14 100644 --- a/java/test/Ice/inheritance/CDI.java +++ b/java/test/Ice/inheritance/CDI.java @@ -25,42 +25,49 @@ public final class CDI extends CD { } + @Override public CAPrx caop(CAPrx p, Ice.Current current) { return p; } + @Override public CCPrx ccop(CCPrx p, Ice.Current current) { return p; } + @Override public CDPrx cdop(CDPrx p, Ice.Current current) { return p; } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { return p; } + @Override public CBPrx cbop(CBPrx p, Ice.Current current) { return p; } + @Override public IB1Prx ib1op(IB1Prx p, Ice.Current current) { return p; } + @Override public IB2Prx ib2op(IB2Prx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java index f03d0917b5c..1fc5bdb3214 100644 --- a/java/test/Ice/inheritance/Client.java +++ b/java/test/Ice/inheritance/Client.java @@ -13,6 +13,7 @@ import test.Ice.inheritance.Test.InitialPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java index af2bda6b221..3c92c35545c 100644 --- a/java/test/Ice/inheritance/Collocated.java +++ b/java/test/Ice/inheritance/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.inheritance; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -23,6 +24,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/inheritance/IAI.java b/java/test/Ice/inheritance/IAI.java index 9d471939bb8..6f783f0bc58 100644 --- a/java/test/Ice/inheritance/IAI.java +++ b/java/test/Ice/inheritance/IAI.java @@ -19,6 +19,7 @@ public final class IAI extends _IADisp { } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/IB1I.java b/java/test/Ice/inheritance/IB1I.java index b71b5e0451e..0c1de6cfb99 100644 --- a/java/test/Ice/inheritance/IB1I.java +++ b/java/test/Ice/inheritance/IB1I.java @@ -20,12 +20,14 @@ public final class IB1I extends _IB1Disp { } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { return p; } + @Override public IB1Prx ib1op(IB1Prx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/IB2I.java b/java/test/Ice/inheritance/IB2I.java index d211349eedf..07fc2e53baa 100644 --- a/java/test/Ice/inheritance/IB2I.java +++ b/java/test/Ice/inheritance/IB2I.java @@ -20,12 +20,14 @@ public final class IB2I extends _IB2Disp { } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { return p; } + @Override public IB2Prx ib2op(IB2Prx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/ICI.java b/java/test/Ice/inheritance/ICI.java index 158553bf46b..4ff569dbf16 100644 --- a/java/test/Ice/inheritance/ICI.java +++ b/java/test/Ice/inheritance/ICI.java @@ -22,24 +22,28 @@ public final class ICI extends _ICDisp { } + @Override public IAPrx iaop(IAPrx p, Ice.Current current) { return p; } + @Override public ICPrx icop(ICPrx p, Ice.Current current) { return p; } + @Override public IB1Prx ib1op(IB1Prx p, Ice.Current current) { return p; } + @Override public IB2Prx ib2op(IB2Prx p, Ice.Current current) { diff --git a/java/test/Ice/inheritance/InitialI.java b/java/test/Ice/inheritance/InitialI.java index 0c3195d7218..083314cf62d 100644 --- a/java/test/Ice/inheritance/InitialI.java +++ b/java/test/Ice/inheritance/InitialI.java @@ -42,54 +42,63 @@ public final class InitialI extends _InitialDisp _ic = ICPrxHelper.uncheckedCast(adapter.addWithUUID(new ICI())); } + @Override public CAPrx caop(Ice.Current current) { return _ca; } + @Override public CBPrx cbop(Ice.Current current) { return _cb; } + @Override public CCPrx ccop(Ice.Current current) { return _cc; } + @Override public CDPrx cdop(Ice.Current current) { return _cd; } + @Override public IAPrx iaop(Ice.Current current) { return _ia; } + @Override public IB1Prx ib1op(Ice.Current current) { return _ib1; } + @Override public IB2Prx ib2op(Ice.Current current) { return _ib2; } + @Override public ICPrx icop(Ice.Current current) { return _ic; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java index b55b5213664..7ff0278c2a6 100644 --- a/java/test/Ice/inheritance/Server.java +++ b/java/test/Ice/inheritance/Server.java @@ -11,6 +11,7 @@ package test.Ice.inheritance; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/interceptor/AMDInterceptorI.java b/java/test/Ice/interceptor/AMDInterceptorI.java index 741dfc7a691..e9cc88a1ba5 100644 --- a/java/test/Ice/interceptor/AMDInterceptorI.java +++ b/java/test/Ice/interceptor/AMDInterceptorI.java @@ -22,6 +22,7 @@ class AMDInterceptorI extends InterceptorI implements Ice.DispatchInterceptorAsy super(servant); } + @Override public Ice.DispatchStatus dispatch(Ice.Request request) { @@ -34,12 +35,14 @@ class AMDInterceptorI extends InterceptorI implements Ice.DispatchInterceptorAsy { Ice.DispatchInterceptorAsyncCallback cb = new Ice.DispatchInterceptorAsyncCallback() { + @Override public boolean response(boolean ok) { test(ok); return false; } + @Override public boolean exception(java.lang.Exception ex) { test(ex instanceof RetryException); @@ -59,18 +62,21 @@ class AMDInterceptorI extends InterceptorI implements Ice.DispatchInterceptorAsy return _lastStatus; } + @Override public boolean response(boolean ok) { setActualStatus(ok ? Ice.DispatchStatus.DispatchOK : Ice.DispatchStatus.DispatchUserException); return true; } + @Override public boolean exception(java.lang.Exception ex) { setActualStatus(ex); return true; } + @Override void clear() { diff --git a/java/test/Ice/interceptor/Client.java b/java/test/Ice/interceptor/Client.java index f55d873695d..12c913296b0 100644 --- a/java/test/Ice/interceptor/Client.java +++ b/java/test/Ice/interceptor/Client.java @@ -195,6 +195,7 @@ public class Client extends test.Util.Application return 0; } + @Override public int run(String[] args) { @@ -247,6 +248,7 @@ public class Client extends test.Util.Application } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/interceptor/InterceptorI.java b/java/test/Ice/interceptor/InterceptorI.java index cede400f0a6..04458722e3a 100644 --- a/java/test/Ice/interceptor/InterceptorI.java +++ b/java/test/Ice/interceptor/InterceptorI.java @@ -28,6 +28,7 @@ class InterceptorI extends Ice.DispatchInterceptor } + @Override public Ice.DispatchStatus dispatch(Ice.Request request) { diff --git a/java/test/Ice/interceptor/MyObjectI.java b/java/test/Ice/interceptor/MyObjectI.java index 7e1e87f641b..a2c10f04d38 100644 --- a/java/test/Ice/interceptor/MyObjectI.java +++ b/java/test/Ice/interceptor/MyObjectI.java @@ -21,16 +21,18 @@ import test.Ice.interceptor.Test._MyObjectDisp; class MyObjectI extends _MyObjectDisp { + @Override public int add(int x, int y, Ice.Current current) { return x + y; } + @Override public int addWithRetry(int x, int y, Ice.Current current) { - String val = (String)current.ctx.get("retry"); + String val = current.ctx.get("retry"); if(val == null || !val.equals("no")) { @@ -39,18 +41,21 @@ class MyObjectI extends _MyObjectDisp return x + y; } + @Override public int badAdd(int x, int y, Ice.Current current) throws InvalidInputException { throw new InvalidInputException(); } + @Override public int notExistAdd(int x, int y, Ice.Current current) { throw new Ice.ObjectNotExistException(); } + @Override public int badSystemAdd(int x, int y, Ice.Current current) { @@ -62,11 +67,13 @@ class MyObjectI extends _MyObjectDisp // AMD // + @Override public void amdAdd_async(final AMD_MyObject_amdAdd cb, final int x, final int y, Ice.Current current) { Thread thread = new Thread() { + @Override public void run() { @@ -85,11 +92,13 @@ class MyObjectI extends _MyObjectDisp thread.start(); } + @Override public void amdAddWithRetry_async(final AMD_MyObject_amdAddWithRetry cb, final int x, final int y, Ice.Current current) { Thread thread = new Thread() { + @Override public void run() { @@ -107,7 +116,7 @@ class MyObjectI extends _MyObjectDisp thread.setDaemon(true); thread.start(); - String val = (String)current.ctx.get("retry"); + String val = current.ctx.get("retry"); if(val == null || !val.equals("no")) { @@ -115,11 +124,13 @@ class MyObjectI extends _MyObjectDisp } } + @Override public void amdBadAdd_async(final AMD_MyObject_amdBadAdd cb, int x, int y, Ice.Current current) { Thread thread = new Thread() { + @Override public void run() { @@ -138,11 +149,13 @@ class MyObjectI extends _MyObjectDisp thread.start(); } + @Override public void amdNotExistAdd_async(final AMD_MyObject_amdNotExistAdd cb, int x, int y, Ice.Current current) { Thread thread = new Thread() { + @Override public void run() { @@ -161,11 +174,13 @@ class MyObjectI extends _MyObjectDisp thread.start(); } + @Override public void amdBadSystemAdd_async(final AMD_MyObject_amdBadSystemAdd cb, int x, int y, Ice.Current current) { Thread thread = new Thread() { + @Override public void run() { diff --git a/java/test/Ice/interceptor/MySystemException.java b/java/test/Ice/interceptor/MySystemException.java index 5a1673d677f..ee7bc5a626b 100644 --- a/java/test/Ice/interceptor/MySystemException.java +++ b/java/test/Ice/interceptor/MySystemException.java @@ -16,6 +16,7 @@ public class MySystemException extends Ice.SystemException { } + @Override public String ice_name() { diff --git a/java/test/Ice/interrupt/AllTests.java b/java/test/Ice/interrupt/AllTests.java index 053de7c909a..69644e735b0 100644 --- a/java/test/Ice/interrupt/AllTests.java +++ b/java/test/Ice/interrupt/AllTests.java @@ -21,11 +21,9 @@ import test.Ice.interrupt.Test.TestIntfControllerPrx; import test.Ice.interrupt.Test.TestIntfControllerPrxHelper; import test.Ice.interrupt.Test.TestIntfPrx; import test.Ice.interrupt.Test.TestIntfPrxHelper; -import Ice.CommunicatorDestroyedException; import Ice.LocalException; import Ice.OperationInterruptedException; import Ice.UserException; -import IceInternal.Time; public class AllTests { diff --git a/java/test/Ice/interrupt/TestI.java b/java/test/Ice/interrupt/TestI.java index cc267571c6f..8f72d7d45a8 100644 --- a/java/test/Ice/interrupt/TestI.java +++ b/java/test/Ice/interrupt/TestI.java @@ -11,15 +11,6 @@ package test.Ice.interrupt; public class TestI extends test.Ice.interrupt.Test._TestIntfDisp { - private static void - test(boolean b) - { - if(!b) - { - throw new RuntimeException(); - } - } - TestI(TestControllerI controller) { _controller = controller; diff --git a/java/test/Ice/invoke/BlobjectAsyncI.java b/java/test/Ice/invoke/BlobjectAsyncI.java index 4a2bb807456..c7e0837b946 100644 --- a/java/test/Ice/invoke/BlobjectAsyncI.java +++ b/java/test/Ice/invoke/BlobjectAsyncI.java @@ -13,6 +13,7 @@ import test.Ice.invoke.Test.MyException; public class BlobjectAsyncI extends Ice.BlobjectAsync { + @Override public void ice_invoke_async(Ice.AMD_Object_ice_invoke cb, byte[] inParams, Ice.Current current) { diff --git a/java/test/Ice/invoke/BlobjectI.java b/java/test/Ice/invoke/BlobjectI.java index 38457fe3527..c676c38dc63 100644 --- a/java/test/Ice/invoke/BlobjectI.java +++ b/java/test/Ice/invoke/BlobjectI.java @@ -13,6 +13,7 @@ import test.Ice.invoke.Test.MyException; public class BlobjectI extends Ice.Blobject { + @Override public boolean ice_invoke(byte[] inParams, Ice.ByteSeqHolder outParams, Ice.Current current) { diff --git a/java/test/Ice/invoke/Client.java b/java/test/Ice/invoke/Client.java index 4cfe8155cae..e589d32075c 100644 --- a/java/test/Ice/invoke/Client.java +++ b/java/test/Ice/invoke/Client.java @@ -13,6 +13,7 @@ import test.Ice.invoke.Test.MyClassPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { MyClassPrx myClass = AllTests.allTests(communicator(), getWriter()); @@ -48,6 +49,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/invoke/ServantLocatorI.java b/java/test/Ice/invoke/ServantLocatorI.java index 4c2a59e0919..9ed2262b995 100644 --- a/java/test/Ice/invoke/ServantLocatorI.java +++ b/java/test/Ice/invoke/ServantLocatorI.java @@ -23,17 +23,20 @@ public class ServantLocatorI implements Ice.ServantLocator } } + @Override public Ice.Object locate(Ice.Current current, Ice.LocalObjectHolder cookie) { return _blobject; } + @Override public void finished(Ice.Current current, Ice.Object servant, java.lang.Object cookie) { } + @Override public void deactivate(String category) { diff --git a/java/test/Ice/invoke/Server.java b/java/test/Ice/invoke/Server.java index c670c5670d6..a6f315d5cf9 100644 --- a/java/test/Ice/invoke/Server.java +++ b/java/test/Ice/invoke/Server.java @@ -11,6 +11,7 @@ package test.Ice.invoke; public class Server extends test.Util.Application { + @Override public int run(String[] args) { boolean async = false; @@ -29,6 +30,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/location/Client.java b/java/test/Ice/location/Client.java index e18f86008f5..4fc8e67893b 100644 --- a/java/test/Ice/location/Client.java +++ b/java/test/Ice/location/Client.java @@ -11,6 +11,7 @@ package test.Ice.location; public class Client extends test.Util.Application { + @Override public int run(String[] args) { try @@ -36,6 +37,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/location/HelloI.java b/java/test/Ice/location/HelloI.java index 95aa8d0e48f..5036d4cbc18 100644 --- a/java/test/Ice/location/HelloI.java +++ b/java/test/Ice/location/HelloI.java @@ -14,6 +14,7 @@ import test.Ice.location.Test._HelloDisp; public class HelloI extends _HelloDisp { + @Override public void sayHello(Ice.Current current) { diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java index d6bf84e78c7..4b09338d2ee 100644 --- a/java/test/Ice/location/Server.java +++ b/java/test/Ice/location/Server.java @@ -13,6 +13,7 @@ public class Server extends test.Util.Application { private Ice.InitializationData _initData; + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -45,6 +46,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/location/ServerLocator.java b/java/test/Ice/location/ServerLocator.java index 4e278e2adb3..0e27e888eb7 100644 --- a/java/test/Ice/location/ServerLocator.java +++ b/java/test/Ice/location/ServerLocator.java @@ -21,6 +21,7 @@ public class ServerLocator extends _TestLocatorDisp _requestCount = 0; } + @Override public void findAdapterById_async(Ice.AMD_Locator_findAdapterById response, String adapter, Ice.Current current) throws Ice.AdapterNotFoundException @@ -45,6 +46,7 @@ public class ServerLocator extends _TestLocatorDisp response.ice_response(_registry.getAdapter(adapter)); } + @Override public void findObjectById_async(Ice.AMD_Locator_findObjectById response, Ice.Identity id, Ice.Current current) throws Ice.ObjectNotFoundException @@ -62,12 +64,14 @@ public class ServerLocator extends _TestLocatorDisp response.ice_response(_registry.getObject(id)); } + @Override public Ice.LocatorRegistryPrx getRegistry(Ice.Current current) { return _registryPrx; } + @Override public int getRequestCount(Ice.Current current) { diff --git a/java/test/Ice/location/ServerLocatorRegistry.java b/java/test/Ice/location/ServerLocatorRegistry.java index 4e088ef8f28..7a9fbc50ac8 100644 --- a/java/test/Ice/location/ServerLocatorRegistry.java +++ b/java/test/Ice/location/ServerLocatorRegistry.java @@ -13,6 +13,7 @@ import test.Ice.location.Test._TestLocatorRegistryDisp; public class ServerLocatorRegistry extends _TestLocatorRegistryDisp { + @Override public void setAdapterDirectProxy_async(Ice.AMD_LocatorRegistry_setAdapterDirectProxy cb, String adapter, Ice.ObjectPrx object, Ice.Current current) @@ -28,6 +29,7 @@ public class ServerLocatorRegistry extends _TestLocatorRegistryDisp cb.ice_response(); } + @Override public void setReplicatedAdapterDirectProxy_async(Ice.AMD_LocatorRegistry_setReplicatedAdapterDirectProxy cb, String adapter, String replica, Ice.ObjectPrx object, Ice.Current current) @@ -45,12 +47,14 @@ public class ServerLocatorRegistry extends _TestLocatorRegistryDisp cb.ice_response(); } + @Override public void setServerProcessProxy_async(Ice.AMD_LocatorRegistry_setServerProcessProxy cb, String id, Ice.ProcessPrx proxy, Ice.Current current) { } + @Override public void addObject(Ice.ObjectPrx object, Ice.Current current) { diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/Ice/location/ServerManagerI.java index 11ae27ef4a3..2ac89074ad7 100644 --- a/java/test/Ice/location/ServerManagerI.java +++ b/java/test/Ice/location/ServerManagerI.java @@ -28,6 +28,7 @@ public class ServerManagerI extends _ServerManagerDisp _initData.properties.setProperty("TestAdapter2.AdapterId", "TestAdapter2"); } + @Override public void startServer(Ice.Current current) { @@ -72,6 +73,7 @@ public class ServerManagerI extends _ServerManagerDisp adapter2.activate(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/location/TestI.java b/java/test/Ice/location/TestI.java index a64c51ccc56..de3c6213bd7 100644 --- a/java/test/Ice/location/TestI.java +++ b/java/test/Ice/location/TestI.java @@ -25,12 +25,14 @@ public class TestI extends _TestIntfDisp _registry.addObject(_adapter1.add(new HelloI(), _adapter1.getCommunicator().stringToIdentity("hello"))); } + @Override public void shutdown(Ice.Current current) { _adapter1.getCommunicator().shutdown(); } + @Override public HelloPrx getHello(Ice.Current current) { @@ -38,12 +40,14 @@ public class TestI extends _TestIntfDisp _adapter1.getCommunicator().stringToIdentity("hello"))); } + @Override public HelloPrx getReplicatedHello(Ice.Current current) { return HelloPrxHelper.uncheckedCast(_adapter1.createProxy(_adapter1.getCommunicator().stringToIdentity("hello"))); } + @Override public void migrateHello(Ice.Current current) { diff --git a/java/test/Ice/metrics/AMDMetricsI.java b/java/test/Ice/metrics/AMDMetricsI.java index 6c45a12ed52..e557e728a4e 100644 --- a/java/test/Ice/metrics/AMDMetricsI.java +++ b/java/test/Ice/metrics/AMDMetricsI.java @@ -17,12 +17,14 @@ public final class AMDMetricsI extends _MetricsDisp { } + @Override public void op_async(AMD_Metrics_op cb, Ice.Current current) { cb.ice_response(); } + @Override public void fail_async(AMD_Metrics_fail cb, Ice.Current current) { @@ -30,6 +32,7 @@ public final class AMDMetricsI extends _MetricsDisp cb.ice_response(); } + @Override public void opWithUserException_async(AMD_Metrics_opWithUserException cb, Ice.Current current) throws UserEx @@ -37,36 +40,42 @@ public final class AMDMetricsI extends _MetricsDisp cb.ice_exception(new UserEx()); } + @Override public void opWithRequestFailedException_async(AMD_Metrics_opWithRequestFailedException cb, Ice.Current current) { cb.ice_exception(new Ice.ObjectNotExistException()); } + @Override public void opWithLocalException_async(AMD_Metrics_opWithLocalException cb, Ice.Current current) { cb.ice_exception(new Ice.SyscallException()); } + @Override public void opWithUnknownException_async(AMD_Metrics_opWithUnknownException cb, Ice.Current current) { cb.ice_exception(new IllegalArgumentException()); } + @Override public void opByteS_async(AMD_Metrics_opByteS cb, byte[] bs, Ice.Current current) { cb.ice_response(); } + @Override public Ice.ObjectPrx getAdmin(Ice.Current current) { return current.adapter.getCommunicator().getAdmin(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/metrics/AMDServer.java b/java/test/Ice/metrics/AMDServer.java index cedc8596656..dc559764811 100644 --- a/java/test/Ice/metrics/AMDServer.java +++ b/java/test/Ice/metrics/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.metrics; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -26,6 +27,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/metrics/AllTests.java b/java/test/Ice/metrics/AllTests.java index 12db7e2f13e..1a8724a91ab 100644 --- a/java/test/Ice/metrics/AllTests.java +++ b/java/test/Ice/metrics/AllTests.java @@ -65,6 +65,7 @@ public class AllTests _wait = true; } + @Override synchronized public void completed(Ice.AsyncResult result) { _wait = false; @@ -163,6 +164,7 @@ public class AllTests _updated = false; } + @Override public synchronized void updated(Map<String, String> dict) { @@ -262,6 +264,7 @@ public class AllTests static class Void implements Runnable { + @Override public void run() { } @@ -274,6 +277,7 @@ public class AllTests this.proxy = proxy; } + @Override public void run() { if(proxy.ice_getCachedConnection() != null) @@ -305,6 +309,7 @@ public class AllTests this.proxy = proxy; } + @Override public void run() { Map<String, String> ctx = new java.util.HashMap<String, String>(); diff --git a/java/test/Ice/metrics/ChildInvocationObserverI.java b/java/test/Ice/metrics/ChildInvocationObserverI.java index 8215cef34dd..da56f726250 100644 --- a/java/test/Ice/metrics/ChildInvocationObserverI.java +++ b/java/test/Ice/metrics/ChildInvocationObserverI.java @@ -11,6 +11,7 @@ package test.Ice.metrics; class ChildInvocationObserverI extends ObserverI implements Ice.Instrumentation.ChildInvocationObserver { + @Override public synchronized void reset() { @@ -18,6 +19,7 @@ class ChildInvocationObserverI extends ObserverI implements Ice.Instrumentation. replySize = 0; } + @Override public synchronized void reply(int s) { diff --git a/java/test/Ice/metrics/Client.java b/java/test/Ice/metrics/Client.java index be105a7ec80..48acc9244b1 100644 --- a/java/test/Ice/metrics/Client.java +++ b/java/test/Ice/metrics/Client.java @@ -13,6 +13,7 @@ import test.Ice.metrics.Test.MetricsPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -30,6 +31,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/metrics/Collocated.java b/java/test/Ice/metrics/Collocated.java index 47056dc8841..69a8896e1b5 100644 --- a/java/test/Ice/metrics/Collocated.java +++ b/java/test/Ice/metrics/Collocated.java @@ -13,6 +13,7 @@ import test.Ice.metrics.Test.MetricsPrx; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -40,6 +41,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/metrics/CommunicatorObserverI.java b/java/test/Ice/metrics/CommunicatorObserverI.java index 7561d68b4d4..996d5a83b1a 100644 --- a/java/test/Ice/metrics/CommunicatorObserverI.java +++ b/java/test/Ice/metrics/CommunicatorObserverI.java @@ -20,12 +20,14 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver } } + @Override public void setObserverUpdater(Ice.Instrumentation.ObserverUpdater u) { updater = u; } + @Override synchronized public Ice.Instrumentation.Observer getConnectionEstablishmentObserver(Ice.Endpoint e, String s) { @@ -38,6 +40,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver } + @Override synchronized public Ice.Instrumentation.Observer getEndpointLookupObserver(Ice.Endpoint e) { @@ -49,6 +52,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver return endpointLookupObserver; } + @Override synchronized public Ice.Instrumentation.ConnectionObserver getConnectionObserver(Ice.ConnectionInfo c, Ice.Endpoint e, @@ -64,6 +68,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver return connectionObserver; } + @Override synchronized public Ice.Instrumentation.ThreadObserver getThreadObserver(String p, String id, Ice.Instrumentation.ThreadState s, Ice.Instrumentation.ThreadObserver old) @@ -77,6 +82,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver return threadObserver; } + @Override synchronized public Ice.Instrumentation.InvocationObserver getInvocationObserver(Ice.ObjectPrx p, String op, java.util.Map<String, String> ctx) { @@ -88,6 +94,7 @@ class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver return invocationObserver; } + @Override synchronized public Ice.Instrumentation.DispatchObserver getDispatchObserver(Ice.Current current, int s) { diff --git a/java/test/Ice/metrics/ConnectionObserverI.java b/java/test/Ice/metrics/ConnectionObserverI.java index 25f83caac5e..395c31733e9 100644 --- a/java/test/Ice/metrics/ConnectionObserverI.java +++ b/java/test/Ice/metrics/ConnectionObserverI.java @@ -11,6 +11,7 @@ package test.Ice.metrics; class ConnectionObserverI extends ObserverI implements Ice.Instrumentation.ConnectionObserver { + @Override public synchronized void reset() { @@ -19,12 +20,14 @@ class ConnectionObserverI extends ObserverI implements Ice.Instrumentation.Conne sent = 0; } + @Override public synchronized void sentBytes(int s) { sent += s; } + @Override public synchronized void receivedBytes(int s) { diff --git a/java/test/Ice/metrics/ControllerI.java b/java/test/Ice/metrics/ControllerI.java index 05c8bb702b3..2f1434d523a 100644 --- a/java/test/Ice/metrics/ControllerI.java +++ b/java/test/Ice/metrics/ControllerI.java @@ -17,12 +17,14 @@ public final class ControllerI extends _ControllerDisp _adapter = adapter; } + @Override public void hold(Ice.Current current) { _adapter.hold(); _adapter.waitForHold(); } + @Override public void resume(Ice.Current current) { _adapter.activate(); diff --git a/java/test/Ice/metrics/DispatchObserverI.java b/java/test/Ice/metrics/DispatchObserverI.java index 920b821e239..43b0683696c 100644 --- a/java/test/Ice/metrics/DispatchObserverI.java +++ b/java/test/Ice/metrics/DispatchObserverI.java @@ -11,6 +11,7 @@ package test.Ice.metrics; class DispatchObserverI extends ObserverI implements Ice.Instrumentation.DispatchObserver { + @Override public synchronized void reset() { @@ -19,12 +20,14 @@ class DispatchObserverI extends ObserverI implements Ice.Instrumentation.Dispatc replySize = 0; } + @Override public synchronized void userException() { ++userExceptionCount; } + @Override public synchronized void reply(int s) { diff --git a/java/test/Ice/metrics/InvocationObserverI.java b/java/test/Ice/metrics/InvocationObserverI.java index 5457f85aff0..cfb7e2c6547 100644 --- a/java/test/Ice/metrics/InvocationObserverI.java +++ b/java/test/Ice/metrics/InvocationObserverI.java @@ -11,6 +11,7 @@ package test.Ice.metrics; class InvocationObserverI extends ObserverI implements Ice.Instrumentation.InvocationObserver { + @Override public synchronized void reset() { @@ -27,18 +28,21 @@ class InvocationObserverI extends ObserverI implements Ice.Instrumentation.Invoc } } + @Override public synchronized void retried() { ++retriedCount; } + @Override public synchronized void userException() { ++userExceptionCount; } + @Override public synchronized Ice.Instrumentation.RemoteObserver getRemoteObserver(Ice.ConnectionInfo c, Ice.Endpoint e, int a, int b) { @@ -51,6 +55,7 @@ class InvocationObserverI extends ObserverI implements Ice.Instrumentation.Invoc } + @Override public synchronized Ice.Instrumentation.CollocatedObserver getCollocatedObserver(Ice.ObjectAdapter adapter, int a, int b) { diff --git a/java/test/Ice/metrics/MetricsI.java b/java/test/Ice/metrics/MetricsI.java index 555cbbdd878..51f10fd2661 100644 --- a/java/test/Ice/metrics/MetricsI.java +++ b/java/test/Ice/metrics/MetricsI.java @@ -17,17 +17,20 @@ public final class MetricsI extends _MetricsDisp { } + @Override public void op(Ice.Current current) { } + @Override public void fail(Ice.Current current) { current.con.close(true); } + @Override public void opWithUserException(Ice.Current current) throws UserEx @@ -35,35 +38,41 @@ public final class MetricsI extends _MetricsDisp throw new UserEx(); } + @Override public void opWithRequestFailedException(Ice.Current current) { throw new Ice.ObjectNotExistException(); } + @Override public void opWithLocalException(Ice.Current current) { throw new Ice.SyscallException(); } + @Override public void opWithUnknownException(Ice.Current current) { throw new IllegalArgumentException(); } + @Override public void opByteS(byte[] bs, Ice.Current current) { } + @Override public Ice.ObjectPrx getAdmin(Ice.Current current) { return current.adapter.getCommunicator().getAdmin(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/metrics/ObserverI.java b/java/test/Ice/metrics/ObserverI.java index 46398fdb1b0..1dadf4d63d8 100644 --- a/java/test/Ice/metrics/ObserverI.java +++ b/java/test/Ice/metrics/ObserverI.java @@ -19,17 +19,20 @@ class ObserverI implements Ice.Instrumentation.Observer failedCount = 0; } + @Override synchronized public void attach() { ++total; ++current; } + @Override synchronized public void detach() { --current; } + @Override synchronized public void failed(String s) { diff --git a/java/test/Ice/metrics/Server.java b/java/test/Ice/metrics/Server.java index d1ca0fe6dfc..70788ea876f 100644 --- a/java/test/Ice/metrics/Server.java +++ b/java/test/Ice/metrics/Server.java @@ -11,6 +11,7 @@ package test.Ice.metrics; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -26,6 +27,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/metrics/ThreadObserverI.java b/java/test/Ice/metrics/ThreadObserverI.java index 59e754ba9ad..af24dfd7df1 100644 --- a/java/test/Ice/metrics/ThreadObserverI.java +++ b/java/test/Ice/metrics/ThreadObserverI.java @@ -11,6 +11,7 @@ package test.Ice.metrics; class ThreadObserverI extends ObserverI implements Ice.Instrumentation.ThreadObserver { + @Override public synchronized void reset() { @@ -18,6 +19,7 @@ class ThreadObserverI extends ObserverI implements Ice.Instrumentation.ThreadObs states = 0; } + @Override public synchronized void stateChanged(Ice.Instrumentation.ThreadState o, Ice.Instrumentation.ThreadState n) { diff --git a/java/test/Ice/objects/AllTests.java b/java/test/Ice/objects/AllTests.java index 68eb23ef4e5..ab43e76c368 100644 --- a/java/test/Ice/objects/AllTests.java +++ b/java/test/Ice/objects/AllTests.java @@ -29,8 +29,6 @@ import test.Ice.objects.Test.InitialPrxHelper; import test.Ice.objects.Test.J; import test.Ice.objects.Test.UnexpectedObjectExceptionTestPrx; import test.Ice.objects.Test.UnexpectedObjectExceptionTestPrxHelper; -import test.Ice.objects.Test.Compact; -import test.Ice.objects.Test.CompactExt; public class AllTests { @@ -98,7 +96,7 @@ public class AllTests test(((B)b1.theA).theA == b1.theA); test(((B)b1.theA).theB == b1); test(((B)b1.theA).theC instanceof C); - test(((C)(((B)b1.theA).theC)).theB == b1.theA); + test((((B)b1.theA).theC).theB == b1.theA); test(b1.preMarshalInvoked); test(b1.postUnmarshalInvoked(null)); test(b1.theA.preMarshalInvoked); diff --git a/java/test/Ice/objects/BI.java b/java/test/Ice/objects/BI.java index e4c4817568f..09aebe13501 100644 --- a/java/test/Ice/objects/BI.java +++ b/java/test/Ice/objects/BI.java @@ -19,18 +19,21 @@ public final class BI extends B _postUnmarshalInvoked = false; } + @Override public boolean postUnmarshalInvoked(Ice.Current current) { return _postUnmarshalInvoked; } + @Override public void ice_preMarshal() { preMarshalInvoked = true; } + @Override public void ice_postUnmarshal() { diff --git a/java/test/Ice/objects/CI.java b/java/test/Ice/objects/CI.java index 82261e1342d..f46501a241c 100644 --- a/java/test/Ice/objects/CI.java +++ b/java/test/Ice/objects/CI.java @@ -20,18 +20,21 @@ public final class CI extends C _postUnmarshalInvoked = false; } + @Override public boolean postUnmarshalInvoked(Ice.Current current) { return _postUnmarshalInvoked; } + @Override public void ice_preMarshal() { preMarshalInvoked = true; } + @Override public void ice_postUnmarshal() { diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java index a7f29457ed1..3d9f3803bc5 100644 --- a/java/test/Ice/objects/Client.java +++ b/java/test/Ice/objects/Client.java @@ -15,6 +15,7 @@ public class Client extends test.Util.Application { private static class MyObjectFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { if(type.equals("::Test::B")) @@ -54,12 +55,14 @@ public class Client extends test.Util.Application return null; } + @Override public void destroy() { // Nothing to do } } + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -78,6 +81,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java index b5a09a1475a..06d1f4bf5fd 100644 --- a/java/test/Ice/objects/Collocated.java +++ b/java/test/Ice/objects/Collocated.java @@ -15,6 +15,7 @@ public class Collocated extends test.Util.Application { private static class MyObjectFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { if(type.equals("::Test::B")) @@ -54,12 +55,14 @@ public class Collocated extends test.Util.Application return null; } + @Override public void destroy() { // Nothing to do } } + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -86,6 +89,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/objects/DI.java b/java/test/Ice/objects/DI.java index c66669bcc55..660efcd277c 100644 --- a/java/test/Ice/objects/DI.java +++ b/java/test/Ice/objects/DI.java @@ -20,18 +20,21 @@ public final class DI extends D _postUnmarshalInvoked = false; } + @Override public boolean postUnmarshalInvoked(Ice.Current current) { return _postUnmarshalInvoked; } + @Override public void ice_preMarshal() { preMarshalInvoked = true; } + @Override public void ice_postUnmarshal() { diff --git a/java/test/Ice/objects/EI.java b/java/test/Ice/objects/EI.java index d72e7ce0551..e4930e1644d 100644 --- a/java/test/Ice/objects/EI.java +++ b/java/test/Ice/objects/EI.java @@ -20,6 +20,7 @@ public final class EI extends E super(1, "hello"); } + @Override public boolean checkValues(Ice.Current current) { diff --git a/java/test/Ice/objects/FI.java b/java/test/Ice/objects/FI.java index a86a69cff52..d51461c8031 100644 --- a/java/test/Ice/objects/FI.java +++ b/java/test/Ice/objects/FI.java @@ -26,6 +26,7 @@ public final class FI extends F super(e, e); } + @Override public boolean checkValues(Ice.Current current) { diff --git a/java/test/Ice/objects/InitialI.java b/java/test/Ice/objects/InitialI.java index 6aab2cc1967..2678d597cce 100644 --- a/java/test/Ice/objects/InitialI.java +++ b/java/test/Ice/objects/InitialI.java @@ -53,6 +53,7 @@ public final class InitialI extends Initial _d.theC = null; // Reference to a C. } + @Override public void getAll(BHolder b1, BHolder b2, CHolder c, DHolder d, Ice.Current current) { @@ -66,6 +67,7 @@ public final class InitialI extends Initial d.value = _d; } + @Override public B getB1(Ice.Current current) { @@ -75,6 +77,7 @@ public final class InitialI extends Initial return _b1; } + @Override public B getB2(Ice.Current current) { @@ -84,6 +87,7 @@ public final class InitialI extends Initial return _b2; } + @Override public C getC(Ice.Current current) { @@ -93,6 +97,7 @@ public final class InitialI extends Initial return _c; } + @Override public D getD(Ice.Current current) { @@ -103,41 +108,48 @@ public final class InitialI extends Initial return _d; } + @Override public E getE(Ice.Current current) { return _e; } + @Override public F getF(Ice.Current current) { return _f; } + @Override public I getI(Ice.Current current) { return new II(); } + @Override public I getJ(Ice.Current current) { return new JI(); } + @Override public I getH(Ice.Current current) { return new HI(); } + @Override public void setI(I theI, Ice.Current current) { } + @Override public Base[] opBaseSeq(Base[] inS, BaseSeqHolder outS, Ice.Current current) { @@ -145,12 +157,14 @@ public final class InitialI extends Initial return inS; } + @Override public Compact getCompact(Ice.Current current) { return new CompactExt(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java index 8a6435880d8..d327e7d5b53 100644 --- a/java/test/Ice/objects/Server.java +++ b/java/test/Ice/objects/Server.java @@ -13,6 +13,7 @@ public class Server extends test.Util.Application { private static class MyObjectFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { if(type.equals("::Test::I")) @@ -32,12 +33,14 @@ public class Server extends test.Util.Application return null; } + @Override public void destroy() { // Nothing to do } } + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -56,6 +59,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java b/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java index 5c6af83b1e9..f9b0e8deb7a 100644 --- a/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java +++ b/java/test/Ice/objects/UnexpectedObjectExceptionTestI.java @@ -15,6 +15,7 @@ import test.Ice.objects.Test.AlsoEmptyHelper; public final class UnexpectedObjectExceptionTestI extends Ice.Blobject { + @Override public boolean ice_invoke(byte[] inParams, Ice.ByteSeqHolder outParams, Ice.Current current) { diff --git a/java/test/Ice/operations/AMDMyDerivedClassI.java b/java/test/Ice/operations/AMDMyDerivedClassI.java index 6314a29df45..f577db345c1 100644 --- a/java/test/Ice/operations/AMDMyDerivedClassI.java +++ b/java/test/Ice/operations/AMDMyDerivedClassI.java @@ -71,6 +71,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass _cb = cb; } + @Override public void run() { @@ -84,6 +85,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass // Override the Object "pseudo" operations to verify the operation mode. // + @Override public boolean ice_isA(String id, Ice.Current current) { @@ -91,6 +93,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass return super.ice_isA(id, current); } + @Override public void ice_ping(Ice.Current current) { @@ -98,6 +101,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass super.ice_ping(current); } + @Override public String[] ice_ids(Ice.Current current) { @@ -105,6 +109,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass return super.ice_ids(current); } + @Override public String ice_id(Ice.Current current) { @@ -112,6 +117,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass return super.ice_id(current); } + @Override synchronized public void shutdown_async(AMD_MyClass_shutdown cb, Ice.Current current) @@ -132,6 +138,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(); } + @Override public void delay_async(AMD_MyClass_delay cb, int ms, Ice.Current current) { @@ -145,6 +152,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(); } + @Override synchronized public void opVoid_async(AMD_MyClass_opVoid cb, Ice.Current current) @@ -167,6 +175,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass _opVoidThread.start(); } + @Override public void opBool_async(AMD_MyClass_opBool cb, boolean p1, boolean p2, @@ -175,6 +184,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p2, p1); } + @Override public void opBoolS_async(AMD_MyClass_opBoolS cb, boolean[] p1, boolean[] p2, @@ -192,6 +202,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opBoolSS_async(AMD_MyClass_opBoolSS cb, boolean[][] p1, boolean[][] p2, @@ -209,6 +220,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opByte_async(AMD_MyClass_opByte cb, byte p1, byte p2, @@ -217,6 +229,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p1, (byte)(p1 ^ p2)); } + @Override public void opByteBoolD_async(AMD_MyClass_opByteBoolD cb, java.util.Map<Byte, Boolean> p1, java.util.Map<Byte, Boolean> p2, @@ -229,6 +242,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opByteS_async(AMD_MyClass_opByteS cb, byte[] p1, byte[] p2, @@ -246,6 +260,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opByteSS_async(AMD_MyClass_opByteSS cb, byte[][] p1, byte[][] p2, @@ -263,6 +278,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opFloatDouble_async(AMD_MyClass_opFloatDouble cb, float p1, double p2, @@ -271,6 +287,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p2, p1, p2); } + @Override public void opFloatDoubleS_async(AMD_MyClass_opFloatDoubleS cb, float[] p1, double[] p2, @@ -291,6 +308,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3, p4); } + @Override public void opFloatDoubleSS_async(AMD_MyClass_opFloatDoubleSS cb, float[][] p1, double[][] p2, @@ -308,6 +326,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3, p4); } + @Override public void opLongFloatD_async(AMD_MyClass_opLongFloatD cb, java.util.Map<Long, Float> p1, java.util.Map<Long, Float> p2, @@ -320,6 +339,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opMyClass_async(AMD_MyClass_opMyClass cb, MyClassPrx p1, @@ -331,6 +351,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3); } + @Override public void opMyEnum_async(AMD_MyClass_opMyEnum cb, MyEnum p1, @@ -339,6 +360,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(MyEnum.enum3, p1); } + @Override public void opShortIntD_async(AMD_MyClass_opShortIntD cb, java.util.Map<Short, Integer> p1, java.util.Map<Short, Integer> p2, @@ -351,6 +373,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opShortIntLong_async(AMD_MyClass_opShortIntLong cb, short p1, int p2, long p3, @@ -359,6 +382,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p3, p1, p2, p3); } + @Override public void opShortIntLongS_async(AMD_MyClass_opShortIntLongS cb, short[] p1, int[] p2, long[] p3, @@ -376,6 +400,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p3, p4, p5, p6); } + @Override public void opShortIntLongSS_async(AMD_MyClass_opShortIntLongSS cb, short[][] p1, int[][] p2, long[][] p3, @@ -393,6 +418,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p3, p4, p5, p6); } + @Override public void opString_async(AMD_MyClass_opString cb, String p1, String p2, @@ -401,6 +427,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p1 + " " + p2, p2 + " " + p1); } + @Override public void opStringMyEnumD_async(AMD_MyClass_opStringMyEnumD cb, java.util.Map<String, MyEnum> p1, java.util.Map<String, MyEnum> p2, @@ -413,6 +440,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opMyEnumStringD_async(AMD_MyClass_opMyEnumStringD cb, java.util.Map<MyEnum, String> p1, java.util.Map<MyEnum, String> p2, @@ -425,6 +453,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opMyStructMyEnumD_async(AMD_MyClass_opMyStructMyEnumD cb, java.util.Map<MyStruct, MyEnum> p1, java.util.Map<MyStruct, MyEnum> p2, @@ -437,6 +466,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opIntS_async(AMD_MyClass_opIntS cb, int[] s, Ice.Current current) { @@ -448,18 +478,21 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r); } + @Override public void opByteSOneway_async(AMD_MyClass_opByteSOneway cb, byte[] s, Ice.Current current) { cb.ice_response(); } + @Override public void opContext_async(AMD_MyClass_opContext cb, Ice.Current current) { cb.ice_response(current.ctx); } + @Override public void opDoubleMarshaling_async(AMD_MyClass_opDoubleMarshaling cb, double p1, double[] p2, Ice.Current current) { @@ -472,6 +505,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(); } + @Override public void opStringS_async(AMD_MyClass_opStringS cb, String[] p1, String[] p2, @@ -489,6 +523,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opStringSS_async(AMD_MyClass_opStringSS cb, String[][] p1, String[][] p2, @@ -506,6 +541,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opStringSSS_async(AMD_MyClass_opStringSSS cb, String[][][] p1, String[][][] p2, @@ -523,6 +559,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opStringStringD_async(AMD_MyClass_opStringStringD cb, java.util.Map<String, String> p1, java.util.Map<String, String> p2, @@ -535,6 +572,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(r, p3); } + @Override public void opStruct_async(AMD_MyClass_opStruct cb, Structure p1, Structure p2, @@ -545,6 +583,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(p2, p3); } + @Override public void opIdempotent_async(AMD_MyClass_opIdempotent cb, Ice.Current current) @@ -553,6 +592,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(); } + @Override public void opNonmutating_async(AMD_MyClass_opNonmutating cb, Ice.Current current) @@ -561,6 +601,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(); } + @Override public void opDerived_async(AMD_MyDerivedClass_opDerived cb, Ice.Current current) diff --git a/java/test/Ice/operations/AMDServer.java b/java/test/Ice/operations/AMDServer.java index 5c9499a7628..063af513e84 100644 --- a/java/test/Ice/operations/AMDServer.java +++ b/java/test/Ice/operations/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.operations; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -20,6 +21,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/operations/AMDTieMyDerivedClassI.java b/java/test/Ice/operations/AMDTieMyDerivedClassI.java index fc285192c46..8d2e26b48d1 100644 --- a/java/test/Ice/operations/AMDTieMyDerivedClassI.java +++ b/java/test/Ice/operations/AMDTieMyDerivedClassI.java @@ -47,7 +47,6 @@ import test.Ice.operations.AMD.Test.AMD_MyClass_delay; import test.Ice.operations.AMD.Test.AMD_MyDerivedClass_opDerived; import test.Ice.operations.AMD.Test.MyClassPrx; import test.Ice.operations.AMD.Test.MyClassPrxHelper; -import test.Ice.operations.AMD.Test.MyDerivedClass; import test.Ice.operations.AMD.Test._MyDerivedClassOperations; import test.Ice.operations.AMD.Test.MyEnum; import test.Ice.operations.AMD.Test.MyStruct; @@ -72,6 +71,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations _cb = cb; } + @Override public void run() { @@ -81,6 +81,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations private AMD_MyClass_opVoid _cb; } + @Override synchronized public void shutdown_async(AMD_MyClass_shutdown cb, Ice.Current current) @@ -101,6 +102,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(); } + @Override public void delay_async(AMD_MyClass_delay cb, int ms, Ice.Current current) { @@ -114,6 +116,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(); } + @Override synchronized public void opVoid_async(AMD_MyClass_opVoid cb, Ice.Current current) @@ -136,6 +139,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations _opVoidThread.start(); } + @Override public void opBool_async(AMD_MyClass_opBool cb, boolean p1, boolean p2, @@ -144,6 +148,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p2, p1); } + @Override public void opBoolS_async(AMD_MyClass_opBoolS cb, boolean[] p1, boolean[] p2, @@ -161,6 +166,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opBoolSS_async(AMD_MyClass_opBoolSS cb, boolean[][] p1, boolean[][] p2, @@ -178,6 +184,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opByte_async(AMD_MyClass_opByte cb, byte p1, byte p2, @@ -186,6 +193,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p1, (byte)(p1 ^ p2)); } + @Override public void opByteBoolD_async(AMD_MyClass_opByteBoolD cb, java.util.Map<Byte, Boolean> p1, java.util.Map<Byte, Boolean> p2, @@ -198,6 +206,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opByteS_async(AMD_MyClass_opByteS cb, byte[] p1, byte[] p2, @@ -215,6 +224,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opByteSS_async(AMD_MyClass_opByteSS cb, byte[][] p1, byte[][] p2, @@ -232,6 +242,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opFloatDouble_async(AMD_MyClass_opFloatDouble cb, float p1, double p2, @@ -240,6 +251,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p2, p1, p2); } + @Override public void opFloatDoubleS_async(AMD_MyClass_opFloatDoubleS cb, float[] p1, double[] p2, @@ -260,6 +272,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3, p4); } + @Override public void opFloatDoubleSS_async(AMD_MyClass_opFloatDoubleSS cb, float[][] p1, double[][] p2, @@ -277,6 +290,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3, p4); } + @Override public void opLongFloatD_async(AMD_MyClass_opLongFloatD cb, java.util.Map<Long, Float> p1, java.util.Map<Long, Float> p2, @@ -289,6 +303,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opMyClass_async(AMD_MyClass_opMyClass cb, MyClassPrx p1, @@ -300,6 +315,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3); } + @Override public void opMyEnum_async(AMD_MyClass_opMyEnum cb, MyEnum p1, @@ -308,6 +324,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(MyEnum.enum3, p1); } + @Override public void opShortIntD_async(AMD_MyClass_opShortIntD cb, java.util.Map<Short, Integer> p1, java.util.Map<Short, Integer> p2, @@ -320,6 +337,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opShortIntLong_async(AMD_MyClass_opShortIntLong cb, short p1, int p2, long p3, @@ -328,6 +346,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p3, p1, p2, p3); } + @Override public void opShortIntLongS_async(AMD_MyClass_opShortIntLongS cb, short[] p1, int[] p2, long[] p3, @@ -345,6 +364,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p3, p4, p5, p6); } + @Override public void opShortIntLongSS_async(AMD_MyClass_opShortIntLongSS cb, short[][] p1, int[][] p2, long[][] p3, @@ -362,6 +382,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p3, p4, p5, p6); } + @Override public void opString_async(AMD_MyClass_opString cb, String p1, String p2, @@ -370,6 +391,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p1 + " " + p2, p2 + " " + p1); } + @Override public void opStringMyEnumD_async(AMD_MyClass_opStringMyEnumD cb, java.util.Map<String, MyEnum> p1, java.util.Map<String, MyEnum> p2, @@ -382,6 +404,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opMyEnumStringD_async(AMD_MyClass_opMyEnumStringD cb, java.util.Map<MyEnum, String> p1, java.util.Map<MyEnum, String> p2, @@ -394,6 +417,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opMyStructMyEnumD_async(AMD_MyClass_opMyStructMyEnumD cb, java.util.Map<MyStruct, MyEnum> p1, java.util.Map<MyStruct, MyEnum> p2, @@ -406,6 +430,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opIntS_async(AMD_MyClass_opIntS cb, int[] s, Ice.Current current) { @@ -417,18 +442,21 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r); } + @Override public void opByteSOneway_async(AMD_MyClass_opByteSOneway cb, byte[] s, Ice.Current current) { cb.ice_response(); } + @Override public void opContext_async(AMD_MyClass_opContext cb, Ice.Current current) { cb.ice_response(current.ctx); } + @Override public void opDoubleMarshaling_async(AMD_MyClass_opDoubleMarshaling cb, double p1, double[] p2, Ice.Current current) { @@ -441,6 +469,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(); } + @Override public void opStringS_async(AMD_MyClass_opStringS cb, String[] p1, String[] p2, @@ -458,6 +487,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opStringSS_async(AMD_MyClass_opStringSS cb, String[][] p1, String[][] p2, @@ -475,6 +505,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opStringSSS_async(AMD_MyClass_opStringSSS cb, String[][][] p1, String[][][] p2, @@ -492,6 +523,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opStringStringD_async(AMD_MyClass_opStringStringD cb, java.util.Map<String, String> p1, java.util.Map<String, String> p2, @@ -504,6 +536,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(r, p3); } + @Override public void opStruct_async(AMD_MyClass_opStruct cb, Structure p1, Structure p2, @@ -514,6 +547,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(p2, p3); } + @Override public void opIdempotent_async(AMD_MyClass_opIdempotent cb, Ice.Current current) @@ -522,6 +556,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(); } + @Override public void opNonmutating_async(AMD_MyClass_opNonmutating cb, Ice.Current current) @@ -530,6 +565,7 @@ public final class AMDTieMyDerivedClassI implements _MyDerivedClassOperations cb.ice_response(); } + @Override public void opDerived_async(AMD_MyDerivedClass_opDerived cb, Ice.Current current) diff --git a/java/test/Ice/operations/AMDTieServer.java b/java/test/Ice/operations/AMDTieServer.java index 82f69f5e35a..af88539eb00 100644 --- a/java/test/Ice/operations/AMDTieServer.java +++ b/java/test/Ice/operations/AMDTieServer.java @@ -13,6 +13,7 @@ import test.Ice.operations.AMD.Test._MyDerivedClassTie; public class AMDTieServer extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -22,6 +23,7 @@ public class AMDTieServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java index ed4ef912ac6..2c957a13e34 100644 --- a/java/test/Ice/operations/Client.java +++ b/java/test/Ice/operations/Client.java @@ -13,6 +13,7 @@ import test.Ice.operations.Test.MyClassPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { java.io.PrintWriter out = getWriter(); @@ -34,6 +35,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java index 451b098cd64..c34d07d5f11 100644 --- a/java/test/Ice/operations/Collocated.java +++ b/java/test/Ice/operations/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.operations; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -29,6 +30,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java index 9c13c03e4c8..5fddb73a3d5 100644 --- a/java/test/Ice/operations/MyDerivedClassI.java +++ b/java/test/Ice/operations/MyDerivedClassI.java @@ -58,6 +58,7 @@ public final class MyDerivedClassI extends MyDerivedClass // Override the Object "pseudo" operations to verify the operation mode. // + @Override public boolean ice_isA(String id, Ice.Current current) { @@ -65,6 +66,7 @@ public final class MyDerivedClassI extends MyDerivedClass return super.ice_isA(id, current); } + @Override public void ice_ping(Ice.Current current) { @@ -72,6 +74,7 @@ public final class MyDerivedClassI extends MyDerivedClass super.ice_ping(current); } + @Override public String[] ice_ids(Ice.Current current) { @@ -79,6 +82,7 @@ public final class MyDerivedClassI extends MyDerivedClass return super.ice_ids(current); } + @Override public String ice_id(Ice.Current current) { @@ -86,12 +90,14 @@ public final class MyDerivedClassI extends MyDerivedClass return super.ice_id(current); } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public void delay(int ms, Ice.Current current) { @@ -104,12 +110,14 @@ public final class MyDerivedClassI extends MyDerivedClass } } + @Override public void opVoid(Ice.Current current) { test(current.mode == Ice.OperationMode.Normal); } + @Override public boolean opBool(boolean p1, boolean p2, Ice.BooleanHolder p3, @@ -119,6 +127,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p2; } + @Override public boolean[] opBoolS(boolean[] p1, boolean[] p2, BoolSHolder p3, @@ -136,6 +145,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public boolean[][] opBoolSS(boolean[][] p1, boolean[][] p2, BoolSSHolder p3, @@ -153,6 +163,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public byte opByte(byte p1, byte p2, Ice.ByteHolder p3, @@ -162,6 +173,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p1; } + @Override public java.util.Map<Byte, Boolean> opByteBoolD(java.util.Map<Byte, Boolean> p1, java.util.Map<Byte, Boolean> p2, ByteBoolDHolder p3, Ice.Current current) @@ -173,6 +185,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public byte[] opByteS(byte[] p1, byte[] p2, ByteSHolder p3, @@ -190,6 +203,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public byte[][] opByteSS(byte[][] p1, byte[][] p2, ByteSSHolder p3, @@ -207,6 +221,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public double opFloatDouble(float p1, double p2, Ice.FloatHolder p3, Ice.DoubleHolder p4, @@ -217,6 +232,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p2; } + @Override public double[] opFloatDoubleS(float[] p1, double[] p2, FloatSHolder p3, DoubleSHolder p4, @@ -237,6 +253,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public double[][] opFloatDoubleSS(float[][] p1, double[][] p2, FloatSSHolder p3, DoubleSSHolder p4, @@ -254,6 +271,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public java.util.Map<Long, Float> opLongFloatD(java.util.Map<Long, Float> p1, java.util.Map<Long, Float> p2, LongFloatDHolder p3, Ice.Current current) @@ -265,6 +283,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public MyClassPrx opMyClass(MyClassPrx p1, MyClassPrxHolder p2, MyClassPrxHolder p3, @@ -276,6 +295,7 @@ public final class MyDerivedClassI extends MyDerivedClass return MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)); } + @Override public MyEnum opMyEnum(MyEnum p1, MyEnumHolder p2, @@ -285,6 +305,7 @@ public final class MyDerivedClassI extends MyDerivedClass return MyEnum.enum3; } + @Override public java.util.Map<Short, Integer> opShortIntD(java.util.Map<Short, Integer> p1, java.util.Map<Short, Integer> p2, ShortIntDHolder p3, Ice.Current current) @@ -296,6 +317,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public long opShortIntLong(short p1, int p2, long p3, Ice.ShortHolder p4, Ice.IntHolder p5, Ice.LongHolder p6, @@ -307,6 +329,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p3; } + @Override public long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, ShortSHolder p4, IntSHolder p5, LongSHolder p6, @@ -324,6 +347,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p3; } + @Override public long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, ShortSSHolder p4, IntSSHolder p5, LongSSHolder p6, @@ -341,6 +365,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p3; } + @Override public String opString(String p1, String p2, Ice.StringHolder p3, @@ -350,6 +375,7 @@ public final class MyDerivedClassI extends MyDerivedClass return p1 + " " + p2; } + @Override public java.util.Map<String, MyEnum> opStringMyEnumD(java.util.Map<String, MyEnum> p1, java.util.Map<String, MyEnum> p2, StringMyEnumDHolder p3, Ice.Current current) @@ -361,6 +387,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public java.util.Map<MyEnum, String> opMyEnumStringD(java.util.Map<MyEnum, String> p1, java.util.Map<MyEnum, String> p2, MyEnumStringDHolder p3, Ice.Current current) @@ -372,6 +399,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public java.util.Map<MyStruct, MyEnum> opMyStructMyEnumD(java.util.Map<MyStruct, MyEnum> p1, java.util.Map<MyStruct, MyEnum> p2, MyStructMyEnumDHolder p3, Ice.Current current) @@ -383,6 +411,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public int[] opIntS(int[] s, Ice.Current current) { @@ -394,17 +423,20 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public void opByteSOneway(byte[] s, Ice.Current current) { } + @Override public java.util.Map<String, String> opContext(Ice.Current current) { return current.ctx; } + @Override public void opDoubleMarshaling(double p1, double[] p2, Ice.Current current) { @@ -416,6 +448,7 @@ public final class MyDerivedClassI extends MyDerivedClass } } + @Override public String[] opStringS(String[] p1, String[] p2, StringSHolder p3, @@ -433,6 +466,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public String[][] opStringSS(String[][] p1, String[][] p2, StringSSHolder p3, @@ -450,6 +484,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public String[][][] opStringSSS(String[][][] p1, String[][][] p2, StringSSSHolder p3, @@ -467,6 +502,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public java.util.Map<String, String> opStringStringD(java.util.Map<String, String> p1, java.util.Map<String, String> p2, StringStringDHolder p3, Ice.Current current) @@ -478,6 +514,7 @@ public final class MyDerivedClassI extends MyDerivedClass return r; } + @Override public Structure opStruct(Structure p1, Structure p2, StructureHolder p3, @@ -488,18 +525,21 @@ public final class MyDerivedClassI extends MyDerivedClass return p2; } + @Override public void opIdempotent(Ice.Current current) { test(current.mode == Ice.OperationMode.Idempotent); } + @Override public void opNonmutating(Ice.Current current) { test(current.mode == Ice.OperationMode.Nonmutating); } + @Override public void opDerived(Ice.Current current) { diff --git a/java/test/Ice/operations/Oneways.java b/java/test/Ice/operations/Oneways.java index 823213ca575..ded8ee39b3d 100644 --- a/java/test/Ice/operations/Oneways.java +++ b/java/test/Ice/operations/Oneways.java @@ -26,7 +26,6 @@ class Oneways static void oneways(test.Util.Application app, MyClassPrx p) { - Ice.Communicator communicator = app.communicator(); p = MyClassPrxHelper.uncheckedCast(p.ice_oneway()); { @@ -48,10 +47,9 @@ class Oneways { Ice.ByteHolder b = new Ice.ByteHolder(); - byte r; try { - r = p.opByte((byte)0xff, (byte)0x0f, b); + p.opByte((byte)0xff, (byte)0x0f, b); test(false); } catch(Ice.TwowayOnlyException ex) diff --git a/java/test/Ice/operations/OnewaysAMI.java b/java/test/Ice/operations/OnewaysAMI.java index 98316b3b509..9e2cbff880d 100644 --- a/java/test/Ice/operations/OnewaysAMI.java +++ b/java/test/Ice/operations/OnewaysAMI.java @@ -64,12 +64,14 @@ class OnewaysAMI private static class AMI_MyClass_opVoidI extends AMI_MyClass_opVoid { + @Override public void ice_response() { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -79,12 +81,14 @@ class OnewaysAMI private static class AMI_MyClass_opIdempotentI extends AMI_MyClass_opIdempotent { + @Override public void ice_response() { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -94,12 +98,14 @@ class OnewaysAMI private static class AMI_MyClass_opNonmutatingI extends AMI_MyClass_opNonmutating { + @Override public void ice_response() { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -109,12 +115,14 @@ class OnewaysAMI private static class AMI_MyClass_opVoidExI extends AMI_MyClass_opVoid { + @Override public void ice_response() { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -133,12 +141,14 @@ class OnewaysAMI private static class AMI_MyClass_opByteExI extends AMI_MyClass_opByte { + @Override public void ice_response(byte r, byte b) { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -158,7 +168,6 @@ class OnewaysAMI static void onewaysAMI(test.Util.Application app, MyClassPrx p) { - Ice.Communicator communicator = app.communicator(); p = MyClassPrxHelper.uncheckedCast(p.ice_oneway()); { diff --git a/java/test/Ice/operations/OnewaysNewAMI.java b/java/test/Ice/operations/OnewaysNewAMI.java index c5534a34a39..55f17e4f25e 100644 --- a/java/test/Ice/operations/OnewaysNewAMI.java +++ b/java/test/Ice/operations/OnewaysNewAMI.java @@ -12,11 +12,7 @@ package test.Ice.operations; import test.Ice.operations.Test.Callback_MyClass_opIdempotent; import test.Ice.operations.Test.Callback_MyClass_opNonmutating; import test.Ice.operations.Test.Callback_MyClass_opVoid; -import test.Ice.operations.Test.MyClass; import test.Ice.operations.Test.MyClassPrx; -import test.Ice.operations.Test.MyClassPrxHelper; -import test.Ice.operations.Test.Callback_MyClass_opVoid; -import test.Ice.operations.Test.Callback_MyClass_opByte; class OnewaysNewAMI { @@ -83,25 +79,27 @@ class OnewaysNewAMI static void onewaysNewAMI(test.Util.Application app, MyClassPrx proxy) { - Ice.Communicator communicator = app.communicator(); MyClassPrx p = (MyClassPrx)proxy.ice_oneway(); { final Callback cb = new Callback(); Ice.Callback_Object_ice_ping callback = new Ice.Callback_Object_ice_ping() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { cb.noException(ex); } + @Override public void sent(boolean sentSynchronously) { @@ -149,18 +147,21 @@ class OnewaysNewAMI final Callback cb = new Callback(); Callback_MyClass_opVoid callback = new Callback_MyClass_opVoid() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { cb.noException(ex); } + @Override public void sent(boolean sentSynchronously) { @@ -175,18 +176,21 @@ class OnewaysNewAMI final Callback cb = new Callback(); Callback_MyClass_opIdempotent callback = new Callback_MyClass_opIdempotent() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { cb.noException(ex); } + @Override public void sent(boolean sentSynchronously) { @@ -201,18 +205,21 @@ class OnewaysNewAMI final Callback cb = new Callback(); Callback_MyClass_opNonmutating callback = new Callback_MyClass_opNonmutating() { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException ex) { cb.noException(ex); } + @Override public void sent(boolean sentSynchronously) { diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java index f88d09ccb3f..22dba1da02b 100644 --- a/java/test/Ice/operations/Server.java +++ b/java/test/Ice/operations/Server.java @@ -11,6 +11,7 @@ package test.Ice.operations; public class Server extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/operations/TieMyDerivedClassI.java b/java/test/Ice/operations/TieMyDerivedClassI.java index 4903d5dc924..cbd7a833f15 100644 --- a/java/test/Ice/operations/TieMyDerivedClassI.java +++ b/java/test/Ice/operations/TieMyDerivedClassI.java @@ -26,7 +26,6 @@ import test.Ice.operations.Test.LongSSHolder; import test.Ice.operations.Test.MyClassPrx; import test.Ice.operations.Test.MyClassPrxHelper; import test.Ice.operations.Test.MyClassPrxHolder; -import test.Ice.operations.Test.MyDerivedClass; import test.Ice.operations.Test._MyDerivedClassOperations; import test.Ice.operations.Test.MyEnum; import test.Ice.operations.Test.MyEnumHolder; @@ -55,12 +54,14 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations } } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public void delay(int ms, Ice.Current current) { @@ -73,12 +74,14 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations } } + @Override public void opVoid(Ice.Current current) { test(current.mode == Ice.OperationMode.Normal); } + @Override public boolean opBool(boolean p1, boolean p2, Ice.BooleanHolder p3, @@ -88,6 +91,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p2; } + @Override public boolean[] opBoolS(boolean[] p1, boolean[] p2, BoolSHolder p3, @@ -105,6 +109,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public boolean[][] opBoolSS(boolean[][] p1, boolean[][] p2, BoolSSHolder p3, @@ -122,6 +127,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public byte opByte(byte p1, byte p2, Ice.ByteHolder p3, @@ -131,6 +137,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p1; } + @Override public java.util.Map<Byte, Boolean> opByteBoolD(java.util.Map<Byte, Boolean> p1, java.util.Map<Byte, Boolean> p2, ByteBoolDHolder p3, Ice.Current current) @@ -142,6 +149,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public byte[] opByteS(byte[] p1, byte[] p2, ByteSHolder p3, @@ -159,6 +167,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public byte[][] opByteSS(byte[][] p1, byte[][] p2, ByteSSHolder p3, @@ -176,6 +185,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public double opFloatDouble(float p1, double p2, Ice.FloatHolder p3, Ice.DoubleHolder p4, @@ -186,6 +196,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p2; } + @Override public double[] opFloatDoubleS(float[] p1, double[] p2, FloatSHolder p3, DoubleSHolder p4, @@ -206,6 +217,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public double[][] opFloatDoubleSS(float[][] p1, double[][] p2, FloatSSHolder p3, DoubleSSHolder p4, @@ -223,6 +235,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public java.util.Map<Long, Float> opLongFloatD(java.util.Map<Long, Float> p1, java.util.Map<Long, Float> p2, LongFloatDHolder p3, Ice.Current current) @@ -234,6 +247,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public MyClassPrx opMyClass(MyClassPrx p1, MyClassPrxHolder p2, MyClassPrxHolder p3, @@ -245,6 +259,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)); } + @Override public MyEnum opMyEnum(MyEnum p1, MyEnumHolder p2, @@ -254,6 +269,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return MyEnum.enum3; } + @Override public java.util.Map<Short, Integer> opShortIntD(java.util.Map<Short, Integer> p1, java.util.Map<Short, Integer> p2, ShortIntDHolder p3, Ice.Current current) @@ -265,6 +281,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public long opShortIntLong(short p1, int p2, long p3, Ice.ShortHolder p4, Ice.IntHolder p5, Ice.LongHolder p6, @@ -276,6 +293,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p3; } + @Override public long[] opShortIntLongS(short[] p1, int[] p2, long[] p3, ShortSHolder p4, IntSHolder p5, LongSHolder p6, @@ -293,6 +311,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p3; } + @Override public long[][] opShortIntLongSS(short[][] p1, int[][] p2, long[][] p3, ShortSSHolder p4, IntSSHolder p5, LongSSHolder p6, @@ -310,6 +329,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p3; } + @Override public String opString(String p1, String p2, Ice.StringHolder p3, @@ -319,6 +339,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p1 + " " + p2; } + @Override public java.util.Map<String, MyEnum> opStringMyEnumD(java.util.Map<String, MyEnum> p1, java.util.Map<String, MyEnum> p2, StringMyEnumDHolder p3, Ice.Current current) @@ -330,6 +351,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public java.util.Map<MyEnum, String> opMyEnumStringD(java.util.Map<MyEnum, String> p1, java.util.Map<MyEnum, String> p2, MyEnumStringDHolder p3, Ice.Current current) @@ -341,6 +363,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public java.util.Map<MyStruct, MyEnum> opMyStructMyEnumD(java.util.Map<MyStruct, MyEnum> p1, java.util.Map<MyStruct, MyEnum> p2, MyStructMyEnumDHolder p3, Ice.Current current) @@ -352,6 +375,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public int[] opIntS(int[] s, Ice.Current current) { @@ -363,17 +387,20 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public void opByteSOneway(byte[] s, Ice.Current current) { } + @Override public java.util.Map<String, String> opContext(Ice.Current current) { return current.ctx; } + @Override public void opDoubleMarshaling(double p1, double[] p2, Ice.Current current) { @@ -385,6 +412,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations } } + @Override public String[] opStringS(String[] p1, String[] p2, StringSHolder p3, @@ -402,6 +430,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public String[][] opStringSS(String[][] p1, String[][] p2, StringSSHolder p3, @@ -419,6 +448,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public String[][][] opStringSSS(String[][][] p1, String[][][] p2, StringSSSHolder p3, @@ -436,6 +466,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public java.util.Map<String, String> opStringStringD(java.util.Map<String, String> p1, java.util.Map<String, String> p2, StringStringDHolder p3, Ice.Current current) @@ -447,6 +478,7 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return r; } + @Override public Structure opStruct(Structure p1, Structure p2, StructureHolder p3, @@ -457,18 +489,21 @@ public final class TieMyDerivedClassI implements _MyDerivedClassOperations return p2; } + @Override public void opIdempotent(Ice.Current current) { test(current.mode == Ice.OperationMode.Idempotent); } + @Override public void opNonmutating(Ice.Current current) { test(current.mode == Ice.OperationMode.Nonmutating); } + @Override public void opDerived(Ice.Current current) { diff --git a/java/test/Ice/operations/TieServer.java b/java/test/Ice/operations/TieServer.java index 65e4cdc3b49..26bbdc7b7b5 100644 --- a/java/test/Ice/operations/TieServer.java +++ b/java/test/Ice/operations/TieServer.java @@ -13,6 +13,7 @@ import test.Ice.operations.Test._MyDerivedClassTie; public class TieServer extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -22,6 +23,7 @@ public class TieServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java index a8841c774fa..324238d7715 100644 --- a/java/test/Ice/operations/Twoways.java +++ b/java/test/Ice/operations/Twoways.java @@ -61,6 +61,7 @@ class Twoways _proxy = proxy; } + @Override public void run() { diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java index d9d4aaa8d0b..9e87fd0d3dd 100644 --- a/java/test/Ice/operations/TwowaysAMI.java +++ b/java/test/Ice/operations/TwowaysAMI.java @@ -98,12 +98,14 @@ class TwowaysAMI private static class AMI_MyClass_opVoidI extends AMI_MyClass_opVoid { + @Override public void ice_response() { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -121,12 +123,14 @@ class TwowaysAMI private static class AMI_MyClass_opVoidExI extends AMI_MyClass_opVoid { + @Override public void ice_response() { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -145,6 +149,7 @@ class TwowaysAMI private static class AMI_MyClass_opByteI extends AMI_MyClass_opByte { + @Override public void ice_response(byte r, byte b) { @@ -153,6 +158,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -170,12 +176,14 @@ class TwowaysAMI private static class AMI_MyClass_opByteExI extends AMI_MyClass_opByte { + @Override public void ice_response(byte r, byte b) { test(false); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -194,6 +202,7 @@ class TwowaysAMI private static class AMI_MyClass_opBoolI extends AMI_MyClass_opBool { + @Override public void ice_response(boolean r, boolean b) { @@ -202,6 +211,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -219,6 +229,7 @@ class TwowaysAMI private static class AMI_MyClass_opShortIntLongI extends AMI_MyClass_opShortIntLong { + @Override public void ice_response(long r, short s, int i, long l) { @@ -229,6 +240,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -246,6 +258,7 @@ class TwowaysAMI private static class AMI_MyClass_opFloatDoubleI extends AMI_MyClass_opFloatDouble { + @Override public void ice_response(double r, float f, double d) { @@ -255,6 +268,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -272,6 +286,7 @@ class TwowaysAMI private static class AMI_MyClass_opStringI extends AMI_MyClass_opString { + @Override public void ice_response(String r, String s) { @@ -280,6 +295,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -297,6 +313,7 @@ class TwowaysAMI private static class AMI_MyClass_opMyEnumI extends AMI_MyClass_opMyEnum { + @Override public void ice_response(MyEnum r, MyEnum e) { @@ -305,6 +322,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -327,6 +345,7 @@ class TwowaysAMI _communicator = communicator; } + @Override public void ice_response(MyClassPrx r, MyClassPrx c1, MyClassPrx c2) { @@ -350,6 +369,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -373,6 +393,7 @@ class TwowaysAMI _communicator = communicator; } + @Override public void ice_response(Structure rso, Structure so) { @@ -389,6 +410,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -407,6 +429,7 @@ class TwowaysAMI private static class AMI_MyClass_opByteSI extends AMI_MyClass_opByteS { + @Override public void ice_response(byte[] rso, byte[] bso) { @@ -427,6 +450,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -444,6 +468,7 @@ class TwowaysAMI private static class AMI_MyClass_opBoolSI extends AMI_MyClass_opBoolS { + @Override public void ice_response(boolean[] rso, boolean[] bso) { @@ -459,6 +484,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -476,6 +502,7 @@ class TwowaysAMI private static class AMI_MyClass_opShortIntLongSI extends AMI_MyClass_opShortIntLongS { + @Override public void ice_response(long[] rso, short[] sso, int[] iso, long[] lso) @@ -503,6 +530,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -520,6 +548,7 @@ class TwowaysAMI private static class AMI_MyClass_opFloatDoubleSI extends AMI_MyClass_opFloatDoubleS { + @Override public void ice_response(double[] rso, float[] fso, double[] dso) { @@ -539,6 +568,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -556,6 +586,7 @@ class TwowaysAMI private static class AMI_MyClass_opStringSI extends AMI_MyClass_opStringS { + @Override public void ice_response(String[] rso, String[] sso) { @@ -571,6 +602,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -588,6 +620,7 @@ class TwowaysAMI private static class AMI_MyClass_opByteSSI extends AMI_MyClass_opByteSS { + @Override public void ice_response(byte[][] rso, byte[][] bso) { @@ -613,6 +646,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -630,12 +664,14 @@ class TwowaysAMI private static class AMI_MyClass_opBoolSSI extends AMI_MyClass_opBoolSS { + @Override public void ice_response(boolean[][] rso, boolean[][] bso) { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -653,12 +689,14 @@ class TwowaysAMI private static class AMI_MyClass_opShortIntLongSSI extends AMI_MyClass_opShortIntLongSS { + @Override public void ice_response(long[][] rso, short[][] sso, int[][] iso, long[][] lso) { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -676,6 +714,7 @@ class TwowaysAMI private static class AMI_MyClass_opFloatDoubleSSI extends AMI_MyClass_opFloatDoubleSS { + @Override public void ice_response(double[][] rso, float[][] fso, double[][] dso) { @@ -702,6 +741,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -719,6 +759,7 @@ class TwowaysAMI private static class AMI_MyClass_opStringSSI extends AMI_MyClass_opStringSS { + @Override public void ice_response(String[][] rso, String[][] sso) { @@ -740,6 +781,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -757,6 +799,7 @@ class TwowaysAMI private static class AMI_MyClass_opStringSSSI extends AMI_MyClass_opStringSSS { + @Override public void ice_response(String[][][] rsso, String[][][] ssso) { @@ -795,6 +838,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -812,6 +856,7 @@ class TwowaysAMI private static class AMI_MyClass_opByteBoolDI extends AMI_MyClass_opByteBoolD { + @Override public void ice_response(java.util.Map<Byte, Boolean> ro, java.util.Map<Byte, Boolean> _do) { @@ -827,6 +872,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -844,6 +890,7 @@ class TwowaysAMI private static class AMI_MyClass_opShortIntDI extends AMI_MyClass_opShortIntD { + @Override public void ice_response(java.util.Map<Short, Integer> ro, java.util.Map<Short, Integer> _do) { @@ -859,6 +906,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -876,6 +924,7 @@ class TwowaysAMI private static class AMI_MyClass_opLongFloatDI extends AMI_MyClass_opLongFloatD { + @Override public void ice_response(java.util.Map<Long, Float> ro, java.util.Map<Long, Float> _do) { @@ -891,6 +940,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -908,6 +958,7 @@ class TwowaysAMI private static class AMI_MyClass_opStringStringDI extends AMI_MyClass_opStringStringD { + @Override public void ice_response(java.util.Map<String, String> ro, java.util.Map<String, String> _do) { @@ -923,6 +974,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -940,6 +992,7 @@ class TwowaysAMI private static class AMI_MyClass_opStringMyEnumDI extends AMI_MyClass_opStringMyEnumD { + @Override public void ice_response(java.util.Map<String, MyEnum> ro, java.util.Map<String, MyEnum> _do) { @@ -955,6 +1008,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -972,6 +1026,7 @@ class TwowaysAMI private static class AMI_MyClass_opMyEnumStringDI extends AMI_MyClass_opMyEnumStringD { + @Override public void ice_response(java.util.Map<MyEnum, String> ro, java.util.Map<MyEnum, String> _do) { @@ -985,6 +1040,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1002,6 +1058,7 @@ class TwowaysAMI private static class AMI_MyClass_opMyStructMyEnumDI extends AMI_MyClass_opMyStructMyEnumD { + @Override public void ice_response(java.util.Map<MyStruct, MyEnum> ro, java.util.Map<MyStruct, MyEnum> _do) { @@ -1021,6 +1078,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1043,6 +1101,7 @@ class TwowaysAMI _l = l; } + @Override public void ice_response(int[] r) { @@ -1054,6 +1113,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1077,6 +1137,7 @@ class TwowaysAMI _d = d; } + @Override public void ice_response(java.util.Map r) { @@ -1084,6 +1145,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1107,6 +1169,7 @@ class TwowaysAMI _d = d; } + @Override public void ice_response(java.util.Map r) { @@ -1114,6 +1177,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1132,12 +1196,14 @@ class TwowaysAMI private static class AMI_MyDerivedClass_opDerivedI extends AMI_MyDerivedClass_opDerived { + @Override public void ice_response() { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1155,12 +1221,14 @@ class TwowaysAMI private static class AMI_MyClass_opDoubleMarshalingI extends AMI_MyClass_opDoubleMarshaling { + @Override public void ice_response() { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1178,12 +1246,14 @@ class TwowaysAMI private static class AMI_MyClass_opIdempotentI extends AMI_MyClass_opIdempotent { + @Override public void ice_response() { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -1201,12 +1271,14 @@ class TwowaysAMI private static class AMI_MyClass_opNonmutatingI extends AMI_MyClass_opNonmutating { + @Override public void ice_response() { callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { diff --git a/java/test/Ice/operations/TwowaysNewAMI.java b/java/test/Ice/operations/TwowaysNewAMI.java index 6e64af6ac7e..b531673a00f 100644 --- a/java/test/Ice/operations/TwowaysNewAMI.java +++ b/java/test/Ice/operations/TwowaysNewAMI.java @@ -12,12 +12,10 @@ package test.Ice.operations; import test.Ice.operations.Test.Callback_MyClass_opVoid; import test.Ice.operations.Test.Callback_MyClass_opBool; import test.Ice.operations.Test.Callback_MyClass_opBoolS; -import test.Ice.operations.Test.Callback_MyClass_opBoolSS; import test.Ice.operations.Test.Callback_MyClass_opByte; import test.Ice.operations.Test.Callback_MyClass_opByteBoolD; import test.Ice.operations.Test.Callback_MyClass_opByteS; import test.Ice.operations.Test.Callback_MyClass_opByteSS; -import test.Ice.operations.Test.Callback_MyClass_opContext; import test.Ice.operations.Test.Callback_MyClass_opFloatDouble; import test.Ice.operations.Test.Callback_MyClass_opFloatDoubleS; import test.Ice.operations.Test.Callback_MyClass_opFloatDoubleSS; @@ -30,7 +28,6 @@ import test.Ice.operations.Test.Callback_MyClass_opNonmutating; import test.Ice.operations.Test.Callback_MyClass_opShortIntD; import test.Ice.operations.Test.Callback_MyClass_opShortIntLong; import test.Ice.operations.Test.Callback_MyClass_opShortIntLongS; -import test.Ice.operations.Test.Callback_MyClass_opShortIntLongSS; import test.Ice.operations.Test.Callback_MyClass_opString; import test.Ice.operations.Test.Callback_MyClass_opStringMyEnumD; import test.Ice.operations.Test.Callback_MyClass_opMyEnumStringD; @@ -656,50 +653,6 @@ class TwowaysNewAMI private Callback callback = new Callback(); } - private static class opBoolSSI extends Callback_MyClass_opBoolSS - { - @Override - public void response(boolean[][] rso, boolean[][] bso) - { - callback.called(); - } - - @Override - public void exception(Ice.LocalException ex) - { - test(false); - } - - public void check() - { - callback.check(); - } - - private Callback callback = new Callback(); - } - - private static class opShortIntLongSSI extends Callback_MyClass_opShortIntLongSS - { - @Override - public void response(long[][] rso, short[][] sso, int[][] iso, long[][] lso) - { - callback.called(); - } - - @Override - public void exception(Ice.LocalException ex) - { - test(false); - } - - public void check() - { - callback.check(); - } - - private Callback callback = new Callback(); - } - private static class opFloatDoubleSSI extends Callback_MyClass_opFloatDoubleSS { @Override diff --git a/java/test/Ice/optional/AMDInitialI.java b/java/test/Ice/optional/AMDInitialI.java index 988868711d0..224ebb5a1e4 100644 --- a/java/test/Ice/optional/AMDInitialI.java +++ b/java/test/Ice/optional/AMDInitialI.java @@ -13,6 +13,7 @@ import test.Ice.optional.AMD.Test.*; public final class AMDInitialI extends Initial { + @Override public void shutdown_async(AMD_Initial_shutdown cb, Ice.Current current) { @@ -20,12 +21,14 @@ public final class AMDInitialI extends Initial cb.ice_response(); } + @Override public void pingPong_async(AMD_Initial_pingPong cb, Ice.Object obj, Ice.Current current) { cb.ice_response(obj); } + @Override public void opOptionalException_async(AMD_Initial_opOptionalException cb, Ice.IntOptional a, Ice.Optional<String> b, Ice.Optional<OneOptional> o, Ice.Current current) @@ -51,6 +54,7 @@ public final class AMDInitialI extends Initial cb.ice_exception(ex); } + @Override public void opDerivedException_async(AMD_Initial_opDerivedException cb, Ice.IntOptional a, Ice.Optional<String> b, Ice.Optional<OneOptional> o, Ice.Current current) @@ -82,6 +86,7 @@ public final class AMDInitialI extends Initial cb.ice_exception(ex); } + @Override public void opRequiredException_async(AMD_Initial_opRequiredException cb, Ice.IntOptional a, Ice.Optional<String> b, Ice.Optional<OneOptional> o, Ice.Current current) @@ -109,168 +114,196 @@ public final class AMDInitialI extends Initial cb.ice_exception(ex); } + @Override public void opByte_async(AMD_Initial_opByte cb, Ice.ByteOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opByteReq_async(AMD_Initial_opByteReq cb, Ice.ByteOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opBool_async(AMD_Initial_opBool cb, Ice.BooleanOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opBoolReq_async(AMD_Initial_opBoolReq cb, Ice.BooleanOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opShort_async(AMD_Initial_opShort cb, Ice.ShortOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opShortReq_async(AMD_Initial_opShortReq cb, Ice.ShortOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opInt_async(AMD_Initial_opInt cb, Ice.IntOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opIntReq_async(AMD_Initial_opIntReq cb, Ice.IntOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opLong_async(AMD_Initial_opLong cb, Ice.LongOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opLongReq_async(AMD_Initial_opLongReq cb, Ice.LongOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opFloat_async(AMD_Initial_opFloat cb, Ice.FloatOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opFloatReq_async(AMD_Initial_opFloatReq cb, Ice.FloatOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opDouble_async(AMD_Initial_opDouble cb, Ice.DoubleOptional p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opDoubleReq_async(AMD_Initial_opDoubleReq cb, Ice.DoubleOptional p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opString_async(AMD_Initial_opString cb, Ice.Optional<String> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opStringReq_async(AMD_Initial_opStringReq cb, Ice.Optional<String> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opMyEnum_async(AMD_Initial_opMyEnum cb, Ice.Optional<MyEnum> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opMyEnumReq_async(AMD_Initial_opMyEnumReq cb, Ice.Optional<MyEnum> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opSmallStruct_async(AMD_Initial_opSmallStruct cb, Ice.Optional<SmallStruct> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opSmallStructReq_async(AMD_Initial_opSmallStructReq cb, Ice.Optional<SmallStruct> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opFixedStruct_async(AMD_Initial_opFixedStruct cb, Ice.Optional<FixedStruct> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opFixedStructReq_async(AMD_Initial_opFixedStructReq cb, Ice.Optional<FixedStruct> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opVarStruct_async(AMD_Initial_opVarStruct cb, Ice.Optional<VarStruct> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opVarStructReq_async(AMD_Initial_opVarStructReq cb, Ice.Optional<VarStruct> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opOneOptional_async(AMD_Initial_opOneOptional cb, Ice.Optional<OneOptional> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opOneOptionalReq_async(AMD_Initial_opOneOptionalReq cb, Ice.Optional<OneOptional> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opOneOptionalProxy_async(AMD_Initial_opOneOptionalProxy cb, Ice.Optional<OneOptionalPrx> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opOneOptionalProxyReq_async(AMD_Initial_opOneOptionalProxyReq cb, Ice.Optional<OneOptionalPrx> p1, Ice.Current current) @@ -278,114 +311,133 @@ public final class AMDInitialI extends Initial cb.ice_response(p1.get(), p1.get()); } + @Override public void opByteSeq_async(AMD_Initial_opByteSeq cb, Ice.Optional<byte[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opByteSeqReq_async(AMD_Initial_opByteSeqReq cb, Ice.Optional<byte[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opBoolSeq_async(AMD_Initial_opBoolSeq cb, Ice.Optional<boolean[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opBoolSeqReq_async(AMD_Initial_opBoolSeqReq cb, Ice.Optional<boolean[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opShortSeq_async(AMD_Initial_opShortSeq cb, Ice.Optional<short[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opShortSeqReq_async(AMD_Initial_opShortSeqReq cb, Ice.Optional<short[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opIntSeq_async(AMD_Initial_opIntSeq cb, Ice.Optional<int[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opIntSeqReq_async(AMD_Initial_opIntSeqReq cb, Ice.Optional<int[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opLongSeq_async(AMD_Initial_opLongSeq cb, Ice.Optional<long[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opLongSeqReq_async(AMD_Initial_opLongSeqReq cb, Ice.Optional<long[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opFloatSeq_async(AMD_Initial_opFloatSeq cb, Ice.Optional<float[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opFloatSeqReq_async(AMD_Initial_opFloatSeqReq cb, Ice.Optional<float[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opDoubleSeq_async(AMD_Initial_opDoubleSeq cb, Ice.Optional<double[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opDoubleSeqReq_async(AMD_Initial_opDoubleSeqReq cb, Ice.Optional<double[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opStringSeq_async(AMD_Initial_opStringSeq cb, Ice.Optional<String[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opStringSeqReq_async(AMD_Initial_opStringSeqReq cb, Ice.Optional<String[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opSmallStructSeq_async(AMD_Initial_opSmallStructSeq cb, Ice.Optional<SmallStruct[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opSmallStructSeqReq_async(AMD_Initial_opSmallStructSeqReq cb, Ice.Optional<SmallStruct[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opSmallStructList_async(AMD_Initial_opSmallStructList cb, Ice.Optional<java.util.List<SmallStruct>> p1, Ice.Current current) @@ -393,6 +445,7 @@ public final class AMDInitialI extends Initial cb.ice_response(p1, p1); } + @Override public void opSmallStructListReq_async(AMD_Initial_opSmallStructListReq cb, Ice.Optional<java.util.List<SmallStruct>> p1, Ice.Current current) @@ -400,18 +453,21 @@ public final class AMDInitialI extends Initial cb.ice_response(p1.get(), p1.get()); } + @Override public void opFixedStructSeq_async(AMD_Initial_opFixedStructSeq cb, Ice.Optional<FixedStruct[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opFixedStructSeqReq_async(AMD_Initial_opFixedStructSeqReq cb, Ice.Optional<FixedStruct[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opFixedStructList_async(AMD_Initial_opFixedStructList cb, Ice.Optional<java.util.List<FixedStruct>> p1, Ice.Current current) @@ -419,6 +475,7 @@ public final class AMDInitialI extends Initial cb.ice_response(p1, p1); } + @Override public void opFixedStructListReq_async(AMD_Initial_opFixedStructListReq cb, Ice.Optional<java.util.List<FixedStruct>> p1, Ice.Current current) @@ -426,30 +483,35 @@ public final class AMDInitialI extends Initial cb.ice_response(p1.get(), p1.get()); } + @Override public void opVarStructSeq_async(AMD_Initial_opVarStructSeq cb, Ice.Optional<VarStruct[]> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opVarStructSeqReq_async(AMD_Initial_opVarStructSeqReq cb, Ice.Optional<VarStruct[]> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opSerializable_async(AMD_Initial_opSerializable cb, Ice.Optional<SerializableClass> p1, Ice.Current current) { cb.ice_response(p1, p1); } + @Override public void opSerializableReq_async(AMD_Initial_opSerializableReq cb, Ice.Optional<SerializableClass> p1, Ice.Current current) { cb.ice_response(p1.get(), p1.get()); } + @Override public void opIntIntDict_async(AMD_Initial_opIntIntDict cb, Ice.Optional<java.util.Map<Integer, Integer>> p1, Ice.Current current) @@ -457,6 +519,7 @@ public final class AMDInitialI extends Initial cb.ice_response(p1, p1); } + @Override public void opIntIntDictReq_async(AMD_Initial_opIntIntDictReq cb, Ice.Optional<java.util.Map<Integer, Integer>> p1, Ice.Current current) @@ -464,6 +527,7 @@ public final class AMDInitialI extends Initial cb.ice_response(p1.get(), p1.get()); } + @Override public void opStringIntDict_async(AMD_Initial_opStringIntDict cb, Ice.Optional<java.util.Map<String, Integer>> p1, Ice.Current current) @@ -471,6 +535,7 @@ public final class AMDInitialI extends Initial cb.ice_response(p1, p1); } + @Override public void opStringIntDictReq_async(AMD_Initial_opStringIntDictReq cb, Ice.Optional<java.util.Map<String, Integer>> p1, Ice.Current current) @@ -478,12 +543,14 @@ public final class AMDInitialI extends Initial cb.ice_response(p1.get(), p1.get()); } + @Override public void opClassAndUnknownOptional_async(AMD_Initial_opClassAndUnknownOptional cb, A p, Ice.Current current) { cb.ice_response(); } + @Override public void sendOptionalClass_async(AMD_Initial_sendOptionalClass cb, boolean req, Ice.Optional<OneOptional> o, Ice.Current current) @@ -491,24 +558,28 @@ public final class AMDInitialI extends Initial cb.ice_response(); } + @Override public void returnOptionalClass_async(AMD_Initial_returnOptionalClass cb, boolean req, Ice.Current current) { cb.ice_response(new Ice.Optional<OneOptional>(new OneOptional(53))); } + @Override public void supportsRequiredParams_async(AMD_Initial_supportsRequiredParams cb, Ice.Current current) { cb.ice_response(true); } + @Override public void supportsJavaSerializable_async(AMD_Initial_supportsJavaSerializable cb, Ice.Current current) { cb.ice_response(true); } + @Override public void supportsCsharpSerializable_async(AMD_Initial_supportsCsharpSerializable cb, Ice.Current current) { diff --git a/java/test/Ice/optional/AMDServer.java b/java/test/Ice/optional/AMDServer.java index 8fc465ceb25..b05e5b28f3c 100644 --- a/java/test/Ice/optional/AMDServer.java +++ b/java/test/Ice/optional/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.optional; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -20,6 +21,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/optional/AllTests.java b/java/test/Ice/optional/AllTests.java index c3eb9bc7957..0665eec3252 100644 --- a/java/test/Ice/optional/AllTests.java +++ b/java/test/Ice/optional/AllTests.java @@ -508,6 +508,7 @@ public class AllTests final FHolder fholder = new FHolder(); in.readObject(new Ice.ReadObjectCallback() { + @Override public void invoke(Ice.Object obj) { fholder.value = ((FObjectReader)obj).getF(); @@ -2111,6 +2112,7 @@ public class AllTests final AHolder a = new AHolder(); in.readObject(new Ice.ReadObjectCallback() { + @Override public void invoke(Ice.Object obj) { a.value = (A)obj; @@ -2282,6 +2284,7 @@ public class AllTests private static class TestObjectReader extends Ice.ObjectReader { + @Override public void read(Ice.InputStream in) { in.startObject(); @@ -2293,6 +2296,7 @@ public class AllTests private static class BObjectReader extends Ice.ObjectReader { + @Override public void read(Ice.InputStream in) { in.startObject(); @@ -2310,6 +2314,7 @@ public class AllTests private static class CObjectReader extends Ice.ObjectReader { + @Override public void read(Ice.InputStream in) { in.startObject(); @@ -2330,12 +2335,12 @@ public class AllTests private static class DObjectWriter extends Ice.ObjectWriter { + @Override public void write(Ice.OutputStream out) { out.startObject(null); // ::Test::D out.startSlice("::Test::D", -1, false); - String s = "test"; out.writeString("test"); out.writeOptional(1, Ice.OptionalFormat.FSize); String[] o = { "test1", "test2", "test3", "test4" }; @@ -2362,6 +2367,7 @@ public class AllTests private static class DObjectReader extends Ice.ObjectReader { + @Override public void read(Ice.InputStream in) { in.startObject(); @@ -2398,6 +2404,7 @@ public class AllTests private static class FObjectReader extends Ice.ObjectReader { + @Override public void read(Ice.InputStream in) { _f = new F(); @@ -2409,6 +2416,7 @@ public class AllTests in.startSlice(); in.readObject(new Ice.ReadObjectCallback() { + @Override public void invoke(Ice.Object obj) { _f.ae = (A)obj; @@ -2428,6 +2436,7 @@ public class AllTests private static class FactoryI implements Ice.ObjectFactory { + @Override public Ice.Object create(String typeId) { if(!_enabled) @@ -2463,6 +2472,7 @@ public class AllTests return null; } + @Override public void destroy() { } @@ -2477,6 +2487,7 @@ public class AllTests private static class ReadObjectCallbackI implements Ice.ReadObjectCallback { + @Override public void invoke(Ice.Object obj) { this.obj = obj; diff --git a/java/test/Ice/optional/Client.java b/java/test/Ice/optional/Client.java index b9dbfc5a65b..22f05e262bc 100644 --- a/java/test/Ice/optional/Client.java +++ b/java/test/Ice/optional/Client.java @@ -13,6 +13,7 @@ import test.Ice.optional.Test.InitialPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { java.io.PrintWriter out = getWriter(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/optional/InitialI.java b/java/test/Ice/optional/InitialI.java index d7b8ec17a99..9bd9f400718 100644 --- a/java/test/Ice/optional/InitialI.java +++ b/java/test/Ice/optional/InitialI.java @@ -13,18 +13,21 @@ import test.Ice.optional.Test.*; public final class InitialI extends Initial { + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public Ice.Object pingPong(Ice.Object obj, Ice.Current current) { return obj; } + @Override public void opOptionalException(Ice.IntOptional a, Ice.Optional<String> b, Ice.Optional<OneOptional> o, Ice.Current current) throws OptionalException @@ -49,6 +52,7 @@ public final class InitialI extends Initial throw ex; } + @Override public void opDerivedException(Ice.IntOptional a, Ice.Optional<String> b, Ice.Optional<OneOptional> o, Ice.Current current) throws OptionalException @@ -79,6 +83,7 @@ public final class InitialI extends Initial throw ex; } + @Override public void opRequiredException(Ice.IntOptional a, Ice.Optional<String> b, Ice.Optional<OneOptional> o, Ice.Current current) throws OptionalException @@ -105,6 +110,7 @@ public final class InitialI extends Initial throw ex; } + @Override public Ice.ByteOptional opByte(Ice.ByteOptional p1, Ice.ByteOptional p3, Ice.Current current) { @@ -112,6 +118,7 @@ public final class InitialI extends Initial return p1; } + @Override public byte opByteReq(Ice.ByteOptional p1, Ice.ByteHolder p3, Ice.Current current) { @@ -119,6 +126,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.BooleanOptional opBool(Ice.BooleanOptional p1, Ice.BooleanOptional p3, Ice.Current current) { @@ -126,6 +134,7 @@ public final class InitialI extends Initial return p1; } + @Override public boolean opBoolReq(Ice.BooleanOptional p1, Ice.BooleanHolder p3, Ice.Current current) { @@ -133,6 +142,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.ShortOptional opShort(Ice.ShortOptional p1, Ice.ShortOptional p3, Ice.Current current) { @@ -140,6 +150,7 @@ public final class InitialI extends Initial return p1; } + @Override public short opShortReq(Ice.ShortOptional p1, Ice.ShortHolder p3, Ice.Current current) { @@ -147,6 +158,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.IntOptional opInt(Ice.IntOptional p1, Ice.IntOptional p3, Ice.Current current) { @@ -154,6 +166,7 @@ public final class InitialI extends Initial return p1; } + @Override public int opIntReq(Ice.IntOptional p1, Ice.IntHolder p3, Ice.Current current) { @@ -161,6 +174,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.LongOptional opLong(Ice.LongOptional p1, Ice.LongOptional p3, Ice.Current current) { @@ -168,6 +182,7 @@ public final class InitialI extends Initial return p1; } + @Override public long opLongReq(Ice.LongOptional p1, Ice.LongHolder p3, Ice.Current current) { @@ -175,6 +190,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.FloatOptional opFloat(Ice.FloatOptional p1, Ice.FloatOptional p3, Ice.Current current) { @@ -182,6 +198,7 @@ public final class InitialI extends Initial return p1; } + @Override public float opFloatReq(Ice.FloatOptional p1, Ice.FloatHolder p3, Ice.Current current) { @@ -189,6 +206,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.DoubleOptional opDouble(Ice.DoubleOptional p1, Ice.DoubleOptional p3, Ice.Current current) { @@ -196,6 +214,7 @@ public final class InitialI extends Initial return p1; } + @Override public double opDoubleReq(Ice.DoubleOptional p1, Ice.DoubleHolder p3, Ice.Current current) { @@ -203,6 +222,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<String> opString(Ice.Optional<String> p1, Ice.Optional<String> p3, Ice.Current current) { @@ -210,6 +230,7 @@ public final class InitialI extends Initial return p1; } + @Override public String opStringReq(Ice.Optional<String> p1, Ice.StringHolder p3, Ice.Current current) { @@ -217,6 +238,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<MyEnum> opMyEnum(Ice.Optional<MyEnum> p1, Ice.Optional<MyEnum> p3, Ice.Current current) { @@ -224,6 +246,7 @@ public final class InitialI extends Initial return p1; } + @Override public MyEnum opMyEnumReq(Ice.Optional<MyEnum> p1, MyEnumHolder p3, Ice.Current current) { @@ -231,6 +254,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<SmallStruct> opSmallStruct(Ice.Optional<SmallStruct> p1, Ice.Optional<SmallStruct> p3, Ice.Current current) { @@ -238,6 +262,7 @@ public final class InitialI extends Initial return p1; } + @Override public SmallStruct opSmallStructReq(Ice.Optional<SmallStruct> p1, SmallStructHolder p3, Ice.Current current) { @@ -245,6 +270,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<FixedStruct> opFixedStruct(Ice.Optional<FixedStruct> p1, Ice.Optional<FixedStruct> p3, Ice.Current current) { @@ -252,6 +278,7 @@ public final class InitialI extends Initial return p1; } + @Override public FixedStruct opFixedStructReq(Ice.Optional<FixedStruct> p1, FixedStructHolder p3, Ice.Current current) { @@ -259,6 +286,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<VarStruct> opVarStruct(Ice.Optional<VarStruct> p1, Ice.Optional<VarStruct> p3, Ice.Current current) { @@ -266,6 +294,7 @@ public final class InitialI extends Initial return p1; } + @Override public VarStruct opVarStructReq(Ice.Optional<VarStruct> p1, VarStructHolder p3, Ice.Current current) { @@ -273,6 +302,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<OneOptional> opOneOptional(Ice.Optional<OneOptional> p1, Ice.Optional<OneOptional> p3, Ice.Current current) { @@ -280,6 +310,7 @@ public final class InitialI extends Initial return p1; } + @Override public OneOptional opOneOptionalReq(Ice.Optional<OneOptional> p1, OneOptionalHolder p3, Ice.Current current) { @@ -287,6 +318,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<OneOptionalPrx> opOneOptionalProxy(Ice.Optional<OneOptionalPrx> p1, Ice.Optional<OneOptionalPrx> p3, Ice.Current current) { @@ -294,6 +326,7 @@ public final class InitialI extends Initial return p1; } + @Override public OneOptionalPrx opOneOptionalProxyReq(Ice.Optional<OneOptionalPrx> p1, OneOptionalPrxHolder p3, Ice.Current current) { @@ -301,6 +334,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<byte[]> opByteSeq(Ice.Optional<byte[]> p1, Ice.Optional<byte[]> p3, Ice.Current current) { @@ -308,6 +342,7 @@ public final class InitialI extends Initial return p1; } + @Override public byte[] opByteSeqReq(Ice.Optional<byte[]> p1, ByteSeqHolder p3, Ice.Current current) { @@ -315,6 +350,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<boolean[]> opBoolSeq(Ice.Optional<boolean[]> p1, Ice.Optional<boolean[]> p3, Ice.Current current) { @@ -322,6 +358,7 @@ public final class InitialI extends Initial return p1; } + @Override public boolean[] opBoolSeqReq(Ice.Optional<boolean[]> p1, BoolSeqHolder p3, Ice.Current current) { @@ -329,6 +366,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<short[]> opShortSeq(Ice.Optional<short[]> p1, Ice.Optional<short[]> p3, Ice.Current current) { @@ -336,6 +374,7 @@ public final class InitialI extends Initial return p1; } + @Override public short[] opShortSeqReq(Ice.Optional<short[]> p1, ShortSeqHolder p3, Ice.Current current) { @@ -343,6 +382,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<int[]> opIntSeq(Ice.Optional<int[]> p1, Ice.Optional<int[]> p3, Ice.Current current) { @@ -350,6 +390,7 @@ public final class InitialI extends Initial return p1; } + @Override public int[] opIntSeqReq(Ice.Optional<int[]> p1, IntSeqHolder p3, Ice.Current current) { @@ -357,6 +398,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<long[]> opLongSeq(Ice.Optional<long[]> p1, Ice.Optional<long[]> p3, Ice.Current current) { @@ -364,6 +406,7 @@ public final class InitialI extends Initial return p1; } + @Override public long[] opLongSeqReq(Ice.Optional<long[]> p1, LongSeqHolder p3, Ice.Current current) { @@ -371,6 +414,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<float[]> opFloatSeq(Ice.Optional<float[]> p1, Ice.Optional<float[]> p3, Ice.Current current) { @@ -378,6 +422,7 @@ public final class InitialI extends Initial return p1; } + @Override public float[] opFloatSeqReq(Ice.Optional<float[]> p1, FloatSeqHolder p3, Ice.Current current) { @@ -385,6 +430,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<double[]> opDoubleSeq(Ice.Optional<double[]> p1, Ice.Optional<double[]> p3, Ice.Current current) { @@ -392,6 +438,7 @@ public final class InitialI extends Initial return p1; } + @Override public double[] opDoubleSeqReq(Ice.Optional<double[]> p1, DoubleSeqHolder p3, Ice.Current current) { @@ -399,6 +446,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<String[]> opStringSeq(Ice.Optional<String[]> p1, Ice.Optional<String[]> p3, Ice.Current current) { @@ -406,6 +454,7 @@ public final class InitialI extends Initial return p1; } + @Override public String[] opStringSeqReq(Ice.Optional<String[]> p1, StringSeqHolder p3, Ice.Current current) { @@ -413,6 +462,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<SmallStruct[]> opSmallStructSeq(Ice.Optional<SmallStruct[]> p1, Ice.Optional<SmallStruct[]> p3, Ice.Current current) { @@ -420,6 +470,7 @@ public final class InitialI extends Initial return p1; } + @Override public SmallStruct[] opSmallStructSeqReq(Ice.Optional<SmallStruct[]> p1, SmallStructSeqHolder p3, Ice.Current current) { @@ -427,6 +478,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<java.util.List<SmallStruct>> opSmallStructList(Ice.Optional<java.util.List<SmallStruct>> p1, Ice.Optional<java.util.List<SmallStruct>> p3, Ice.Current current) @@ -435,6 +487,7 @@ public final class InitialI extends Initial return p1; } + @Override public java.util.List<SmallStruct> opSmallStructListReq(Ice.Optional<java.util.List<SmallStruct>> p1, SmallStructListHolder p3, Ice.Current current) { @@ -442,6 +495,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<FixedStruct[]> opFixedStructSeq(Ice.Optional<FixedStruct[]> p1, Ice.Optional<FixedStruct[]> p3, Ice.Current current) { @@ -449,6 +503,7 @@ public final class InitialI extends Initial return p1; } + @Override public FixedStruct[] opFixedStructSeqReq(Ice.Optional<FixedStruct[]> p1, FixedStructSeqHolder p3, Ice.Current current) { @@ -456,6 +511,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<java.util.List<FixedStruct>> opFixedStructList(Ice.Optional<java.util.List<FixedStruct>> p1, Ice.Optional<java.util.List<FixedStruct>> p3, Ice.Current current) @@ -464,6 +520,7 @@ public final class InitialI extends Initial return p1; } + @Override public java.util.List<FixedStruct> opFixedStructListReq(Ice.Optional<java.util.List<FixedStruct>> p1, FixedStructListHolder p3, Ice.Current current) { @@ -471,6 +528,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<VarStruct[]> opVarStructSeq(Ice.Optional<VarStruct[]> p1, Ice.Optional<VarStruct[]> p3, Ice.Current current) { @@ -478,6 +536,7 @@ public final class InitialI extends Initial return p1; } + @Override public VarStruct[] opVarStructSeqReq(Ice.Optional<VarStruct[]> p1, VarStructSeqHolder p3, Ice.Current current) { @@ -485,6 +544,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<SerializableClass> opSerializable(Ice.Optional<SerializableClass> p1, Ice.Optional<SerializableClass> p3, Ice.Current current) { @@ -492,6 +552,7 @@ public final class InitialI extends Initial return p1; } + @Override public SerializableClass opSerializableReq(Ice.Optional<SerializableClass> p1, Ice.Holder<SerializableClass> p3, Ice.Current current) { @@ -499,6 +560,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<java.util.Map<Integer, Integer>> opIntIntDict(Ice.Optional<java.util.Map<Integer, Integer>> p1, Ice.Optional<java.util.Map<Integer, Integer>> p3, Ice.Current current) @@ -507,6 +569,7 @@ public final class InitialI extends Initial return p1; } + @Override public java.util.Map<Integer, Integer> opIntIntDictReq(Ice.Optional<java.util.Map<Integer, Integer>> p1, IntIntDictHolder p3, Ice.Current current) { @@ -514,6 +577,7 @@ public final class InitialI extends Initial return p1.get(); } + @Override public Ice.Optional<java.util.Map<String, Integer>> opStringIntDict(Ice.Optional<java.util.Map<String, Integer>> p1, Ice.Optional<java.util.Map<String, Integer>> p3, Ice.Current current) @@ -522,6 +586,7 @@ public final class InitialI extends Initial return p1; } + @Override public java.util.Map<String, Integer> opStringIntDictReq(Ice.Optional<java.util.Map<String, Integer>> p1, StringIntDictHolder p3, Ice.Current current) { @@ -529,34 +594,40 @@ public final class InitialI extends Initial return p1.get(); } + @Override public void opClassAndUnknownOptional(A p, Ice.Current current) { } + @Override public void sendOptionalClass(boolean req, Ice.Optional<OneOptional> o, Ice.Current current) { } + @Override public void returnOptionalClass(boolean req, Ice.Optional<OneOptional> o, Ice.Current current) { o.set(new OneOptional(53)); } + @Override public boolean supportsRequiredParams(Ice.Current current) { return true; } + @Override public boolean supportsJavaSerializable(Ice.Current current) { return true; } + @Override public boolean supportsCsharpSerializable(Ice.Current current) { diff --git a/java/test/Ice/optional/SerializableClass.java b/java/test/Ice/optional/SerializableClass.java index 6314f57c3b9..1d29516c246 100644 --- a/java/test/Ice/optional/SerializableClass.java +++ b/java/test/Ice/optional/SerializableClass.java @@ -16,6 +16,7 @@ public class SerializableClass implements java.io.Serializable _v = v; } + @Override public boolean equals(Object obj) { if(obj instanceof SerializableClass) diff --git a/java/test/Ice/optional/Server.java b/java/test/Ice/optional/Server.java index 61e75f4b054..15446ac47b5 100644 --- a/java/test/Ice/optional/Server.java +++ b/java/test/Ice/optional/Server.java @@ -11,6 +11,7 @@ package test.Ice.optional; public class Server extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/packagemd/Client.java b/java/test/Ice/packagemd/Client.java index 2e6cc33d4da..8081a790e76 100644 --- a/java/test/Ice/packagemd/Client.java +++ b/java/test/Ice/packagemd/Client.java @@ -13,6 +13,7 @@ import test.Ice.packagemd.Test.InitialPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { InitialPrx initial = AllTests.allTests(communicator(), getWriter()); @@ -20,6 +21,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/packagemd/InitialI.java b/java/test/Ice/packagemd/InitialI.java index fd619e556b5..6d4d4fbaf96 100644 --- a/java/test/Ice/packagemd/InitialI.java +++ b/java/test/Ice/packagemd/InitialI.java @@ -24,18 +24,21 @@ public final class InitialI extends _InitialDisp return new C2(); } + @Override public C1 getTest1C2AsC1(Ice.Current __current) { return new C2(); } + @Override public C2 getTest1C2AsC2(Ice.Current __current) { return new C2(); } + @Override public void throwTest1E2AsE1(Ice.Current __current) throws E1 @@ -43,6 +46,7 @@ public final class InitialI extends _InitialDisp throw new E2(); } + @Override public void throwTest1E2AsE2(Ice.Current __current) throws E2 @@ -50,6 +54,7 @@ public final class InitialI extends _InitialDisp throw new E2(); } + @Override public void throwTest1Notify(Ice.Current __current) throws _notify @@ -63,18 +68,21 @@ public final class InitialI extends _InitialDisp return new test.Ice.packagemd.testpkg.Test2.C2(); } + @Override public test.Ice.packagemd.testpkg.Test2.C1 getTest2C2AsC1(Ice.Current __current) { return new test.Ice.packagemd.testpkg.Test2.C2(); } + @Override public test.Ice.packagemd.testpkg.Test2.C2 getTest2C2AsC2(Ice.Current __current) { return new test.Ice.packagemd.testpkg.Test2.C2(); } + @Override public void throwTest2E2AsE1(Ice.Current __current) throws test.Ice.packagemd.testpkg.Test2.E1 @@ -82,6 +90,7 @@ public final class InitialI extends _InitialDisp throw new test.Ice.packagemd.testpkg.Test2.E2(); } + @Override public void throwTest2E2AsE2(Ice.Current __current) throws test.Ice.packagemd.testpkg.Test2.E2 @@ -95,18 +104,21 @@ public final class InitialI extends _InitialDisp return new test.Ice.packagemd.testpkg.Test3.C2(); } + @Override public test.Ice.packagemd.testpkg.Test3.C1 getTest3C2AsC1(Ice.Current __current) { return new test.Ice.packagemd.testpkg.Test3.C2(); } + @Override public test.Ice.packagemd.testpkg.Test3.C2 getTest3C2AsC2(Ice.Current __current) { return new test.Ice.packagemd.testpkg.Test3.C2(); } + @Override public void throwTest3E2AsE1(Ice.Current __current) throws test.Ice.packagemd.testpkg.Test3.E1 @@ -114,6 +126,7 @@ public final class InitialI extends _InitialDisp throw new test.Ice.packagemd.testpkg.Test3.E2(); } + @Override public void throwTest3E2AsE2(Ice.Current __current) throws test.Ice.packagemd.testpkg.Test3.E2 @@ -121,6 +134,7 @@ public final class InitialI extends _InitialDisp throw new test.Ice.packagemd.testpkg.Test3.E2(); } + @Override public void shutdown(Ice.Current __current) { diff --git a/java/test/Ice/packagemd/Server.java b/java/test/Ice/packagemd/Server.java index 25c2cb300e4..61bbb0dd2c6 100644 --- a/java/test/Ice/packagemd/Server.java +++ b/java/test/Ice/packagemd/Server.java @@ -11,6 +11,7 @@ package test.Ice.packagemd; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/plugin/Client.java b/java/test/Ice/plugin/Client.java index 600b377da1d..096f8d18a35 100644 --- a/java/test/Ice/plugin/Client.java +++ b/java/test/Ice/plugin/Client.java @@ -13,6 +13,7 @@ import java.io.PrintWriter; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -146,6 +147,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); @@ -181,11 +183,13 @@ public class Client extends test.Util.Application return _destroyed; } + @Override public void initialize() { _initialized = true; } + @Override public void destroy() { _destroyed = true; diff --git a/java/test/Ice/plugin/plugins/PluginFactory.java b/java/test/Ice/plugin/plugins/PluginFactory.java index fb482d2b7ad..02e8ad76d7e 100644 --- a/java/test/Ice/plugin/plugins/PluginFactory.java +++ b/java/test/Ice/plugin/plugins/PluginFactory.java @@ -11,19 +11,20 @@ package test.Ice.plugin.plugins; public class PluginFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { - return new Plugin(communicator, args); + return new Plugin(args); } static class Plugin implements Ice.Plugin { - public Plugin(Ice.Communicator communicator, String[] args) + public Plugin(String[] args) { - _communicator = communicator; _args = args; } + @Override public void initialize() { _initialized = true; @@ -33,11 +34,13 @@ public class PluginFactory implements Ice.PluginFactory test(_args[2].equals("C:\\Program Files\\Application\\db")); } + @Override public void destroy() { _destroyed = true; } + @Override protected void finalize() throws Throwable { try @@ -65,7 +68,6 @@ public class PluginFactory implements Ice.PluginFactory } } - private Ice.Communicator _communicator; private String[] _args; private boolean _initialized = false; private boolean _destroyed = false; diff --git a/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java b/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java index a33591e6a5d..a2f419ebecb 100644 --- a/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java +++ b/java/test/Ice/plugin/plugins/PluginInitializeFailFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginInitializeFailFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginInitializeFail(); @@ -18,11 +19,13 @@ public class PluginInitializeFailFactory implements Ice.PluginFactory static class PluginInitializeFail implements Ice.Plugin { + @Override public void initialize() { throw new PluginInitializeFailException(); } + @Override public void destroy() { test(false); diff --git a/java/test/Ice/plugin/plugins/PluginOneFactory.java b/java/test/Ice/plugin/plugins/PluginOneFactory.java index c3d012f3421..b4895874772 100644 --- a/java/test/Ice/plugin/plugins/PluginOneFactory.java +++ b/java/test/Ice/plugin/plugins/PluginOneFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginOneFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginOne(communicator); @@ -23,6 +24,7 @@ public class PluginOneFactory implements Ice.PluginFactory super(communicator); } + @Override public void initialize() { _other = (BasePlugin)_communicator.getPluginManager().getPlugin("PluginTwo"); @@ -30,6 +32,7 @@ public class PluginOneFactory implements Ice.PluginFactory _initialized = true; } + @Override public void destroy() { _destroyed = true; diff --git a/java/test/Ice/plugin/plugins/PluginOneFailFactory.java b/java/test/Ice/plugin/plugins/PluginOneFailFactory.java index 9261b2dab41..5fd118de41e 100644 --- a/java/test/Ice/plugin/plugins/PluginOneFailFactory.java +++ b/java/test/Ice/plugin/plugins/PluginOneFailFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginOneFailFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginOneFail(communicator); @@ -23,6 +24,7 @@ public class PluginOneFailFactory implements Ice.PluginFactory super(communicator); } + @Override public void initialize() { _two = (BasePluginFail)_communicator.getPluginManager().getPlugin("PluginTwoFail"); @@ -32,6 +34,7 @@ public class PluginOneFailFactory implements Ice.PluginFactory _initialized = true; } + @Override public void destroy() { test(_two.isDestroyed()); @@ -42,6 +45,7 @@ public class PluginOneFailFactory implements Ice.PluginFactory _destroyed = true; } + @Override protected void finalize() throws Throwable { try diff --git a/java/test/Ice/plugin/plugins/PluginThreeFactory.java b/java/test/Ice/plugin/plugins/PluginThreeFactory.java index a8e0539e494..6fa993b414f 100644 --- a/java/test/Ice/plugin/plugins/PluginThreeFactory.java +++ b/java/test/Ice/plugin/plugins/PluginThreeFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginThreeFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginThree(communicator); @@ -23,6 +24,7 @@ public class PluginThreeFactory implements Ice.PluginFactory super(communicator); } + @Override public void initialize() { _other = (BasePlugin)_communicator.getPluginManager().getPlugin("PluginTwo"); @@ -30,6 +32,7 @@ public class PluginThreeFactory implements Ice.PluginFactory _initialized = true; } + @Override public void destroy() { _destroyed = true; diff --git a/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java b/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java index 438b9455e26..bc5e4cc0be1 100644 --- a/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java +++ b/java/test/Ice/plugin/plugins/PluginThreeFailFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginThreeFailFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginThreeFail(communicator); @@ -23,16 +24,19 @@ public class PluginThreeFailFactory implements Ice.PluginFactory super(communicator); } + @Override public void initialize() { throw new PluginInitializeFailException(); } + @Override public void destroy() { test(false); } + @Override protected void finalize() throws Throwable { try diff --git a/java/test/Ice/plugin/plugins/PluginTwoFactory.java b/java/test/Ice/plugin/plugins/PluginTwoFactory.java index f6b40fbde2a..ecab2ba5222 100644 --- a/java/test/Ice/plugin/plugins/PluginTwoFactory.java +++ b/java/test/Ice/plugin/plugins/PluginTwoFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginTwoFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginTwo(communicator); @@ -23,6 +24,7 @@ public class PluginTwoFactory implements Ice.PluginFactory super(communicator); } + @Override public void initialize() { _other = (BasePlugin)_communicator.getPluginManager().getPlugin("PluginOne"); @@ -30,6 +32,7 @@ public class PluginTwoFactory implements Ice.PluginFactory _initialized = true; } + @Override public void destroy() { _destroyed = true; diff --git a/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java b/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java index a2c9657a511..1b5ee8fb4af 100644 --- a/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java +++ b/java/test/Ice/plugin/plugins/PluginTwoFailFactory.java @@ -11,6 +11,7 @@ package test.Ice.plugin.plugins; public class PluginTwoFailFactory implements Ice.PluginFactory { + @Override public Ice.Plugin create(Ice.Communicator communicator, String name, String[] args) { return new PluginTwoFail(communicator); @@ -23,6 +24,7 @@ public class PluginTwoFailFactory implements Ice.PluginFactory super(communicator); } + @Override public void initialize() { _one = (BasePluginFail)_communicator.getPluginManager().getPlugin("PluginOneFail"); @@ -32,6 +34,7 @@ public class PluginTwoFailFactory implements Ice.PluginFactory _initialized = true; } + @Override public void destroy() { test(!_one.isDestroyed()); @@ -42,6 +45,7 @@ public class PluginTwoFailFactory implements Ice.PluginFactory _destroyed = true; } + @Override protected void finalize() throws Throwable { try diff --git a/java/test/Ice/properties/Client.java b/java/test/Ice/properties/Client.java index ccd10c7c32d..4b2571e185c 100644 --- a/java/test/Ice/properties/Client.java +++ b/java/test/Ice/properties/Client.java @@ -22,6 +22,7 @@ public class Client extends test.Util.Application class PropertiesClient extends Ice.Application { + @Override public int run(String[] args) { @@ -35,6 +36,7 @@ public class Client extends test.Util.Application }; }; + @Override public int run(String[] args) { { diff --git a/java/test/Ice/proxy/AMDMyDerivedClassI.java b/java/test/Ice/proxy/AMDMyDerivedClassI.java index cc8a8ef93fb..5cf41db2870 100644 --- a/java/test/Ice/proxy/AMDMyDerivedClassI.java +++ b/java/test/Ice/proxy/AMDMyDerivedClassI.java @@ -20,6 +20,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass { } + @Override public void echo_async(AMD_MyDerivedClass_echo cb, Ice.ObjectPrx obj, @@ -28,6 +29,7 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(obj); } + @Override public void shutdown_async(AMD_MyClass_shutdown cb, Ice.Current c) @@ -36,12 +38,14 @@ public final class AMDMyDerivedClassI extends MyDerivedClass cb.ice_response(); } + @Override public void getContext_async(AMD_MyClass_getContext cb, Ice.Current current) { cb.ice_response(_ctx); } + @Override public boolean ice_isA(String s, Ice.Current current) { diff --git a/java/test/Ice/proxy/AMDServer.java b/java/test/Ice/proxy/AMDServer.java index 5e6165a50d7..3629cf905b0 100644 --- a/java/test/Ice/proxy/AMDServer.java +++ b/java/test/Ice/proxy/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.proxy; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/proxy/AllTests.java b/java/test/Ice/proxy/AllTests.java index 4910517c0db..959caa610b0 100644 --- a/java/test/Ice/proxy/AllTests.java +++ b/java/test/Ice/proxy/AllTests.java @@ -709,7 +709,7 @@ public class AllTests try { // Invalid -x option - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t 99 -v abc -x abc"); + communicator.stringToProxy("id:opaque -t 99 -v abc -x abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -719,7 +719,7 @@ public class AllTests try { // Missing -t and -v - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque"); + communicator.stringToProxy("id:opaque"); test(false); } catch(Ice.EndpointParseException ex) @@ -729,7 +729,7 @@ public class AllTests try { // Repeated -t - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t 1 -t 1 -v abc"); + communicator.stringToProxy("id:opaque -t 1 -t 1 -v abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -739,7 +739,7 @@ public class AllTests try { // Repeated -v - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t 1 -v abc -v abc"); + communicator.stringToProxy("id:opaque -t 1 -v abc -v abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -749,7 +749,7 @@ public class AllTests try { // Missing -t - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -v abc"); + communicator.stringToProxy("id:opaque -v abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -759,7 +759,7 @@ public class AllTests try { // Missing -v - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t 1"); + communicator.stringToProxy("id:opaque -t 1"); test(false); } catch(Ice.EndpointParseException ex) @@ -769,7 +769,7 @@ public class AllTests try { // Missing arg for -t - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t -v abc"); + communicator.stringToProxy("id:opaque -t -v abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -779,7 +779,7 @@ public class AllTests try { // Missing arg for -v - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t 1 -v"); + communicator.stringToProxy("id:opaque -t 1 -v"); test(false); } catch(Ice.EndpointParseException ex) @@ -789,7 +789,7 @@ public class AllTests try { // Not a number for -t - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t x -v abc"); + communicator.stringToProxy("id:opaque -t x -v abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -799,7 +799,7 @@ public class AllTests try { // < 0 for -t - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t -1 -v abc"); + communicator.stringToProxy("id:opaque -t -1 -v abc"); test(false); } catch(Ice.EndpointParseException ex) @@ -809,7 +809,7 @@ public class AllTests try { // Invalid char for -v - Ice.ObjectPrx p = communicator.stringToProxy("id:opaque -t 99 -v x?c"); + communicator.stringToProxy("id:opaque -t 99 -v x?c"); test(false); } catch(Ice.EndpointParseException ex) diff --git a/java/test/Ice/proxy/Client.java b/java/test/Ice/proxy/Client.java index cee6d735ac0..1ad397216c9 100644 --- a/java/test/Ice/proxy/Client.java +++ b/java/test/Ice/proxy/Client.java @@ -13,6 +13,7 @@ import test.Ice.proxy.Test.MyClassPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/proxy/Collocated.java b/java/test/Ice/proxy/Collocated.java index 00a8ae2b356..26e71003545 100644 --- a/java/test/Ice/proxy/Collocated.java +++ b/java/test/Ice/proxy/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.proxy; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -24,6 +25,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/proxy/MyDerivedClassI.java b/java/test/Ice/proxy/MyDerivedClassI.java index 3cf8c55207b..35cc76794c0 100644 --- a/java/test/Ice/proxy/MyDerivedClassI.java +++ b/java/test/Ice/proxy/MyDerivedClassI.java @@ -17,24 +17,28 @@ public final class MyDerivedClassI extends MyDerivedClass { } + @Override public Ice.ObjectPrx echo(Ice.ObjectPrx obj, Ice.Current c) { return obj; } + @Override public void shutdown(Ice.Current c) { c.adapter.getCommunicator().shutdown(); } + @Override public java.util.Map<String, String> getContext(Ice.Current current) { return _ctx; } + @Override public boolean ice_isA(String s, Ice.Current current) { diff --git a/java/test/Ice/proxy/Server.java b/java/test/Ice/proxy/Server.java index a6efa74221c..ae09627cfe5 100644 --- a/java/test/Ice/proxy/Server.java +++ b/java/test/Ice/proxy/Server.java @@ -11,6 +11,7 @@ package test.Ice.proxy; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/retry/Client.java b/java/test/Ice/retry/Client.java index df8d88c92c9..aaec9406b13 100644 --- a/java/test/Ice/retry/Client.java +++ b/java/test/Ice/retry/Client.java @@ -13,6 +13,7 @@ import test.Ice.retry.Test.RetryPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/retry/Collocated.java b/java/test/Ice/retry/Collocated.java index 388d6888f30..63868d1d64a 100644 --- a/java/test/Ice/retry/Collocated.java +++ b/java/test/Ice/retry/Collocated.java @@ -13,6 +13,7 @@ import test.Ice.retry.Test.RetryPrx; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -25,6 +26,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/retry/Instrumentation.java b/java/test/Ice/retry/Instrumentation.java index ba8094e9db0..4c825ba7231 100644 --- a/java/test/Ice/retry/Instrumentation.java +++ b/java/test/Ice/retry/Instrumentation.java @@ -22,11 +22,13 @@ public class Instrumentation static class InvocationObserverI implements Ice.Instrumentation.InvocationObserver { + @Override public void attach() { } + @Override public void detach() { @@ -36,6 +38,7 @@ public class Instrumentation } } + @Override public void failed(String msg) { @@ -45,6 +48,7 @@ public class Instrumentation } } + @Override public void retried() { @@ -54,17 +58,20 @@ public class Instrumentation } } + @Override public void userException() { } + @Override public Ice.Instrumentation.RemoteObserver getRemoteObserver(Ice.ConnectionInfo ci, Ice.Endpoint ei, int i, int j) { return null; } + @Override public Ice.Instrumentation.CollocatedObserver getCollocatedObserver(Ice.ObjectAdapter adapter, int i , int j) { @@ -76,18 +83,21 @@ public class Instrumentation static class CommunicatorObserverI implements Ice.Instrumentation.CommunicatorObserver { + @Override public Ice.Instrumentation.Observer getConnectionEstablishmentObserver(Ice.Endpoint e, String s) { return null; } + @Override public Ice.Instrumentation.Observer getEndpointLookupObserver(Ice.Endpoint e) { return null; } + @Override public Ice.Instrumentation.ConnectionObserver getConnectionObserver(Ice.ConnectionInfo ci, Ice.Endpoint ei, @@ -97,6 +107,7 @@ public class Instrumentation return null; } + @Override public Ice.Instrumentation.ThreadObserver getThreadObserver(String p, String n, @@ -106,18 +117,21 @@ public class Instrumentation return null; } + @Override public Ice.Instrumentation.InvocationObserver getInvocationObserver(Ice.ObjectPrx p, String o, java.util.Map<String, String> c) { return invocationObserver; } + @Override public Ice.Instrumentation.DispatchObserver getDispatchObserver(Ice.Current c, int i) { return null; } + @Override public void setObserverUpdater(Ice.Instrumentation.ObserverUpdater u) { diff --git a/java/test/Ice/retry/RetryI.java b/java/test/Ice/retry/RetryI.java index ae336cac007..31a0b104f55 100644 --- a/java/test/Ice/retry/RetryI.java +++ b/java/test/Ice/retry/RetryI.java @@ -17,6 +17,7 @@ public final class RetryI extends _RetryDisp { } + @Override public void op(boolean kill, Ice.Current current) { @@ -33,6 +34,7 @@ public final class RetryI extends _RetryDisp } } + @Override public int opIdempotent(int counter, Ice.Current current) { @@ -51,6 +53,7 @@ public final class RetryI extends _RetryDisp return _counter; } + @Override public void opNotIdempotent(int counter, Ice.Current current) { @@ -70,12 +73,14 @@ public final class RetryI extends _RetryDisp } } + @Override public void opSystemException(Ice.Current c) { throw new SystemFailure(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/retry/Server.java b/java/test/Ice/retry/Server.java index 16d21566553..678839b36a5 100644 --- a/java/test/Ice/retry/Server.java +++ b/java/test/Ice/retry/Server.java @@ -11,6 +11,7 @@ package test.Ice.retry; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/retry/SystemFailure.java b/java/test/Ice/retry/SystemFailure.java index f6c81c39694..fc03b8e6f82 100644 --- a/java/test/Ice/retry/SystemFailure.java +++ b/java/test/Ice/retry/SystemFailure.java @@ -11,6 +11,7 @@ package test.Ice.retry; class SystemFailure extends Ice.SystemException { + @Override public String ice_name() { diff --git a/java/test/Ice/seqMapping/AMDMyClassI.java b/java/test/Ice/seqMapping/AMDMyClassI.java index c483653323c..49ee338fc1d 100644 --- a/java/test/Ice/seqMapping/AMDMyClassI.java +++ b/java/test/Ice/seqMapping/AMDMyClassI.java @@ -14,6 +14,7 @@ import test.Ice.seqMapping.Serialize.*; public final class AMDMyClassI extends MyClass { + @Override public void shutdown_async(AMD_MyClass_shutdown cb, Ice.Current current) { @@ -21,18 +22,21 @@ public final class AMDMyClassI extends MyClass cb.ice_response(); } + @Override public void opSerialSmallJava_async(AMD_MyClass_opSerialSmallJava cb, Small i, Ice.Current current) { cb.ice_response(i, i); } + @Override public void opSerialLargeJava_async(AMD_MyClass_opSerialLargeJava cb, Large i, Ice.Current current) { cb.ice_response(i, i); } + @Override public void opSerialStructJava_async(AMD_MyClass_opSerialStructJava cb, Struct i, Ice.Current current) { cb.ice_response(i, i); diff --git a/java/test/Ice/seqMapping/AMDServer.java b/java/test/Ice/seqMapping/AMDServer.java index 0578dbc3c4b..5c3e9bc5fc0 100644 --- a/java/test/Ice/seqMapping/AMDServer.java +++ b/java/test/Ice/seqMapping/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.seqMapping; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { @@ -21,6 +22,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/seqMapping/Client.java b/java/test/Ice/seqMapping/Client.java index 1d7fd68301d..2124aefda4d 100644 --- a/java/test/Ice/seqMapping/Client.java +++ b/java/test/Ice/seqMapping/Client.java @@ -13,6 +13,7 @@ import test.Ice.seqMapping.Test.*; public class Client extends test.Util.Application { + @Override public int run(String[] args) { @@ -28,6 +29,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/seqMapping/Collocated.java b/java/test/Ice/seqMapping/Collocated.java index fc365c51137..bafcdce6b20 100644 --- a/java/test/Ice/seqMapping/Collocated.java +++ b/java/test/Ice/seqMapping/Collocated.java @@ -9,10 +9,9 @@ package test.Ice.seqMapping; -import test.Ice.seqMapping.Test.*; - public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { @@ -26,6 +25,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/seqMapping/MyClassI.java b/java/test/Ice/seqMapping/MyClassI.java index f354de6e369..f0a2505be21 100644 --- a/java/test/Ice/seqMapping/MyClassI.java +++ b/java/test/Ice/seqMapping/MyClassI.java @@ -14,33 +14,28 @@ import test.Ice.seqMapping.Serialize.*; public final class MyClassI extends MyClass { - private static void - test(boolean b) - { - if(!b) - { - throw new RuntimeException(); - } - } - + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public Small opSerialSmallJava(Small i, Ice.Holder<Small> o, Ice.Current current) { o.value = i; return i; } + @Override public Large opSerialLargeJava(Large i, Ice.Holder<Large> o, Ice.Current current) { o.value = i; return i; } + @Override public Struct opSerialStructJava(Struct i, Ice.Holder<Struct> o, Ice.Current current) { o.value = i; diff --git a/java/test/Ice/seqMapping/Server.java b/java/test/Ice/seqMapping/Server.java index 575e3fd0b98..eea5e6536dd 100644 --- a/java/test/Ice/seqMapping/Server.java +++ b/java/test/Ice/seqMapping/Server.java @@ -9,10 +9,9 @@ package test.Ice.seqMapping; -import test.Ice.seqMapping.Test.*; - public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -23,6 +22,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/seqMapping/TwowaysAMI.java b/java/test/Ice/seqMapping/TwowaysAMI.java index 7bf768ac402..77e75aacc7d 100644 --- a/java/test/Ice/seqMapping/TwowaysAMI.java +++ b/java/test/Ice/seqMapping/TwowaysAMI.java @@ -61,6 +61,7 @@ class TwowaysAMI private static class AMI_MyClass_opSerialSmallJavaNull extends AMI_MyClass_opSerialSmallJava { + @Override public void ice_response(Small r, Small o) { @@ -69,6 +70,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -86,6 +88,7 @@ class TwowaysAMI private static class AMI_MyClass_opSerialSmallJavaI extends AMI_MyClass_opSerialSmallJava { + @Override public void ice_response(Small r, Small o) { @@ -94,6 +97,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -111,6 +115,7 @@ class TwowaysAMI private static class AMI_MyClass_opSerialLargeJavaI extends AMI_MyClass_opSerialLargeJava { + @Override public void ice_response(Large r, Large o) { @@ -137,6 +142,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { @@ -154,6 +160,7 @@ class TwowaysAMI private static class AMI_MyClass_opSerialStructJavaI extends AMI_MyClass_opSerialStructJava { + @Override public void ice_response(Struct r, Struct o) { @@ -172,6 +179,7 @@ class TwowaysAMI callback.called(); } + @Override public void ice_exception(Ice.LocalException ex) { diff --git a/java/test/Ice/serialize/AllTests.java b/java/test/Ice/serialize/AllTests.java index 61940783a66..212acc0893c 100644 --- a/java/test/Ice/serialize/AllTests.java +++ b/java/test/Ice/serialize/AllTests.java @@ -65,8 +65,15 @@ public class AllTests byte[] bytes = initial.getStruct1(); ByteArrayInputStream bais = new ByteArrayInputStream(bytes); Ice.ObjectInputStream ois = new Ice.ObjectInputStream(communicator, bais); - Struct1 s = (Struct1)ois.readObject(); - checkStruct1(s); + try + { + Struct1 s = (Struct1)ois.readObject(); + checkStruct1(s); + } + finally + { + ois.close(); + } } catch(Throwable ex) { @@ -81,8 +88,15 @@ public class AllTests byte[] bytes = initial.getBase(); ByteArrayInputStream bais = new ByteArrayInputStream(bytes); Ice.ObjectInputStream ois = new Ice.ObjectInputStream(communicator, bais); - Base b = (Base)ois.readObject(); - checkBase(b); + try + { + Base b = (Base) ois.readObject(); + checkBase(b); + } + finally + { + ois.close(); + } } catch(Throwable ex) { @@ -97,9 +111,16 @@ public class AllTests byte[] bytes = initial.getEx(); ByteArrayInputStream bais = new ByteArrayInputStream(bytes); Ice.ObjectInputStream ois = new Ice.ObjectInputStream(communicator, bais); - Ex ex = (Ex)ois.readObject(); - checkStruct1(ex.s); - checkBase(ex.b); + try + { + Ex ex = (Ex)ois.readObject(); + checkStruct1(ex.s); + checkBase(ex.b); + } + finally + { + ois.close(); + } } catch(Throwable ex) { diff --git a/java/test/Ice/serialize/Client.java b/java/test/Ice/serialize/Client.java index 239fb0449d0..ffa339ba2ca 100644 --- a/java/test/Ice/serialize/Client.java +++ b/java/test/Ice/serialize/Client.java @@ -12,6 +12,7 @@ import test.Ice.serialize.Test.*; public class Client extends test.Util.Application { + @Override public int run(String[] args) { @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/serialize/InitialI.java b/java/test/Ice/serialize/InitialI.java index 4eca8a4d431..9fdd4e03c4c 100644 --- a/java/test/Ice/serialize/InitialI.java +++ b/java/test/Ice/serialize/InitialI.java @@ -46,6 +46,7 @@ public final class InitialI extends _InitialDisp _d.p = _s.p; } + @Override public byte[] getStruct1(Ice.Current current) { @@ -64,6 +65,7 @@ public final class InitialI extends _InitialDisp } } + @Override public byte[] getBase(Ice.Current current) { @@ -82,6 +84,7 @@ public final class InitialI extends _InitialDisp } } + @Override public byte[] getEx(Ice.Current current) { @@ -104,6 +107,7 @@ public final class InitialI extends _InitialDisp } } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/serialize/Server.java b/java/test/Ice/serialize/Server.java index 41d8dca2c97..19346017593 100644 --- a/java/test/Ice/serialize/Server.java +++ b/java/test/Ice/serialize/Server.java @@ -8,10 +8,10 @@ // ********************************************************************** package test.Ice.serialize; -import test.Ice.serialize.Test.*; public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -24,6 +24,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/servantLocator/AMDCookieI.java b/java/test/Ice/servantLocator/AMDCookieI.java index 66385ac2829..5f0d227ed38 100644 --- a/java/test/Ice/servantLocator/AMDCookieI.java +++ b/java/test/Ice/servantLocator/AMDCookieI.java @@ -13,6 +13,7 @@ import test.Ice.servantLocator.AMD.Test.Cookie; public final class AMDCookieI extends Cookie { + @Override public String message() { diff --git a/java/test/Ice/servantLocator/AMDServantLocatorI.java b/java/test/Ice/servantLocator/AMDServantLocatorI.java index c189767e25b..24b14d3ef39 100644 --- a/java/test/Ice/servantLocator/AMDServantLocatorI.java +++ b/java/test/Ice/servantLocator/AMDServantLocatorI.java @@ -28,6 +28,7 @@ public final class AMDServantLocatorI implements Ice.ServantLocator _requestId = -1; } + @Override protected synchronized void finalize() throws Throwable @@ -44,6 +45,7 @@ public final class AMDServantLocatorI implements Ice.ServantLocator } } + @Override public Ice.Object locate(Ice.Current current, Ice.LocalObjectHolder cookie) throws Ice.UserException { @@ -76,6 +78,7 @@ public final class AMDServantLocatorI implements Ice.ServantLocator return new AMDTestI(); } + @Override public void finished(Ice.Current current, Ice.Object servant, java.lang.Object cookie) throws Ice.UserException { @@ -102,6 +105,7 @@ public final class AMDServantLocatorI implements Ice.ServantLocator test(co.message().equals("blahblah")); } + @Override public synchronized void deactivate(String category) { diff --git a/java/test/Ice/servantLocator/AMDServer.java b/java/test/Ice/servantLocator/AMDServer.java index e7698c50fe7..29f8754170a 100644 --- a/java/test/Ice/servantLocator/AMDServer.java +++ b/java/test/Ice/servantLocator/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.servantLocator; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { @@ -23,6 +24,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/servantLocator/AMDTestActivationI.java b/java/test/Ice/servantLocator/AMDTestActivationI.java index d4d3f651657..31ecfeab516 100644 --- a/java/test/Ice/servantLocator/AMDTestActivationI.java +++ b/java/test/Ice/servantLocator/AMDTestActivationI.java @@ -13,6 +13,7 @@ import test.Ice.servantLocator.Test._TestActivationDisp; public final class AMDTestActivationI extends _TestActivationDisp { + @Override public void activateServantLocator(boolean activate, Ice.Current current) { if(activate) diff --git a/java/test/Ice/servantLocator/AMDTestI.java b/java/test/Ice/servantLocator/AMDTestI.java index 6879c15fd17..999b2871a89 100644 --- a/java/test/Ice/servantLocator/AMDTestI.java +++ b/java/test/Ice/servantLocator/AMDTestI.java @@ -27,30 +27,35 @@ import test.Ice.servantLocator.AMD.Test._TestIntfDisp; public final class AMDTestI extends _TestIntfDisp { + @Override public void requestFailedException_async(AMD_TestIntf_requestFailedException cb, Ice.Current current) { cb.ice_response(); } + @Override public void unknownUserException_async(AMD_TestIntf_unknownUserException cb, Ice.Current current) { cb.ice_response(); } + @Override public void unknownLocalException_async(AMD_TestIntf_unknownLocalException cb, Ice.Current current) { cb.ice_response(); } + @Override public void unknownException_async(AMD_TestIntf_unknownException cb, Ice.Current current) { cb.ice_response(); } + @Override public void localException_async(AMD_TestIntf_localException cb, Ice.Current current) { @@ -63,12 +68,14 @@ public final class AMDTestI extends _TestIntfDisp // cb.ice_response(); // } + @Override public void javaException_async(AMD_TestIntf_javaException cb, Ice.Current current) { cb.ice_response(); } + @Override public void unknownExceptionWithServantException_async(AMD_TestIntf_unknownExceptionWithServantException cb, Ice.Current current) @@ -76,6 +83,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(new Ice.ObjectNotExistException()); } + @Override public void impossibleException_async(AMD_TestIntf_impossibleException cb, boolean _throw, Ice.Current current) { @@ -93,6 +101,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void intfUserException_async(AMD_TestIntf_intfUserException cb, boolean _throw, Ice.Current current) { @@ -110,6 +119,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void asyncResponse_async(AMD_TestIntf_asyncResponse cb, Ice.Current current) { @@ -117,6 +127,7 @@ public final class AMDTestI extends _TestIntfDisp throw new Ice.ObjectNotExistException(); } + @Override public void asyncException_async(AMD_TestIntf_asyncException cb, Ice.Current current) { @@ -124,6 +135,7 @@ public final class AMDTestI extends _TestIntfDisp throw new Ice.ObjectNotExistException(); } + @Override public void shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) { diff --git a/java/test/Ice/servantLocator/Client.java b/java/test/Ice/servantLocator/Client.java index 6b173584769..c781cb5ac50 100644 --- a/java/test/Ice/servantLocator/Client.java +++ b/java/test/Ice/servantLocator/Client.java @@ -13,6 +13,7 @@ import test.Ice.servantLocator.Test.TestIntfPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { TestIntfPrx obj = AllTests.allTests(communicator(), getWriter()); @@ -20,6 +21,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/servantLocator/Collocated.java b/java/test/Ice/servantLocator/Collocated.java index 0c0d2d9e35d..612602d933d 100644 --- a/java/test/Ice/servantLocator/Collocated.java +++ b/java/test/Ice/servantLocator/Collocated.java @@ -11,6 +11,7 @@ package test.Ice.servantLocator; public class Collocated extends test.Util.Application { + @Override public int run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); @@ -23,6 +24,7 @@ public class Collocated extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/servantLocator/CookieI.java b/java/test/Ice/servantLocator/CookieI.java index eb06db5de29..52bab91e922 100644 --- a/java/test/Ice/servantLocator/CookieI.java +++ b/java/test/Ice/servantLocator/CookieI.java @@ -13,6 +13,7 @@ import test.Ice.servantLocator.Test.Cookie; public final class CookieI extends Cookie { + @Override public String message() { diff --git a/java/test/Ice/servantLocator/ServantLocatorI.java b/java/test/Ice/servantLocator/ServantLocatorI.java index 1b6d6cefee3..f3fa5388634 100644 --- a/java/test/Ice/servantLocator/ServantLocatorI.java +++ b/java/test/Ice/servantLocator/ServantLocatorI.java @@ -28,6 +28,7 @@ public final class ServantLocatorI implements Ice.ServantLocator _requestId = -1; } + @Override protected synchronized void finalize() throws Throwable @@ -44,6 +45,7 @@ public final class ServantLocatorI implements Ice.ServantLocator } } + @Override public Ice.Object locate(Ice.Current current, Ice.LocalObjectHolder cookie) throws Ice.UserException { @@ -76,6 +78,7 @@ public final class ServantLocatorI implements Ice.ServantLocator return new TestI(); } + @Override public void finished(Ice.Current current, Ice.Object servant, java.lang.Object cookie) throws Ice.UserException { @@ -102,6 +105,7 @@ public final class ServantLocatorI implements Ice.ServantLocator test(co.message().equals("blahblah")); } + @Override public synchronized void deactivate(String category) { diff --git a/java/test/Ice/servantLocator/Server.java b/java/test/Ice/servantLocator/Server.java index 06bb4fec80b..bd3dfdc7288 100644 --- a/java/test/Ice/servantLocator/Server.java +++ b/java/test/Ice/servantLocator/Server.java @@ -11,6 +11,7 @@ package test.Ice.servantLocator; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); @@ -22,6 +23,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/servantLocator/TestActivationI.java b/java/test/Ice/servantLocator/TestActivationI.java index 19d21fa497a..3c1c6f209ad 100644 --- a/java/test/Ice/servantLocator/TestActivationI.java +++ b/java/test/Ice/servantLocator/TestActivationI.java @@ -13,6 +13,7 @@ import test.Ice.servantLocator.Test._TestActivationDisp; public final class TestActivationI extends _TestActivationDisp { + @Override public void activateServantLocator(boolean activate, Ice.Current current) { if(activate) diff --git a/java/test/Ice/servantLocator/TestI.java b/java/test/Ice/servantLocator/TestI.java index fa44375cc54..b0704d4f6a6 100644 --- a/java/test/Ice/servantLocator/TestI.java +++ b/java/test/Ice/servantLocator/TestI.java @@ -15,26 +15,31 @@ import test.Ice.servantLocator.Test._TestIntfDisp; public final class TestI extends _TestIntfDisp { + @Override public void requestFailedException(Ice.Current current) { } + @Override public void unknownUserException(Ice.Current current) { } + @Override public void unknownLocalException(Ice.Current current) { } + @Override public void unknownException(Ice.Current current) { } + @Override public void localException(Ice.Current current) { @@ -45,17 +50,20 @@ public final class TestI extends _TestIntfDisp // { // } + @Override public void javaException(Ice.Current current) { } + @Override public void unknownExceptionWithServantException(Ice.Current current) { throw new Ice.ObjectNotExistException(); } + @Override public String impossibleException(boolean _throw, Ice.Current current) throws TestImpossibleException { @@ -71,6 +79,7 @@ public final class TestI extends _TestIntfDisp return "Hello"; } + @Override public String intfUserException(boolean _throw, Ice.Current current) throws TestIntfUserException, TestImpossibleException { @@ -86,6 +95,7 @@ public final class TestI extends _TestIntfDisp return "Hello"; } + @Override public void asyncResponse(Ice.Current current) throws TestIntfUserException, TestImpossibleException { @@ -94,6 +104,7 @@ public final class TestI extends _TestIntfDisp // } + @Override public void asyncException(Ice.Current current) throws TestIntfUserException, TestImpossibleException { @@ -102,6 +113,7 @@ public final class TestI extends _TestIntfDisp // } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/slicing/exceptions/AMDServer.java b/java/test/Ice/slicing/exceptions/AMDServer.java index d17e136543c..acca7cf53e8 100644 --- a/java/test/Ice/slicing/exceptions/AMDServer.java +++ b/java/test/Ice/slicing/exceptions/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.slicing.exceptions; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); @@ -20,6 +21,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/slicing/exceptions/AMDTestI.java b/java/test/Ice/slicing/exceptions/AMDTestI.java index c1b7a812abc..07ca77f5dad 100644 --- a/java/test/Ice/slicing/exceptions/AMDTestI.java +++ b/java/test/Ice/slicing/exceptions/AMDTestI.java @@ -22,6 +22,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) { @@ -29,6 +30,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(); } + @Override public void baseAsBase_async(AMD_TestIntf_baseAsBase cb, Ice.Current current) throws Base @@ -38,6 +40,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(b); } + @Override public void unknownDerivedAsBase_async(AMD_TestIntf_unknownDerivedAsBase cb, Ice.Current current) throws Base @@ -48,6 +51,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(d); } + @Override public void knownDerivedAsBase_async(AMD_TestIntf_knownDerivedAsBase cb, Ice.Current current) throws Base @@ -58,6 +62,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(d); } + @Override public void knownDerivedAsKnownDerived_async(AMD_TestIntf_knownDerivedAsKnownDerived cb, Ice.Current current) throws KnownDerived @@ -68,6 +73,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(d); } + @Override public void unknownIntermediateAsBase_async(AMD_TestIntf_unknownIntermediateAsBase cb, Ice.Current current) throws Base @@ -78,6 +84,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ui); } + @Override public void knownIntermediateAsBase_async(AMD_TestIntf_knownIntermediateAsBase cb, Ice.Current current) throws Base @@ -88,6 +95,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ki); } + @Override public void knownMostDerivedAsBase_async(AMD_TestIntf_knownMostDerivedAsBase cb, Ice.Current current) throws Base @@ -99,6 +107,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(kmd); } + @Override public void knownIntermediateAsKnownIntermediate_async(AMD_TestIntf_knownIntermediateAsKnownIntermediate cb, Ice.Current current) @@ -110,6 +119,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ki); } + @Override public void knownMostDerivedAsKnownIntermediate_async(AMD_TestIntf_knownMostDerivedAsKnownIntermediate cb, Ice.Current current) @@ -122,6 +132,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(kmd); } + @Override public void knownMostDerivedAsKnownMostDerived_async(AMD_TestIntf_knownMostDerivedAsKnownMostDerived cb, Ice.Current current) @@ -134,6 +145,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(kmd); } + @Override public void unknownMostDerived1AsBase_async(AMD_TestIntf_unknownMostDerived1AsBase cb, Ice.Current current) throws Base @@ -145,6 +157,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(umd1); } + @Override public void unknownMostDerived1AsKnownIntermediate_async(AMD_TestIntf_unknownMostDerived1AsKnownIntermediate cb, Ice.Current current) @@ -157,6 +170,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(umd1); } + @Override public void unknownMostDerived2AsBase_async(AMD_TestIntf_unknownMostDerived2AsBase cb, Ice.Current current) throws Base @@ -168,6 +182,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(umd2); } + @Override public void unknownMostDerived2AsBaseCompact_async(AMD_TestIntf_unknownMostDerived2AsBaseCompact cb, Ice.Current current) { @@ -178,6 +193,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(umd2); } + @Override public void knownPreservedAsBase_async(AMD_TestIntf_knownPreservedAsBase cb, Ice.Current current) { @@ -188,6 +204,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ex); } + @Override public void knownPreservedAsKnownPreserved_async(AMD_TestIntf_knownPreservedAsKnownPreserved cb, Ice.Current current) { @@ -198,6 +215,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ex); } + @Override public void relayKnownPreservedAsBase_async(AMD_TestIntf_relayKnownPreservedAsBase cb, RelayPrx r, Ice.Current current) { @@ -216,6 +234,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void relayKnownPreservedAsKnownPreserved_async(AMD_TestIntf_relayKnownPreservedAsKnownPreserved cb, RelayPrx r, Ice.Current current) @@ -235,6 +254,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void unknownPreservedAsBase_async(AMD_TestIntf_unknownPreservedAsBase cb, Ice.Current current) { @@ -247,6 +267,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ex); } + @Override public void unknownPreservedAsKnownPreserved_async(AMD_TestIntf_unknownPreservedAsKnownPreserved cb, Ice.Current current) { @@ -259,6 +280,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ex); } + @Override public void relayUnknownPreservedAsBase_async(AMD_TestIntf_relayUnknownPreservedAsBase cb, RelayPrx r, Ice.Current current) { @@ -277,6 +299,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void relayUnknownPreservedAsKnownPreserved_async(AMD_TestIntf_relayUnknownPreservedAsKnownPreserved cb, RelayPrx r, Ice.Current current) diff --git a/java/test/Ice/slicing/exceptions/AllTests.java b/java/test/Ice/slicing/exceptions/AllTests.java index 9fa8b506246..cd159a9006b 100644 --- a/java/test/Ice/slicing/exceptions/AllTests.java +++ b/java/test/Ice/slicing/exceptions/AllTests.java @@ -59,18 +59,21 @@ public class AllTests private static class Callback_TestIntf_baseAsBaseI extends Callback_TestIntf_baseAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -101,18 +104,21 @@ public class AllTests private static class Callback_TestIntf_unknownDerivedAsBaseI extends Callback_TestIntf_unknownDerivedAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -143,18 +149,21 @@ public class AllTests private static class Callback_TestIntf_knownDerivedAsBaseI extends Callback_TestIntf_knownDerivedAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -187,18 +196,21 @@ public class AllTests private static class Callback_TestIntf_knownDerivedAsKnownDerivedI extends Callback_TestIntf_knownDerivedAsKnownDerived { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -231,18 +243,21 @@ public class AllTests private static class Callback_TestIntf_unknownIntermediateAsBaseI extends Callback_TestIntf_unknownIntermediateAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -273,18 +288,21 @@ public class AllTests private static class Callback_TestIntf_knownIntermediateAsBaseI extends Callback_TestIntf_knownIntermediateAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -316,18 +334,21 @@ public class AllTests private static class Callback_TestIntf_knownMostDerivedAsBaseI extends Callback_TestIntf_knownMostDerivedAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -361,18 +382,21 @@ public class AllTests private static class Callback_TestIntf_knownIntermediateAsKnownIntermediateI extends Callback_TestIntf_knownIntermediateAsKnownIntermediate { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -405,18 +429,21 @@ public class AllTests private static class Callback_TestIntf_knownMostDerivedAsKnownIntermediateI extends Callback_TestIntf_knownMostDerivedAsKnownIntermediate { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -450,18 +477,21 @@ public class AllTests private static class Callback_TestIntf_knownMostDerivedAsKnownMostDerivedI extends Callback_TestIntf_knownMostDerivedAsKnownMostDerived { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -495,18 +525,21 @@ public class AllTests private static class Callback_TestIntf_unknownMostDerived1AsBaseI extends Callback_TestIntf_unknownMostDerived1AsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -539,18 +572,21 @@ public class AllTests private static class Callback_TestIntf_unknownMostDerived1AsKnownIntermediateI extends Callback_TestIntf_unknownMostDerived1AsKnownIntermediate { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -583,18 +619,21 @@ public class AllTests private static class Callback_TestIntf_unknownMostDerived2AsBaseI extends Callback_TestIntf_unknownMostDerived2AsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -625,6 +664,7 @@ public class AllTests private static class RelayI extends _RelayDisp { + @Override public void knownPreservedAsBase(Ice.Current current) throws Base { @@ -635,6 +675,7 @@ public class AllTests throw ex; } + @Override public void knownPreservedAsKnownPreserved(Ice.Current current) throws KnownPreserved { @@ -645,6 +686,7 @@ public class AllTests throw ex; } + @Override public void unknownPreservedAsBase(Ice.Current current) throws Base { @@ -657,6 +699,7 @@ public class AllTests throw ex; } + @Override public void unknownPreservedAsKnownPreserved(Ice.Current current) throws KnownPreserved { diff --git a/java/test/Ice/slicing/exceptions/Client.java b/java/test/Ice/slicing/exceptions/Client.java index e0a8601ccbd..bee392fe3b3 100644 --- a/java/test/Ice/slicing/exceptions/Client.java +++ b/java/test/Ice/slicing/exceptions/Client.java @@ -13,6 +13,7 @@ import test.Ice.slicing.exceptions.client.Test.TestIntfPrx; public class Client extends test.Util.Application { + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/slicing/exceptions/Server.java b/java/test/Ice/slicing/exceptions/Server.java index ab6bb8adcba..0844dd92275 100644 --- a/java/test/Ice/slicing/exceptions/Server.java +++ b/java/test/Ice/slicing/exceptions/Server.java @@ -21,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/slicing/exceptions/TestI.java b/java/test/Ice/slicing/exceptions/TestI.java index 9676c1b2589..9cedab3b4af 100644 --- a/java/test/Ice/slicing/exceptions/TestI.java +++ b/java/test/Ice/slicing/exceptions/TestI.java @@ -22,12 +22,14 @@ public final class TestI extends _TestIntfDisp } } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public void baseAsBase(Ice.Current current) throws Base @@ -37,6 +39,7 @@ public final class TestI extends _TestIntfDisp throw b; } + @Override public void unknownDerivedAsBase(Ice.Current current) throws Base @@ -47,6 +50,7 @@ public final class TestI extends _TestIntfDisp throw d; } + @Override public void knownDerivedAsBase(Ice.Current current) throws Base @@ -57,6 +61,7 @@ public final class TestI extends _TestIntfDisp throw d; } + @Override public void knownDerivedAsKnownDerived(Ice.Current current) throws KnownDerived @@ -67,6 +72,7 @@ public final class TestI extends _TestIntfDisp throw d; } + @Override public void unknownIntermediateAsBase(Ice.Current current) throws Base @@ -77,6 +83,7 @@ public final class TestI extends _TestIntfDisp throw ui; } + @Override public void knownIntermediateAsBase(Ice.Current current) throws Base @@ -87,6 +94,7 @@ public final class TestI extends _TestIntfDisp throw ki; } + @Override public void knownMostDerivedAsBase(Ice.Current current) throws Base @@ -98,6 +106,7 @@ public final class TestI extends _TestIntfDisp throw kmd; } + @Override public void knownIntermediateAsKnownIntermediate(Ice.Current current) throws KnownIntermediate @@ -108,6 +117,7 @@ public final class TestI extends _TestIntfDisp throw ki; } + @Override public void knownMostDerivedAsKnownIntermediate(Ice.Current current) throws KnownIntermediate @@ -119,6 +129,7 @@ public final class TestI extends _TestIntfDisp throw kmd; } + @Override public void knownMostDerivedAsKnownMostDerived(Ice.Current current) throws KnownMostDerived @@ -130,6 +141,7 @@ public final class TestI extends _TestIntfDisp throw kmd; } + @Override public void unknownMostDerived1AsBase(Ice.Current current) throws Base @@ -141,6 +153,7 @@ public final class TestI extends _TestIntfDisp throw umd1; } + @Override public void unknownMostDerived1AsKnownIntermediate(Ice.Current current) throws KnownIntermediate @@ -152,6 +165,7 @@ public final class TestI extends _TestIntfDisp throw umd1; } + @Override public void unknownMostDerived2AsBase(Ice.Current current) throws Base @@ -163,6 +177,7 @@ public final class TestI extends _TestIntfDisp throw umd2; } + @Override public void unknownMostDerived2AsBaseCompact(Ice.Current current) throws Base @@ -174,6 +189,7 @@ public final class TestI extends _TestIntfDisp throw umd2; } + @Override public void knownPreservedAsBase(Ice.Current current) throws Base @@ -185,6 +201,7 @@ public final class TestI extends _TestIntfDisp throw ex; } + @Override public void knownPreservedAsKnownPreserved(Ice.Current current) throws KnownPreserved @@ -196,6 +213,7 @@ public final class TestI extends _TestIntfDisp throw ex; } + @Override public void relayKnownPreservedAsBase(RelayPrx r, Ice.Current current) throws Base @@ -204,6 +222,7 @@ public final class TestI extends _TestIntfDisp test(false); } + @Override public void relayKnownPreservedAsKnownPreserved(RelayPrx r, Ice.Current current) throws KnownPreserved @@ -212,6 +231,7 @@ public final class TestI extends _TestIntfDisp test(false); } + @Override public void unknownPreservedAsBase(Ice.Current current) throws Base @@ -225,6 +245,7 @@ public final class TestI extends _TestIntfDisp throw ex; } + @Override public void unknownPreservedAsKnownPreserved(Ice.Current current) throws KnownPreserved @@ -238,6 +259,7 @@ public final class TestI extends _TestIntfDisp throw ex; } + @Override public void relayUnknownPreservedAsBase(RelayPrx r, Ice.Current current) throws Base @@ -246,6 +268,7 @@ public final class TestI extends _TestIntfDisp test(false); } + @Override public void relayUnknownPreservedAsKnownPreserved(RelayPrx r, Ice.Current current) throws KnownPreserved diff --git a/java/test/Ice/slicing/objects/AMDServer.java b/java/test/Ice/slicing/objects/AMDServer.java index c3a3c282e4c..c905976b193 100644 --- a/java/test/Ice/slicing/objects/AMDServer.java +++ b/java/test/Ice/slicing/objects/AMDServer.java @@ -11,6 +11,7 @@ package test.Ice.slicing.objects; public class AMDServer extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class AMDServer extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/slicing/objects/AMDTestI.java b/java/test/Ice/slicing/objects/AMDTestI.java index 877a3181bb5..f1c9e814a9b 100644 --- a/java/test/Ice/slicing/objects/AMDTestI.java +++ b/java/test/Ice/slicing/objects/AMDTestI.java @@ -22,6 +22,7 @@ public final class AMDTestI extends _TestIntfDisp } } + @Override public void shutdown_async(AMD_TestIntf_shutdown cb, Ice.Current current) { @@ -29,6 +30,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(); } + @Override public void SBaseAsObject_async(AMD_TestIntf_SBaseAsObject cb, Ice.Current current) { @@ -37,6 +39,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(sb); } + @Override public void SBaseAsSBase_async(AMD_TestIntf_SBaseAsSBase cb, Ice.Current current) { @@ -45,6 +48,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(sb); } + @Override public void SBSKnownDerivedAsSBase_async(AMD_TestIntf_SBSKnownDerivedAsSBase cb, Ice.Current current) { @@ -54,6 +58,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(sbskd); } + @Override public void SBSKnownDerivedAsSBSKnownDerived_async(AMD_TestIntf_SBSKnownDerivedAsSBSKnownDerived cb, Ice.Current current) { @@ -63,6 +68,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(sbskd); } + @Override public void SBSUnknownDerivedAsSBase_async(AMD_TestIntf_SBSUnknownDerivedAsSBase cb, Ice.Current current) { @@ -72,6 +78,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(sbsud); } + @Override public void SBSUnknownDerivedAsSBaseCompact_async(AMD_TestIntf_SBSUnknownDerivedAsSBaseCompact cb, Ice.Current current) { @@ -81,6 +88,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(sbsud); } + @Override public void SUnknownAsObject_async(AMD_TestIntf_SUnknownAsObject cb, Ice.Current current) { @@ -89,6 +97,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(su); } + @Override public void checkSUnknown_async(AMD_TestIntf_checkSUnknown cb, Ice.Object obj, Ice.Current current) { @@ -104,6 +113,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(); } + @Override public void oneElementCycle_async(AMD_TestIntf_oneElementCycle cb, Ice.Current current) { @@ -113,6 +123,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(b); } + @Override public void twoElementCycle_async(AMD_TestIntf_twoElementCycle cb, Ice.Current current) { @@ -125,6 +136,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(b1); } + @Override public void D1AsB_async(AMD_TestIntf_D1AsB cb, Ice.Current current) { @@ -141,6 +153,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d1); } + @Override public void D1AsD1_async(AMD_TestIntf_D1AsD1 cb, Ice.Current current) { @@ -157,6 +170,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d1); } + @Override public void D2AsB_async(AMD_TestIntf_D2AsB cb, Ice.Current current) { @@ -173,6 +187,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d2); } + @Override public void paramTest1_async(AMD_TestIntf_paramTest1 cb, Ice.Current current) { @@ -189,6 +204,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d1, d2); } + @Override public void paramTest2_async(AMD_TestIntf_paramTest2 cb, Ice.Current current) { @@ -205,6 +221,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d2, d1); } + @Override public void paramTest3_async(AMD_TestIntf_paramTest3 cb, Ice.Current current) { @@ -234,6 +251,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d3, d2, d4); } + @Override public void paramTest4_async(AMD_TestIntf_paramTest4 cb, Ice.Current current) { @@ -247,6 +265,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d4.p2, d4); } + @Override public void returnTest1_async(AMD_TestIntf_returnTest1 cb, Ice.Current current) { @@ -263,6 +282,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d2, d2, d1); } + @Override public void returnTest2_async(AMD_TestIntf_returnTest2 cb, Ice.Current current) { @@ -279,12 +299,14 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(d1, d1, d2); } + @Override public void returnTest3_async(AMD_TestIntf_returnTest3 cb, B p1, B p2, Ice.Current current) { cb.ice_response(p1); } + @Override public void sequenceTest_async(AMD_TestIntf_sequenceTest cb, SS1 p1, SS2 p2, Ice.Current current) { @@ -294,6 +316,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(ss); } + @Override public void dictionaryTest_async(AMD_TestIntf_dictionaryTest cb, java.util.Map<Integer, B> bin, Ice.Current current) { @@ -323,12 +346,14 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(r, bout); } + @Override public void exchangePBase_async(AMD_TestIntf_exchangePBase cb, PBase pb, Ice.Current current) { cb.ice_response(pb); } + @Override public void PBSUnknownAsPreserved_async(AMD_TestIntf_PBSUnknownAsPreserved cb, Ice.Current current) { @@ -348,6 +373,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(r); } + @Override public void checkPBSUnknown_async(AMD_TestIntf_checkPBSUnknown cb, Preserved p, Ice.Current current) { @@ -369,6 +395,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(); } + @Override public void PBSUnknownAsPreservedWithGraph_async(AMD_TestIntf_PBSUnknownAsPreservedWithGraph cb, Ice.Current current) { @@ -384,6 +411,7 @@ public final class AMDTestI extends _TestIntfDisp r.graph.next.next.next = null; // Break the cycle. } + @Override public void checkPBSUnknownWithGraph_async(AMD_TestIntf_checkPBSUnknownWithGraph cb, Preserved p, Ice.Current current) { @@ -407,6 +435,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(); } + @Override public void PBSUnknown2AsPreservedWithGraph_async(AMD_TestIntf_PBSUnknown2AsPreservedWithGraph cb, Ice.Current current) { @@ -418,6 +447,7 @@ public final class AMDTestI extends _TestIntfDisp r.pb = null; // Break the cycle. } + @Override public void checkPBSUnknown2WithGraph_async(AMD_TestIntf_checkPBSUnknown2WithGraph cb, Preserved p, Ice.Current current) { @@ -438,12 +468,14 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_response(); } + @Override public void exchangePNode_async(AMD_TestIntf_exchangePNode cb, PNode pn, Ice.Current current) { cb.ice_response(pn); } + @Override public void throwBaseAsBase_async(AMD_TestIntf_throwBaseAsBase cb, Ice.Current current) throws BaseException @@ -456,6 +488,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(be); } + @Override public void throwDerivedAsBase_async(AMD_TestIntf_throwDerivedAsBase cb, Ice.Current current) throws BaseException @@ -474,6 +507,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(de); } + @Override public void throwDerivedAsDerived_async(AMD_TestIntf_throwDerivedAsDerived cb, Ice.Current current) throws DerivedException @@ -492,6 +526,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(de); } + @Override public void throwUnknownDerivedAsBase_async(AMD_TestIntf_throwUnknownDerivedAsBase cb, Ice.Current current) throws BaseException @@ -510,6 +545,7 @@ public final class AMDTestI extends _TestIntfDisp cb.ice_exception(ude); } + @Override public void throwPreservedException_async(AMD_TestIntf_throwPreservedException cb, Ice.Current current) { @@ -522,6 +558,7 @@ public final class AMDTestI extends _TestIntfDisp ue.p.pb = null; // Break the cycle. } + @Override public void useForward_async(AMD_TestIntf_useForward cb, Ice.Current current) { diff --git a/java/test/Ice/slicing/objects/AllTests.java b/java/test/Ice/slicing/objects/AllTests.java index a1dce237ad9..be43330eae1 100644 --- a/java/test/Ice/slicing/objects/AllTests.java +++ b/java/test/Ice/slicing/objects/AllTests.java @@ -9,7 +9,6 @@ package test.Ice.slicing.objects; -import java.io.PrintStream; import java.io.PrintWriter; import test.Ice.slicing.objects.client.Test.*; @@ -62,6 +61,7 @@ public class AllTests private static class Callback_TestIntf_SBaseAsObjectI extends Callback_TestIntf_SBaseAsObject { + @Override public void response(Ice.Object o) { @@ -73,6 +73,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -80,12 +81,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -96,6 +91,7 @@ public class AllTests private static class Callback_TestIntf_SBaseAsSBaseI extends Callback_TestIntf_SBaseAsSBase { + @Override public void response(SBase sb) { @@ -103,6 +99,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -110,12 +107,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -126,6 +117,7 @@ public class AllTests private static class Callback_TestIntf_SBSKnownDerivedAsSBaseI extends Callback_TestIntf_SBSKnownDerivedAsSBase { + @Override public void response(SBase sb) { @@ -136,6 +128,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -143,12 +136,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -160,6 +147,7 @@ public class AllTests private static class Callback_TestIntf_SBSKnownDerivedAsSBSKnownDerivedI extends Callback_TestIntf_SBSKnownDerivedAsSBSKnownDerived { + @Override public void response(SBSKnownDerived sbskd) { @@ -167,6 +155,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -174,12 +163,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -190,6 +173,7 @@ public class AllTests private static class Callback_TestIntf_SBSUnknownDerivedAsSBaseI extends Callback_TestIntf_SBSUnknownDerivedAsSBase { + @Override public void response(SBase sb) { @@ -197,6 +181,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -204,12 +189,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -221,6 +200,7 @@ public class AllTests private static class Callback_TestIntf_SBSUnknownDerivedAsSBaseCompactI extends Callback_TestIntf_SBSUnknownDerivedAsSBaseCompact { + @Override public void response(SBase sb) { @@ -228,6 +208,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -240,12 +221,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -257,12 +232,14 @@ public class AllTests private static class Callback_TestIntf_SBSUnknownDerivedAsSBaseCompactFailI extends Callback_TestIntf_SBSUnknownDerivedAsSBaseCompact { + @Override public void response(SBase sb) { test(false); } + @Override public void exception(Ice.LocalException exc) { @@ -276,12 +253,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -292,12 +263,14 @@ public class AllTests private static class Callback_TestIntf_SUnknownAsObjectI1 extends Callback_TestIntf_SUnknownAsObject { + @Override public void response(Ice.Object o) { test(false); } + @Override public void exception(Ice.LocalException exc) { @@ -306,12 +279,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -322,6 +289,7 @@ public class AllTests private static class Callback_TestIntf_SUnknownAsObjectI2 extends Callback_TestIntf_SUnknownAsObject { + @Override public void response(Ice.Object o) { @@ -330,6 +298,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -337,12 +306,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -353,6 +316,7 @@ public class AllTests private static class Callback_TestIntf_oneElementCycleI extends Callback_TestIntf_oneElementCycle { + @Override public void response(B b) { @@ -363,6 +327,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -370,12 +335,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -386,6 +345,7 @@ public class AllTests private static class Callback_TestIntf_twoElementCycleI extends Callback_TestIntf_twoElementCycle { + @Override public void response(B b1) { @@ -401,6 +361,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -408,12 +369,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -424,6 +379,7 @@ public class AllTests private static class Callback_TestIntf_D1AsBI extends Callback_TestIntf_D1AsB { + @Override public void response(B b1) { @@ -447,6 +403,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -454,12 +411,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -470,6 +421,7 @@ public class AllTests private static class Callback_TestIntf_D1AsD1I extends Callback_TestIntf_D1AsD1 { + @Override public void response(D1 d1) { @@ -487,6 +439,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -494,12 +447,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -510,6 +457,7 @@ public class AllTests private static class Callback_TestIntf_D2AsBI extends Callback_TestIntf_D2AsB { + @Override public void response(B b2) { @@ -531,6 +479,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -538,12 +487,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -554,6 +497,7 @@ public class AllTests private static class Callback_TestIntf_paramTest1I extends Callback_TestIntf_paramTest1 { + @Override public void response(B b1, B b2) { @@ -573,6 +517,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -580,12 +525,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -596,6 +535,7 @@ public class AllTests private static class Callback_TestIntf_paramTest2I extends Callback_TestIntf_paramTest2 { + @Override public void response(B b2, B b1) { @@ -615,6 +555,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -622,12 +563,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -638,6 +573,7 @@ public class AllTests private static class Callback_TestIntf_returnTest1I extends Callback_TestIntf_returnTest1 { + @Override public void response(B r, B p1, B p2) { @@ -645,6 +581,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -652,12 +589,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -668,6 +599,7 @@ public class AllTests private static class Callback_TestIntf_returnTest2I extends Callback_TestIntf_returnTest2 { + @Override public void response(B r, B p1, B p2) { @@ -675,6 +607,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -682,12 +615,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -698,6 +625,7 @@ public class AllTests private static class Callback_TestIntf_returnTest3I extends Callback_TestIntf_returnTest3 { + @Override public void response(B b) { @@ -705,6 +633,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -712,12 +641,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -730,6 +653,7 @@ public class AllTests private static class Callback_TestIntf_paramTest3I extends Callback_TestIntf_paramTest3 { + @Override public void response(B ret, B p1, B p2) { @@ -750,6 +674,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -757,12 +682,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -773,6 +692,7 @@ public class AllTests private static class Callback_TestIntf_paramTest4I extends Callback_TestIntf_paramTest4 { + @Override public void response(B ret, B b) { @@ -788,6 +708,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -795,12 +716,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -811,6 +726,7 @@ public class AllTests private static class Callback_TestIntf_sequenceTestI extends Callback_TestIntf_sequenceTest { + @Override public void response(SS3 ss) { @@ -818,6 +734,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -825,12 +742,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -843,6 +754,7 @@ public class AllTests private static class Callback_TestIntf_dictionaryTestI extends Callback_TestIntf_dictionaryTest { + @Override public void response(java.util.Map<Integer, B> r, java.util.Map<Integer, B> bout) { @@ -851,6 +763,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -858,12 +771,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -877,18 +784,21 @@ public class AllTests private static class Callback_TestIntf_throwBaseAsBaseI extends Callback_TestIntf_throwBaseAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -919,18 +829,21 @@ public class AllTests private static class Callback_TestIntf_throwDerivedAsBaseI extends Callback_TestIntf_throwDerivedAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -967,18 +880,21 @@ public class AllTests private static class Callback_TestIntf_throwDerivedAsDerivedI extends Callback_TestIntf_throwDerivedAsDerived { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -1016,18 +932,21 @@ public class AllTests private static class Callback_TestIntf_throwUnknownDerivedAsBaseI extends Callback_TestIntf_throwUnknownDerivedAsBase { + @Override public void response() { test(false); } + @Override public void exception(Ice.LocalException exc) { test(false); } + @Override public void exception(Ice.UserException exc) { @@ -1058,6 +977,7 @@ public class AllTests private static class Callback_TestIntf_useForwardI extends Callback_TestIntf_useForward { + @Override public void response(Forward f) { @@ -1065,6 +985,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1072,12 +993,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1088,6 +1003,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseI1 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1098,6 +1014,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1110,12 +1027,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1126,6 +1037,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseI2 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1134,6 +1046,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1146,12 +1059,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1162,6 +1069,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseI3 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1170,6 +1078,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1182,12 +1091,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1198,6 +1101,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseI4 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1207,6 +1111,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1219,12 +1124,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1235,6 +1134,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseICompact1 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1243,6 +1143,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1255,12 +1156,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1271,6 +1166,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseICompact2 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1280,6 +1176,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1292,12 +1189,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1308,6 +1199,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseI5 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1317,6 +1209,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1329,12 +1222,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1345,6 +1232,7 @@ public class AllTests private static class Callback_TestIntf_exchangePBaseI6 extends Callback_TestIntf_exchangePBase { + @Override public void response(PBase r) { @@ -1363,6 +1251,7 @@ public class AllTests callback.called(); } + @Override public void exception(Ice.LocalException exc) { @@ -1375,12 +1264,6 @@ public class AllTests } public void - exception(Ice.UserException exc) - { - test(false); - } - - public void check() { callback.check(); @@ -1401,6 +1284,7 @@ public class AllTests private static class NodeFactoryI implements Ice.ObjectFactory { + @Override public Ice.Object create(String id) { if(id.equals(PNode.ice_staticId())) @@ -1410,6 +1294,7 @@ public class AllTests return null; } + @Override public void destroy() { } @@ -1427,6 +1312,7 @@ public class AllTests private static class PreservedFactoryI implements Ice.ObjectFactory { + @Override public Ice.Object create(String id) { if(id.equals(Preserved.ice_staticId())) @@ -1436,6 +1322,7 @@ public class AllTests return null; } + @Override public void destroy() { } @@ -1604,7 +1491,7 @@ public class AllTests // This test fails when using the compact format because the instance cannot // be sliced to a known type. // - SBase sb = test.SBSUnknownDerivedAsSBaseCompact(); + test.SBSUnknownDerivedAsSBaseCompact(); test(false); } catch(Ice.NoObjectFactoryException ex) @@ -2030,6 +1917,7 @@ public class AllTests try { D3 p3 = (D3)b2; + test(p3 != null); test(false); } catch(ClassCastException ex) @@ -2083,6 +1971,7 @@ public class AllTests try { D3 p3 = (D3)b2; + test(p3 != null); test(false); } catch(ClassCastException ex) @@ -2121,6 +2010,7 @@ public class AllTests try { D3 p1 = (D3)b1; + test(p1 != null); test(false); } catch(ClassCastException ex) @@ -2175,6 +2065,7 @@ public class AllTests try { D3 p1 = (D3)b1; + test(p1 != null); test(false); } catch(ClassCastException ex) @@ -3194,7 +3085,7 @@ public class AllTests c.next.next.next = c; test(PNodeI.counter == 0); - PNode n = test.exchangePNode(c); + test.exchangePNode(c); test(PNodeI.counter == 3); PNodeI.counter = 0; diff --git a/java/test/Ice/slicing/objects/Client.java b/java/test/Ice/slicing/objects/Client.java index 37e248f1f21..e725c725339 100644 --- a/java/test/Ice/slicing/objects/Client.java +++ b/java/test/Ice/slicing/objects/Client.java @@ -13,6 +13,7 @@ import test.Ice.slicing.objects.client.Test.TestIntfPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/slicing/objects/Server.java b/java/test/Ice/slicing/objects/Server.java index 20b9c86d8d1..fded6895de1 100644 --- a/java/test/Ice/slicing/objects/Server.java +++ b/java/test/Ice/slicing/objects/Server.java @@ -11,6 +11,7 @@ package test.Ice.slicing.objects; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -21,6 +22,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/slicing/objects/TestI.java b/java/test/Ice/slicing/objects/TestI.java index 8fbe8b8c548..aa199bfdcbe 100644 --- a/java/test/Ice/slicing/objects/TestI.java +++ b/java/test/Ice/slicing/objects/TestI.java @@ -22,12 +22,14 @@ public final class TestI extends _TestIntfDisp } } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public Ice.Object SBaseAsObject(Ice.Current current) { @@ -36,6 +38,7 @@ public final class TestI extends _TestIntfDisp return sb; } + @Override public SBase SBaseAsSBase(Ice.Current current) { @@ -44,6 +47,7 @@ public final class TestI extends _TestIntfDisp return sb; } + @Override public SBase SBSKnownDerivedAsSBase(Ice.Current current) { @@ -53,6 +57,7 @@ public final class TestI extends _TestIntfDisp return sbskd; } + @Override public SBSKnownDerived SBSKnownDerivedAsSBSKnownDerived(Ice.Current current) { @@ -62,6 +67,7 @@ public final class TestI extends _TestIntfDisp return sbskd; } + @Override public SBase SBSUnknownDerivedAsSBase(Ice.Current current) { @@ -71,6 +77,7 @@ public final class TestI extends _TestIntfDisp return sbsud; } + @Override public SBase SBSUnknownDerivedAsSBaseCompact(Ice.Current current) { @@ -80,6 +87,7 @@ public final class TestI extends _TestIntfDisp return sbsud; } + @Override public Ice.Object SUnknownAsObject(Ice.Current current) { @@ -88,6 +96,7 @@ public final class TestI extends _TestIntfDisp return su; } + @Override public void checkSUnknown(Ice.Object obj, Ice.Current current) { @@ -102,6 +111,7 @@ public final class TestI extends _TestIntfDisp } } + @Override public B oneElementCycle(Ice.Current current) { @@ -111,6 +121,7 @@ public final class TestI extends _TestIntfDisp return b; } + @Override public B twoElementCycle(Ice.Current current) { @@ -123,6 +134,7 @@ public final class TestI extends _TestIntfDisp return b1; } + @Override public B D1AsB(Ice.Current current) { @@ -139,6 +151,7 @@ public final class TestI extends _TestIntfDisp return d1; } + @Override public D1 D1AsD1(Ice.Current current) { @@ -155,6 +168,7 @@ public final class TestI extends _TestIntfDisp return d1; } + @Override public B D2AsB(Ice.Current current) { @@ -171,6 +185,7 @@ public final class TestI extends _TestIntfDisp return d2; } + @Override public void paramTest1(BHolder p1, BHolder p2, Ice.Current current) { @@ -188,12 +203,14 @@ public final class TestI extends _TestIntfDisp p2.value = d2; } + @Override public void paramTest2(BHolder p1, BHolder p2, Ice.Current current) { paramTest1(p2, p1, current); } + @Override public B paramTest3(BHolder p1, BHolder p2, Ice.Current current) { @@ -226,6 +243,7 @@ public final class TestI extends _TestIntfDisp return d3; } + @Override public B paramTest4(BHolder p1, Ice.Current current) { @@ -240,6 +258,7 @@ public final class TestI extends _TestIntfDisp return d4.p2; } + @Override public B returnTest1(BHolder p1, BHolder p2, Ice.Current current) { @@ -248,6 +267,7 @@ public final class TestI extends _TestIntfDisp return p1.value; } + @Override public B returnTest2(BHolder p1, BHolder p2, Ice.Current current) { @@ -256,12 +276,14 @@ public final class TestI extends _TestIntfDisp return p1.value; } + @Override public B returnTest3(B p1, B p2, Ice.Current current) { return p1; } + @Override public SS3 sequenceTest(SS1 p1, SS2 p2, Ice.Current current) { @@ -271,6 +293,7 @@ public final class TestI extends _TestIntfDisp return ss; } + @Override public java.util.Map<Integer, B> dictionaryTest(java.util.Map<Integer, B> bin, BDictHolder bout, Ice.Current current) { @@ -300,12 +323,14 @@ public final class TestI extends _TestIntfDisp return r; } + @Override public PBase exchangePBase(PBase pb, Ice.Current current) { return pb; } + @Override public Preserved PBSUnknownAsPreserved(Ice.Current current) { @@ -325,6 +350,7 @@ public final class TestI extends _TestIntfDisp return r; } + @Override public void checkPBSUnknown(Preserved p, Ice.Current current) { @@ -345,6 +371,7 @@ public final class TestI extends _TestIntfDisp } } + @Override public void PBSUnknownAsPreservedWithGraph_async(AMD_TestIntf_PBSUnknownAsPreservedWithGraph cb, Ice.Current current) { @@ -360,6 +387,7 @@ public final class TestI extends _TestIntfDisp r.graph.next.next.next = null; // Break the cycle. } + @Override public void checkPBSUnknownWithGraph(Preserved p, Ice.Current current) { @@ -382,6 +410,7 @@ public final class TestI extends _TestIntfDisp } } + @Override public void PBSUnknown2AsPreservedWithGraph_async(AMD_TestIntf_PBSUnknown2AsPreservedWithGraph cb, Ice.Current current) { @@ -393,6 +422,7 @@ public final class TestI extends _TestIntfDisp r.pb = null; // Break the cycle. } + @Override public void checkPBSUnknown2WithGraph(Preserved p, Ice.Current current) { @@ -412,12 +442,14 @@ public final class TestI extends _TestIntfDisp } } + @Override public PNode exchangePNode(PNode pn, Ice.Current current) { return pn; } + @Override public void throwBaseAsBase(Ice.Current current) throws BaseException @@ -430,6 +462,7 @@ public final class TestI extends _TestIntfDisp throw be; } + @Override public void throwDerivedAsBase(Ice.Current current) throws BaseException @@ -448,6 +481,7 @@ public final class TestI extends _TestIntfDisp throw de; } + @Override public void throwDerivedAsDerived(Ice.Current current) throws DerivedException @@ -466,6 +500,7 @@ public final class TestI extends _TestIntfDisp throw de; } + @Override public void throwUnknownDerivedAsBase(Ice.Current current) throws BaseException @@ -484,6 +519,7 @@ public final class TestI extends _TestIntfDisp throw ude; } + @Override public void throwPreservedException_async(AMD_TestIntf_throwPreservedException cb, Ice.Current current) { @@ -496,6 +532,7 @@ public final class TestI extends _TestIntfDisp ue.p.pb = null; // Break the cycle. } + @Override public void useForward(ForwardHolder f, Ice.Current current) { diff --git a/java/test/Ice/stream/Client.java b/java/test/Ice/stream/Client.java index aab00a15d50..5d88f303e5d 100644 --- a/java/test/Ice/stream/Client.java +++ b/java/test/Ice/stream/Client.java @@ -21,8 +21,6 @@ import Ice.LongSeqHelper; import Ice.StringSeqHelper; import test.Ice.stream.Test.*; -import java.io.PrintWriter; - public class Client extends test.Util.Application { private static void @@ -41,6 +39,7 @@ public class Client extends test.Util.Application this.obj = obj; } + @Override public void write(Ice.OutputStream out) { @@ -54,6 +53,7 @@ public class Client extends test.Util.Application private static class TestObjectReader extends Ice.ObjectReader { + @Override public void read(Ice.InputStream in) { @@ -68,6 +68,7 @@ public class Client extends test.Util.Application private static class TestObjectFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { @@ -75,6 +76,7 @@ public class Client extends test.Util.Application return new TestObjectReader(); } + @Override public void destroy() { @@ -87,6 +89,7 @@ public class Client extends test.Util.Application private static class MyInterfaceFactory implements Ice.ObjectFactory { + @Override public Ice.Object create(String type) { @@ -94,6 +97,7 @@ public class Client extends test.Util.Application return new MyInterfaceI(); } + @Override public void destroy() { @@ -102,6 +106,7 @@ public class Client extends test.Util.Application private static class TestReadObjectCallback implements Ice.ReadObjectCallback { + @Override public void invoke(Ice.Object obj) { @@ -118,12 +123,14 @@ public class Client extends test.Util.Application _factory = MyClass.ice_factory(); } + @Override public Ice.Object create(String type) { return _factory.create(type); } + @Override public void destroy() { @@ -145,6 +152,7 @@ public class Client extends test.Util.Application private Ice.ObjectFactory _factory; } + @Override public int run(String[] args) { @@ -554,10 +562,10 @@ public class Client extends test.Util.Application { final float[] arr = { - (float)1, - (float)2, - (float)3, - (float)4 + 1, + 2, + 3, + 4 }; out = Ice.Util.createOutputStream(comm); FloatSeqHelper.write(out, arr); @@ -587,10 +595,10 @@ public class Client extends test.Util.Application { final double[] arr = { - (double)1, - (double)2, - (double)3, - (double)4 + 1, + 2, + 3, + 4 }; out = Ice.Util.createOutputStream(comm); DoubleSeqHelper.write(out, arr); @@ -697,8 +705,8 @@ public class Client extends test.Util.Application arr[i].seq3 = new short[] { (short)1, (short)2, (short)3, (short)4 }; arr[i].seq4 = new int[] { 1, 2, 3, 4 }; arr[i].seq5 = new long[] { 1, 2, 3, 4 }; - arr[i].seq6 = new float[] { (float)1, (float)2, (float)3, (float)4 }; - arr[i].seq7 = new double[] { (double)1, (double)2, (double)3, (double)4 }; + arr[i].seq6 = new float[] { 1, 2, 3, 4 }; + arr[i].seq7 = new double[] { 1, 2, 3, 4 }; arr[i].seq8 = new String[] { "string1", "string2", "string3", "string4" }; arr[i].seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 }; arr[i].seq10 = new MyClass[4]; // null elements. @@ -773,7 +781,7 @@ public class Client extends test.Util.Application TestObjectWriter writer = new TestObjectWriter(obj); out.writeObject(writer); out.writePendingObjects(); - byte[] data = out.finished(); + out.finished(); test(writer.called); out.destroy(); } @@ -818,8 +826,8 @@ public class Client extends test.Util.Application c.seq3 = new short[] { (short)1, (short)2, (short)3, (short)4 }; c.seq4 = new int[] { 1, 2, 3, 4 }; c.seq5 = new long[] { 1, 2, 3, 4 }; - c.seq6 = new float[] { (float)1, (float)2, (float)3, (float)4 }; - c.seq7 = new double[] { (double)1, (double)2, (double)3, (double)4 }; + c.seq6 = new float[] { 1, 2, 3, 4 }; + c.seq7 = new double[] { 1, 2, 3, 4 }; c.seq8 = new String[] { "string1", "string2", "string3", "string4" }; c.seq9 = new MyEnum[] { MyEnum.enum3, MyEnum.enum2, MyEnum.enum1 }; c.seq10 = new MyClass[4]; // null elements. @@ -883,8 +891,8 @@ public class Client extends test.Util.Application { java.util.Map<Long, Float> dict = new java.util.HashMap<Long, Float>(); - dict.put((long)123809828, (float)0.51f); - dict.put((long)123809829, (float)0.56f); + dict.put((long)123809828, 0.51f); + dict.put((long)123809829, 0.56f); out = Ice.Util.createOutputStream(comm); LongFloatDHelper.write(out, dict); byte data[] = out.finished(); @@ -933,6 +941,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/threadPoolPriority/Client.java b/java/test/Ice/threadPoolPriority/Client.java index e81a6f2c6b4..86dd9468d47 100644 --- a/java/test/Ice/threadPoolPriority/Client.java +++ b/java/test/Ice/threadPoolPriority/Client.java @@ -23,6 +23,7 @@ public class Client extends test.Util.Application } } + @Override public int run(String[] args) { java.io.PrintWriter out = getWriter(); diff --git a/java/test/Ice/threadPoolPriority/PriorityI.java b/java/test/Ice/threadPoolPriority/PriorityI.java index ea28df2425d..18579e7713a 100644 --- a/java/test/Ice/threadPoolPriority/PriorityI.java +++ b/java/test/Ice/threadPoolPriority/PriorityI.java @@ -6,11 +6,13 @@ import test.Ice.threadPoolPriority.Test._PriorityDisp; public class PriorityI extends _PriorityDisp { + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); } + @Override public int getPriority(Ice.Current current) { return Thread.currentThread().getPriority(); diff --git a/java/test/Ice/threadPoolPriority/Server.java b/java/test/Ice/threadPoolPriority/Server.java index 3da81c77ffd..a1bdc6a0a31 100644 --- a/java/test/Ice/threadPoolPriority/Server.java +++ b/java/test/Ice/threadPoolPriority/Server.java @@ -11,6 +11,7 @@ package test.Ice.threadPoolPriority; public class Server extends test.Util.Application { + @Override public int run(String[] args) { communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); @@ -22,6 +23,7 @@ public class Server extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/throughput/Client.java b/java/test/Ice/throughput/Client.java index 311ae4b210a..b508b11bc96 100644 --- a/java/test/Ice/throughput/Client.java +++ b/java/test/Ice/throughput/Client.java @@ -24,6 +24,7 @@ public class Client extends test.Util.Application { class ShutdownHook extends Thread { + @Override public void run() { @@ -62,6 +63,7 @@ public class Client extends test.Util.Application "?: help\n"); } + @Override public int run(String[] args) { @@ -156,8 +158,6 @@ public class Client extends test.Util.Application menu(); - java.io.BufferedReader in = new java.io.BufferedReader(new java.io.InputStreamReader(System.in)); - char currentType = '1'; int seqSize = ByteSeqSize.value; @@ -171,13 +171,6 @@ public class Client extends test.Util.Application { try { - //out.print("==> "); - //out.flush(); - //line = in.readLine(); - //if(line == null) - //{ - // break; - //} line = input[inputIndex++]; long tmsec = System.currentTimeMillis(); @@ -480,6 +473,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/throughput/Server.java b/java/test/Ice/throughput/Server.java index a568de642d0..95737f3dc10 100644 --- a/java/test/Ice/throughput/Server.java +++ b/java/test/Ice/throughput/Server.java @@ -11,6 +11,7 @@ package test.Ice.throughput; public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/throughput/ThroughputI.java b/java/test/Ice/throughput/ThroughputI.java index 44a85e55521..53253549102 100644 --- a/java/test/Ice/throughput/ThroughputI.java +++ b/java/test/Ice/throughput/ThroughputI.java @@ -48,6 +48,7 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public boolean needsWarmup(Ice.Current current) { @@ -55,12 +56,14 @@ public final class ThroughputI extends _ThroughputDisp return _needsWarmup; } + @Override public void startWarmup(Ice.Current current) { _warmup = true; } + @Override public void endWarmup(Ice.Current current) { @@ -68,11 +71,13 @@ public final class ThroughputI extends _ThroughputDisp _needsWarmup = false; } + @Override public void sendByteSeq(byte[] seq, Ice.Current current) { } + @Override public byte[] recvByteSeq(Ice.Current current) { @@ -86,17 +91,20 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public byte[] echoByteSeq(byte[] seq, Ice.Current current) { return seq; } + @Override public void sendStringSeq(String[] seq, Ice.Current current) { } + @Override public String[] recvStringSeq(Ice.Current current) { @@ -110,17 +118,20 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public String[] echoStringSeq(String[] seq, Ice.Current current) { return seq; } + @Override public void sendStructSeq(StringDouble[] seq, Ice.Current current) { } + @Override public StringDouble[] recvStructSeq(Ice.Current current) { @@ -134,17 +145,20 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public StringDouble[] echoStructSeq(StringDouble[] seq, Ice.Current current) { return seq; } + @Override public void sendFixedSeq(Fixed[] seq, Ice.Current current) { } + @Override public Fixed[] recvFixedSeq(Ice.Current current) { @@ -158,12 +172,14 @@ public final class ThroughputI extends _ThroughputDisp } } + @Override public Fixed[] echoFixedSeq(Fixed[] seq, Ice.Current current) { return seq; } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/timeout/AllTests.java b/java/test/Ice/timeout/AllTests.java index 4d09a6885b8..46dd8e00452 100644 --- a/java/test/Ice/timeout/AllTests.java +++ b/java/test/Ice/timeout/AllTests.java @@ -62,6 +62,7 @@ public class AllTests private static class CallbackSuccess extends Ice.Callback { + @Override public void completed(Ice.AsyncResult result) { @@ -95,6 +96,7 @@ public class AllTests private static class CallbackFail extends Ice.Callback { + @Override public void completed(Ice.AsyncResult result) { @@ -314,7 +316,6 @@ public class AllTests // Test Ice.Override.Timeout. This property overrides all // endpoint timeouts. // - String[] args = new String[0]; Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Override.Timeout", "250"); @@ -351,7 +352,6 @@ public class AllTests // // Test Ice.Override.ConnectTimeout. // - String[] args = new String[0]; Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Override.ConnectTimeout", "250"); @@ -409,7 +409,7 @@ public class AllTests initData.properties = communicator.getProperties()._clone(); initData.properties.setProperty("Ice.Override.CloseTimeout", "200"); Ice.Communicator comm = app.initialize(initData); - Ice.Connection connection = comm.stringToProxy(sref).ice_getConnection(); + comm.stringToProxy(sref).ice_getConnection(); timeout.holdAdapter(750); long now = System.nanoTime(); comm.destroy(); diff --git a/java/test/Ice/timeout/Client.java b/java/test/Ice/timeout/Client.java index 95b21ce370b..7476eb5c0e8 100644 --- a/java/test/Ice/timeout/Client.java +++ b/java/test/Ice/timeout/Client.java @@ -13,6 +13,7 @@ import test.Ice.timeout.Test.TimeoutPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { TimeoutPrx timeout = AllTests.allTests(this); @@ -20,6 +21,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/timeout/Server.java b/java/test/Ice/timeout/Server.java index a77c8323348..b4006770863 100644 --- a/java/test/Ice/timeout/Server.java +++ b/java/test/Ice/timeout/Server.java @@ -11,6 +11,7 @@ package test.Ice.timeout; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -20,6 +21,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/timeout/TimeoutI.java b/java/test/Ice/timeout/TimeoutI.java index d6b1b496b44..61b8f7702c2 100644 --- a/java/test/Ice/timeout/TimeoutI.java +++ b/java/test/Ice/timeout/TimeoutI.java @@ -21,6 +21,7 @@ class TimeoutI extends _TimeoutDisp _timeout = timeout; } + @Override public void run() { @@ -39,28 +40,33 @@ class TimeoutI extends _TimeoutDisp int _timeout; } + @Override public void op(Ice.Current current) { } + @Override public void sendData(byte[] seq, Ice.Current current) { } + @Override public void sleep(int to, Ice.Current current) { try { - Thread.currentThread().sleep(to); + Thread.currentThread(); + Thread.sleep(to); } catch(InterruptedException ex) { } } + @Override public void holdAdapter(int to, Ice.Current current) { @@ -69,6 +75,7 @@ class TimeoutI extends _TimeoutDisp thread.start(); } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/Ice/udp/AllTests.java b/java/test/Ice/udp/AllTests.java index da4395e24db..82dc1224d46 100644 --- a/java/test/Ice/udp/AllTests.java +++ b/java/test/Ice/udp/AllTests.java @@ -24,6 +24,7 @@ public class AllTests public static class PingReplyI extends _PingReplyDisp { + @Override public synchronized void reply(Ice.Current current) { diff --git a/java/test/Ice/udp/Client.java b/java/test/Ice/udp/Client.java index 7c194afa821..afd4927a470 100644 --- a/java/test/Ice/udp/Client.java +++ b/java/test/Ice/udp/Client.java @@ -13,6 +13,7 @@ import test.Ice.udp.Test.*; public class Client extends test.Util.Application { + @Override public int run(String[] args) { AllTests.allTests(communicator()); @@ -33,6 +34,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/udp/Server.java b/java/test/Ice/udp/Server.java index e5dc60e202e..05cfc43cbc8 100644 --- a/java/test/Ice/udp/Server.java +++ b/java/test/Ice/udp/Server.java @@ -11,6 +11,7 @@ package test.Ice.udp; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Properties properties = communicator().getProperties(); @@ -43,6 +44,7 @@ public class Server extends test.Util.Application return WAIT; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/Ice/udp/TestIntfI.java b/java/test/Ice/udp/TestIntfI.java index b4608f1c463..d4aba78a2c3 100644 --- a/java/test/Ice/udp/TestIntfI.java +++ b/java/test/Ice/udp/TestIntfI.java @@ -13,6 +13,7 @@ import test.Ice.udp.Test.*; public final class TestIntfI extends _TestIntfDisp { + @Override public void ping(PingReplyPrx reply, Ice.Current current) { try @@ -25,6 +26,7 @@ public final class TestIntfI extends _TestIntfDisp } } + @Override public void sendByteSeq(byte[] seq, PingReplyPrx reply, Ice.Current current) { try @@ -37,6 +39,7 @@ public final class TestIntfI extends _TestIntfDisp } } + @Override public void pingBiDir(Ice.Identity id, Ice.Current current) { try @@ -63,6 +66,7 @@ public final class TestIntfI extends _TestIntfDisp } } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); diff --git a/java/test/IceBox/admin/Client.java b/java/test/IceBox/admin/Client.java index 0e8211572db..80664c2edd0 100644 --- a/java/test/IceBox/admin/Client.java +++ b/java/test/IceBox/admin/Client.java @@ -9,8 +9,6 @@ package test.IceBox.admin; -import test.IceBox.admin.Test.*; - public class Client { private static int diff --git a/java/test/IceBox/admin/TestFacetI.java b/java/test/IceBox/admin/TestFacetI.java index cfdf812860b..642ee400d20 100644 --- a/java/test/IceBox/admin/TestFacetI.java +++ b/java/test/IceBox/admin/TestFacetI.java @@ -18,6 +18,7 @@ public class TestFacetI extends _TestFacetDisp implements Ice.PropertiesAdminUpd _called = false; } + @Override public synchronized java.util.Map<String, String> getChanges(Ice.Current current) { // @@ -43,6 +44,7 @@ public class TestFacetI extends _TestFacetDisp implements Ice.PropertiesAdminUpd return _changes; } + @Override public synchronized void updated(java.util.Map<String, String> changes) { _changes = changes; diff --git a/java/test/IceBox/admin/TestServiceI.java b/java/test/IceBox/admin/TestServiceI.java index 9536849988a..7497771d248 100644 --- a/java/test/IceBox/admin/TestServiceI.java +++ b/java/test/IceBox/admin/TestServiceI.java @@ -32,11 +32,13 @@ public class TestServiceI implements IceBox.Service } } + @Override public void start(String name, Ice.Communicator communicator, String[] args) { } + @Override public void stop() { diff --git a/java/test/IceBox/configuration/Client.java b/java/test/IceBox/configuration/Client.java index a8c3f9a29a7..39785e9de8a 100644 --- a/java/test/IceBox/configuration/Client.java +++ b/java/test/IceBox/configuration/Client.java @@ -11,6 +11,7 @@ package test.IceBox.configuration; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -24,6 +25,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/IceBox/configuration/TestI.java b/java/test/IceBox/configuration/TestI.java index 55dc8df43b1..abe96b912f8 100644 --- a/java/test/IceBox/configuration/TestI.java +++ b/java/test/IceBox/configuration/TestI.java @@ -20,12 +20,14 @@ public class TestI extends _TestIntfDisp _args = args; } + @Override public String getProperty(String name, Ice.Current current) { return current.adapter.getCommunicator().getProperties().getProperty(name); } + @Override public String[] getArgs(Ice.Current current) { diff --git a/java/test/IceBox/configuration/TestServiceI.java b/java/test/IceBox/configuration/TestServiceI.java index 1ec7d175845..037d5465968 100644 --- a/java/test/IceBox/configuration/TestServiceI.java +++ b/java/test/IceBox/configuration/TestServiceI.java @@ -11,6 +11,7 @@ package test.IceBox.configuration; public class TestServiceI implements IceBox.Service { + @Override public void start(String name, Ice.Communicator communicator, String[] args) { @@ -21,6 +22,7 @@ public class TestServiceI implements IceBox.Service adapter.activate(); } + @Override public void stop() { diff --git a/java/test/IceDiscovery/simple/Client.java b/java/test/IceDiscovery/simple/Client.java index fda8e46a37d..7b93371328e 100644 --- a/java/test/IceDiscovery/simple/Client.java +++ b/java/test/IceDiscovery/simple/Client.java @@ -11,6 +11,7 @@ package test.IceDiscovery.simple; public class Client extends test.Util.Application { + @Override public int run(String[] args) { int num; diff --git a/java/test/IceDiscovery/simple/ControllerI.java b/java/test/IceDiscovery/simple/ControllerI.java index 1c8c2d837c7..188b1c7182d 100644 --- a/java/test/IceDiscovery/simple/ControllerI.java +++ b/java/test/IceDiscovery/simple/ControllerI.java @@ -13,6 +13,7 @@ import test.IceDiscovery.simple.Test.*; public final class ControllerI extends _ControllerDisp { + @Override public void activateObjectAdapter(String name, String adapterId, String replicaGroupId, Ice.Current current) { @@ -26,6 +27,7 @@ public final class ControllerI extends _ControllerDisp oa.activate(); } + @Override public void deactivateObjectAdapter(String name, Ice.Current current) { @@ -33,6 +35,7 @@ public final class ControllerI extends _ControllerDisp _adapters.remove(name); } + @Override public void addObject(String oaName, String id, Ice.Current current) { @@ -42,6 +45,7 @@ public final class ControllerI extends _ControllerDisp _adapters.get(oaName).add(new TestIntfI(), identity); } + @Override public void removeObject(String oaName, String id, Ice.Current current) { @@ -51,6 +55,7 @@ public final class ControllerI extends _ControllerDisp _adapters.get(oaName).remove(identity); } + @Override public void shutdown(Ice.Current current) { current.adapter.getCommunicator().shutdown(); diff --git a/java/test/IceDiscovery/simple/Server.java b/java/test/IceDiscovery/simple/Server.java index 5a671e99003..7bc444355f4 100644 --- a/java/test/IceDiscovery/simple/Server.java +++ b/java/test/IceDiscovery/simple/Server.java @@ -11,6 +11,7 @@ package test.IceDiscovery.simple; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Properties properties = communicator().getProperties(); diff --git a/java/test/IceDiscovery/simple/TestIntfI.java b/java/test/IceDiscovery/simple/TestIntfI.java index fca6235ce6b..339bc281081 100644 --- a/java/test/IceDiscovery/simple/TestIntfI.java +++ b/java/test/IceDiscovery/simple/TestIntfI.java @@ -13,6 +13,7 @@ import test.IceDiscovery.simple.Test.*; public final class TestIntfI extends _TestIntfDisp { + @Override public String getAdapterId(Ice.Current current) { diff --git a/java/test/IceGrid/simple/Client.java b/java/test/IceGrid/simple/Client.java index fc162e87c86..0da92bbeffe 100644 --- a/java/test/IceGrid/simple/Client.java +++ b/java/test/IceGrid/simple/Client.java @@ -11,6 +11,7 @@ package test.IceGrid.simple; public class Client extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -36,6 +37,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/IceGrid/simple/Server.java b/java/test/IceGrid/simple/Server.java index 9ad433104ce..1b349a70773 100644 --- a/java/test/IceGrid/simple/Server.java +++ b/java/test/IceGrid/simple/Server.java @@ -11,6 +11,7 @@ package test.IceGrid.simple; public class Server extends test.Util.Application { + @Override public int run(String[] args) { @@ -34,6 +35,7 @@ public class Server extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/IceGrid/simple/TestI.java b/java/test/IceGrid/simple/TestI.java index a45d06375fc..82ba95b7aad 100644 --- a/java/test/IceGrid/simple/TestI.java +++ b/java/test/IceGrid/simple/TestI.java @@ -18,6 +18,7 @@ public class TestI extends _TestIntfDisp { } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/IceSSL/configuration/CertificateVerifierI.java b/java/test/IceSSL/configuration/CertificateVerifierI.java index 624e3c0fb9e..03ae75ad659 100644 --- a/java/test/IceSSL/configuration/CertificateVerifierI.java +++ b/java/test/IceSSL/configuration/CertificateVerifierI.java @@ -8,7 +8,6 @@ // ********************************************************************** package test.IceSSL.configuration; -import test.IceSSL.configuration.Test.*; public class CertificateVerifierI implements IceSSL.CertificateVerifier { @@ -18,6 +17,7 @@ public class CertificateVerifierI implements IceSSL.CertificateVerifier reset(); } + @Override public boolean verify(IceSSL.NativeConnectionInfo info) { diff --git a/java/test/IceSSL/configuration/Client.java b/java/test/IceSSL/configuration/Client.java index 100ad55f352..36ecfde860d 100644 --- a/java/test/IceSSL/configuration/Client.java +++ b/java/test/IceSSL/configuration/Client.java @@ -15,6 +15,7 @@ import test.IceSSL.configuration.Test.ServerFactoryPrx; public class Client extends test.Util.Application { + @Override public int run(String[] args) { PrintWriter out = getWriter(); @@ -30,6 +31,7 @@ public class Client extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/IceSSL/configuration/PasswordCallbackI.java b/java/test/IceSSL/configuration/PasswordCallbackI.java index 5a916add5d5..b7493caaffc 100644 --- a/java/test/IceSSL/configuration/PasswordCallbackI.java +++ b/java/test/IceSSL/configuration/PasswordCallbackI.java @@ -8,7 +8,6 @@ // ********************************************************************** package test.IceSSL.configuration; -import test.IceSSL.configuration.Test.*; public class PasswordCallbackI implements IceSSL.PasswordCallback { @@ -24,18 +23,21 @@ public class PasswordCallbackI implements IceSSL.PasswordCallback _password = password; } + @Override public char[] getPassword(String alias) { return _password.toCharArray(); } + @Override public char[] getTruststorePassword() { return null; } + @Override public char[] getKeystorePassword() { diff --git a/java/test/IceSSL/configuration/Server.java b/java/test/IceSSL/configuration/Server.java index 257ab531526..9438f73d419 100644 --- a/java/test/IceSSL/configuration/Server.java +++ b/java/test/IceSSL/configuration/Server.java @@ -12,6 +12,7 @@ package test.IceSSL.configuration; public class Server extends test.Util.Application { + @Override public int run(String[] args) { Ice.Communicator communicator = communicator(); @@ -25,6 +26,7 @@ public class Server extends test.Util.Application return 0; } + @Override protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH) { Ice.InitializationData initData = new Ice.InitializationData(); diff --git a/java/test/IceSSL/configuration/ServerFactoryI.java b/java/test/IceSSL/configuration/ServerFactoryI.java index ea2a01b5f29..34271e03f89 100644 --- a/java/test/IceSSL/configuration/ServerFactoryI.java +++ b/java/test/IceSSL/configuration/ServerFactoryI.java @@ -23,6 +23,7 @@ class ServerFactoryI extends _ServerFactoryDisp } } + @Override public ServerPrx createServer(java.util.Map<String, String> props, Ice.Current current) { @@ -44,6 +45,7 @@ class ServerFactoryI extends _ServerFactoryDisp return ServerPrxHelper.uncheckedCast(obj); } + @Override public void destroyServer(ServerPrx srv, Ice.Current current) { @@ -56,6 +58,7 @@ class ServerFactoryI extends _ServerFactoryDisp } } + @Override public void shutdown(Ice.Current current) { diff --git a/java/test/IceSSL/configuration/ServerI.java b/java/test/IceSSL/configuration/ServerI.java index 300f29396b2..ca3e2835e23 100644 --- a/java/test/IceSSL/configuration/ServerI.java +++ b/java/test/IceSSL/configuration/ServerI.java @@ -17,6 +17,7 @@ class ServerI extends _ServerDisp _communicator = communicator; } + @Override public void noCert(Ice.Current current) { @@ -31,6 +32,7 @@ class ServerI extends _ServerDisp } } + @Override public void checkCert(String subjectDN, String issuerDN, Ice.Current current) { @@ -48,6 +50,7 @@ class ServerI extends _ServerDisp } } + @Override public void checkCipher(String cipher, Ice.Current current) { diff --git a/java/test/IceUtil/fileLock/Client.java b/java/test/IceUtil/fileLock/Client.java index e1fddd96634..ce67ad3fe50 100644 --- a/java/test/IceUtil/fileLock/Client.java +++ b/java/test/IceUtil/fileLock/Client.java @@ -46,7 +46,7 @@ public class Client BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); try { - String dummy = br.readLine(); + br.readLine(); } catch(java.io.IOException ex) { diff --git a/java/test/IceUtil/fileLock/ClientFail.java b/java/test/IceUtil/fileLock/ClientFail.java index fc88898b0e5..c96dc7c9b57 100644 --- a/java/test/IceUtil/fileLock/ClientFail.java +++ b/java/test/IceUtil/fileLock/ClientFail.java @@ -9,9 +9,6 @@ package test.IceUtil.fileLock; -import java.io.BufferedReader; -import java.io.InputStreamReader; - import java.io.File; import java.io.RandomAccessFile; import java.io.EOFException; @@ -33,10 +30,10 @@ public class ClientFail public static void main(String[] argvs) { - IceUtilInternal.FileLock lock = null; + try { - lock = new IceUtilInternal.FileLock("file.lock"); + new IceUtilInternal.FileLock("file.lock"); test(false); } catch(IceUtil.FileLockException ex) @@ -52,7 +49,14 @@ public class ClientFail try { RandomAccessFile file = new RandomAccessFile(new File("file.lock"), "r"); - pid = file.readUTF(); + try + { + pid = file.readUTF(); + } + finally + { + file.close(); + } } catch(EOFException eofEx) { diff --git a/java/test/Slice/keyword/Client.java b/java/test/Slice/keyword/Client.java index e79338a3d2b..df96ebc985f 100644 --- a/java/test/Slice/keyword/Client.java +++ b/java/test/Slice/keyword/Client.java @@ -38,6 +38,7 @@ public class Client { } + @Override public void checkedCast_async(AMD_catch_checkedCast __cb, int _clone, Ice.Current __current) { @@ -53,6 +54,7 @@ public class Client { } + @Override public void _do(Ice.Current __current) { @@ -67,6 +69,7 @@ public class Client { } + @Override public void foo(defaultPrx _equals, Ice.IntHolder _final, Ice.Current __current) { @@ -80,6 +83,7 @@ public class Client { } + @Override public _assert _notify(_break _notifyAll, _else _null, _finalize _package, elsePrx _private, finalizePrx _protected, @@ -97,6 +101,7 @@ public class Client { } + @Override public void checkedCast_async(AMD_catch_checkedCast __cb, int _clone, Ice.Current __current) { @@ -104,11 +109,13 @@ public class Client __cb.ice_response(_continue); } + @Override public void _do(Ice.Current __current) { } + @Override public void foo(defaultPrx _equals, Ice.IntHolder _final, Ice.Current __current) { @@ -119,6 +126,7 @@ public class Client // This section of the test is present to ensure that the C++ types // are named correctly. It is not expected to run. // + @SuppressWarnings({ "unused", "null" }) private static void testtypes() { diff --git a/java/test/Slice/structure/Client.java b/java/test/Slice/structure/Client.java index 10cd8fc2f3f..74f2239ae2e 100644 --- a/java/test/Slice/structure/Client.java +++ b/java/test/Slice/structure/Client.java @@ -130,7 +130,7 @@ public class Client S2 v1, v2; v1 = (S2)def_s2.clone(); - v1.ss = (String[])def_s2.ss.clone(); + v1.ss = def_s2.ss.clone(); test(v1.equals(def_s2)); v1 = (S2)def_s2.clone(); |