You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/16 01:14:10 UTC
svn commit: r584970 - in /wicket/trunk/jdk-1.5/wicket-spring-annot:
.settings/ src/main/java/org/apache/wicket/spring/injection/annot/
src/main/java/org/apache/wicket/spring/injection/annot/test/
src/test/java/org/apache/wicket/spring/injection/annot/ ...
Author: gseitz
Date: Mon Oct 15 16:14:09 2007
New Revision: 584970
URL: http://svn.apache.org/viewvc?rev=584970&view=rev
Log:
WICKET-1078
Added:
wicket/trunk/jdk-1.5/wicket-spring-annot/.settings/org.eclipse.jdt.ui.prefs
Modified:
wicket/trunk/jdk-1.5/wicket-spring-annot/.settings/org.eclipse.jdt.core.prefs
wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java
wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java
wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java
wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java
wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java
wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
Modified: wicket/trunk/jdk-1.5/wicket-spring-annot/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-spring-annot/.settings/org.eclipse.jdt.core.prefs?rev=584970&r1=584969&r2=584970&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-spring-annot/.settings/org.eclipse.jdt.core.prefs (original)
+++ wicket/trunk/jdk-1.5/wicket-spring-annot/.settings/org.eclipse.jdt.core.prefs Mon Oct 15 16:14:09 2007
@@ -3,3 +3,259 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=20
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=64
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=64
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=0
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=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=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=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=false
+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_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=100
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=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=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=100
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
+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=2
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
\ No newline at end of file
Added: wicket/trunk/jdk-1.5/wicket-spring-annot/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-spring-annot/.settings/org.eclipse.jdt.ui.prefs?rev=584970&view=auto
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-spring-annot/.settings/org.eclipse.jdt.ui.prefs (added)
+++ wicket/trunk/jdk-1.5/wicket-spring-annot/.settings/org.eclipse.jdt.ui.prefs Mon Oct 15 16:14:09 2007
@@ -0,0 +1,54 @@
+#Sun Mar 18 12:08:28 PDT 2007
+eclipse.preferences.version=1
+formatter_profile=_Wicket
+formatter_settings_version=11
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+internal.default.compliance=default
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * Gets ${bare_field_name}.\r\n * @return ${bare_field_name}\r\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * Sets ${bare_field_name}.\r\n * @param ${param} ${bare_field_name}\r\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * Construct.\r\n
* ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}
\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\r\n * Licensed to the Apache Software Foundation (ASF) under one or more\r\n * contributor license agreements. See the NOTICE file distributed with\r\n * this work for additional information regarding copyright ownership.\r\n * The ASF licenses this file to You under the Apache License, Version 2.0\r\n * (the "License"); you may not use this file except in compliance with\r\n * the License. You may obtain a copy of the License at\r\n *\r\n * http\://www.apache.org/licenses/LICENSE-2.0\r\
n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an "AS IS" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n */\r\n${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw new RuntimeException(${exception_var});</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="c
onstructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false"
description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.format_source_code=true
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
Modified: wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java?rev=584970&r1=584969&r2=584970&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java (original)
+++ wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java Mon Oct 15 16:14:09 2007
@@ -25,39 +25,37 @@
import org.apache.wicket.spring.SpringBeanLocator;
/**
- * {@link IFieldValueFactory} that uses {@link LazyInitProxyFactory} to create
- * proxies for Spring dependencies based on the {@link SpringBean} annotation
- * applied to a field. This class is usually used by the
- * {@link AnnotSpringInjector} to inject objects with lazy init proxies.
- * However, this class can be used on its own to create proxies for any field
- * decorated with a {@link SpringBean} annotation.
+ * {@link IFieldValueFactory} that uses {@link LazyInitProxyFactory} to create proxies for Spring
+ * dependencies based on the {@link SpringBean} annotation applied to a field. This class is usually
+ * used by the {@link AnnotSpringInjector} to inject objects with lazy init proxies. However, this
+ * class can be used on its own to create proxies for any field decorated with a {@link SpringBean}
+ * annotation.
* <p>
* Example:
- *
+ *
* <pre>
* IFieldValueFactory factory = new AnnotProxyFieldValueFactory(contextLocator);
* field = obj.getClass().getDeclaredField("dependency");
- * IDependency dependency = (IDependency) factory.getFieldValue(field, obj);
+ * IDependency dependency = (IDependency)factory.getFieldValue(field, obj);
* </pre>
- *
- * In the example above the <code>dependency</code> object returned is a lazy
- * init proxy that will look up the actual IDependency bean from spring context
- * upon first access to one of the methods.
+ *
+ * In the example above the <code>dependency</code> object returned is a lazy init proxy that will
+ * look up the actual IDependency bean from spring context upon first access to one of the methods.
* <p>
- * This class will also cache any produced proxies so that the same proxy is
- * always returned for the same spring dependency. This helps cut down on
- * session size beacause proxies for the same dependency will not be serialized
- * twice.
- *
+ * This class will also cache any produced proxies so that the same proxy is always returned for the
+ * same spring dependency. This helps cut down on session size beacause proxies for the same
+ * dependency will not be serialized twice.
+ *
* @see LazyInitProxyFactory
* @see SpringBean
* @see SpringBeanLocator
- *
+ *
* @author Igor Vaynberg (ivaynberg)
* @author Istvan Devai
- *
+ *
*/
-public class AnnotProxyFieldValueFactory implements IFieldValueFactory {
+public class AnnotProxyFieldValueFactory implements IFieldValueFactory
+{
private ISpringContextLocator contextLocator;
private boolean failFast = true;
@@ -67,10 +65,11 @@
* @param contextLocator
* spring context locator
*/
- public AnnotProxyFieldValueFactory(ISpringContextLocator contextLocator) {
- if (contextLocator == null) {
- throw new IllegalArgumentException(
- "[contextLocator] argument cannot be null");
+ public AnnotProxyFieldValueFactory(ISpringContextLocator contextLocator)
+ {
+ if (contextLocator == null)
+ {
+ throw new IllegalArgumentException("[contextLocator] argument cannot be null");
}
this.contextLocator = contextLocator;
}
@@ -79,37 +78,43 @@
* @see org.apache.wicket.injection.IFieldValueFactory#getFieldValue(java.lang.reflect.Field,
* java.lang.Object)
*/
- public Object getFieldValue(Field field, Object fieldOwner) {
+ public Object getFieldValue(Field field, Object fieldOwner)
+ {
- if (field.isAnnotationPresent(SpringBean.class)) {
+ if (field.isAnnotationPresent(SpringBean.class))
+ {
SpringBean annot = field.getAnnotation(SpringBean.class);
- SpringBeanLocator locator = new SpringBeanLocator(annot.name(),
- field.getType(), contextLocator);
+ SpringBeanLocator locator = new SpringBeanLocator(annot.name(), field.getType(),
+ contextLocator);
// only check the cache if the bean is a singleton
- if (locator.isSingletonBean() && cache.containsKey(locator)) {
+ if (locator.isSingletonBean() && cache.containsKey(locator))
+ {
return cache.get(locator);
}
- if (failFast) {
+ if (failFast)
+ {
testLocator(locator, fieldOwner, field);
}
- Object proxy = LazyInitProxyFactory.createProxy(field.getType(),
- locator);
+ Object proxy = LazyInitProxyFactory.createProxy(field.getType(), locator);
// only put the proxy into the cache if the bean is a singleton
- if (locator.isSingletonBean()) {
+ if (locator.isSingletonBean())
+ {
cache.put(locator, proxy);
}
return proxy;
- } else {
+ }
+ else
+ {
return null;
}
}
/**
* Tests if the locator can retrieve the bean it is responsible for.
- *
+ *
* @param locator
* @param fieldOwner
* @param field
@@ -122,21 +127,21 @@
}
catch (Throwable e)
{
- String errorMessage = "Could not locate spring bean of class [["
- + locator.getBeanType().getName() + "]] ";
+ String errorMessage = "Could not locate spring bean of class [[" +
+ locator.getBeanType().getName() + "]] ";
if (locator.getBeanName() != null && locator.getBeanName().length() > 0)
{
errorMessage += "and id [[" + locator.getBeanName() + "]] ";
}
- errorMessage += "needed in class [["
- + fieldOwner.getClass().getName() + "]] field [[" + field.getName()
- + "]]";
+ errorMessage += "needed in class [[" + fieldOwner.getClass().getName() + "]] field [[" +
+ field.getName() + "]]";
throw new RuntimeException(errorMessage, e);
}
}
/**
- * @param failFast true if the locator fails if a bean can't be located
+ * @param failFast
+ * true if the locator fails if a bean can't be located
*/
public void setFailFast(boolean failFast)
{
@@ -146,7 +151,8 @@
/**
* @see org.apache.wicket.injection.IFieldValueFactory#supportsField(java.lang.reflect.Field)
*/
- public boolean supportsField(Field field) {
+ public boolean supportsField(Field field)
+ {
return field.isAnnotationPresent(SpringBean.class);
}
}
Modified: wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java?rev=584970&r1=584969&r2=584970&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java (original)
+++ wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringInjector.java Mon Oct 15 16:14:09 2007
@@ -20,7 +20,6 @@
import org.apache.wicket.injection.IFieldValueFactory;
import org.apache.wicket.spring.ISpringContextLocator;
-
/**
* Injector that injects classes based on {@link SpringBean} annotation
*
Modified: wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java?rev=584970&r1=584969&r2=584970&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java (original)
+++ wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/AnnotSpringWebApplication.java Mon Oct 15 16:14:09 2007
@@ -20,25 +20,24 @@
import org.apache.wicket.injection.web.InjectorHolder;
import org.apache.wicket.spring.SpringWebApplication;
-
/**
* Convinience subclass of {@link SpringWebApplication} that puts an instance of
- * {@link AnnotSpringInjector} into the {@link InjectorHolder} when the
- * application is initialized.
+ * {@link AnnotSpringInjector} into the {@link InjectorHolder} when the application is initialized.
*
* @author Igor Vaynberg (ivaynberg)
*
* @deprecated instead in application.init() do
* <code>addComponentInstantiationListener(new SpringComponentInjector(this));</code>
- *
+ *
* TODO remove post 1.3
*/
-public abstract class AnnotSpringWebApplication extends SpringWebApplication {
+public abstract class AnnotSpringWebApplication extends SpringWebApplication
+{
- protected void internalInit() {
+ protected void internalInit()
+ {
super.internalInit();
- InjectorHolder.setInjector(new AnnotSpringInjector(
- getSpringContextLocator()));
+ InjectorHolder.setInjector(new AnnotSpringInjector(getSpringContextLocator()));
addComponentInstantiationListener(new ComponentInjector());
}
Modified: wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java?rev=584970&r1=584969&r2=584970&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java (original)
+++ wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringBean.java Mon Oct 15 16:14:09 2007
@@ -22,19 +22,18 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-
/**
* Annotation used to tag a field as a placeholder for a spring bean.
*
* @author Igor Vaynberg (ivaynberg)
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target( {/* ElementType.METHOD, */ElementType.FIELD})
+@Target( {/* ElementType.METHOD, */ElementType.FIELD })
@Documented
public @interface SpringBean {
/**
- * Optional attribute for specifying the name of the bean. If not specified,
- * the bean will be looked up by the type of the field with the annotation.
+ * Optional attribute for specifying the name of the bean. If not specified, the bean will be
+ * looked up by the type of the field with the annotation.
*
* @return name attr
*/
Modified: wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java?rev=584970&r1=584969&r2=584970&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java (original)
+++ wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/SpringComponentInjector.java Mon Oct 15 16:14:09 2007
@@ -31,49 +31,48 @@
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
-
/**
- * {@link IComponentInstantiationListener} that injects component properties
- * annotated with {@link SpringBean} annotations.
+ * {@link IComponentInstantiationListener} that injects component properties annotated with
+ * {@link SpringBean} annotations.
*
* To install in yourapplication.init() call
* <code>addComponentInstantiationListener(new SpringComponentInjector(this));</code>
*
- * Non-wicket components such as {@link Session}, {@link Model}, and any other
- * pojo can be injected by calling
- * <code>InjectorHolder.getInjector().inject(this)</code> in their
+ * Non-wicket components such as {@link Session}, {@link Model}, and any other pojo can be
+ * injected by calling <code>InjectorHolder.getInjector().inject(this)</code> in their
* constructor.
*
* @author Igor Vaynberg (ivaynberg)
* @author <a href="mailto:jlee@antwerkz.com">Justin Lee</a>
*
*/
-public class SpringComponentInjector extends ComponentInjector {
+public class SpringComponentInjector extends ComponentInjector
+{
/**
- * Metadata key used to store application context holder in application's
- * metadata
+ * Metadata key used to store application context holder in application's metadata
*/
- private static MetaDataKey CONTEXT_KEY = new MetaDataKey(
- ApplicationContextHolder.class) {
+ private static MetaDataKey CONTEXT_KEY = new MetaDataKey(ApplicationContextHolder.class)
+ {
private static final long serialVersionUID = 1L;
};
/**
- * Constructor used when spring application context is declared in the
- * spring standard way and can be located through
+ * Constructor used when spring application context is declared in the spring standard way and
+ * can be located through
* {@link WebApplicationContextUtils#getRequiredWebApplicationContext(ServletContext)}
*
* @param webapp
* wicket web application
*/
- public SpringComponentInjector(WebApplication webapp) {
+ public SpringComponentInjector(WebApplication webapp)
+ {
// locate application context through spring's default location
// mechanism and pass it on to the proper constructor
- this(webapp, WebApplicationContextUtils
- .getRequiredWebApplicationContext(webapp.getServletContext()));
+ this(webapp, WebApplicationContextUtils.getRequiredWebApplicationContext(webapp
+ .getServletContext()));
}
/**
@@ -84,38 +83,37 @@
* @param ctx
* spring's application context
*/
- public SpringComponentInjector(WebApplication webapp, ApplicationContext ctx) {
- if (webapp == null) {
- throw new IllegalArgumentException(
- "Argument [[webapp]] cannot be null");
+ public SpringComponentInjector(WebApplication webapp, ApplicationContext ctx)
+ {
+ if (webapp == null)
+ {
+ throw new IllegalArgumentException("Argument [[webapp]] cannot be null");
}
- if (ctx == null) {
- throw new IllegalArgumentException(
- "Argument [[ctx]] cannot be null");
+ if (ctx == null)
+ {
+ throw new IllegalArgumentException("Argument [[ctx]] cannot be null");
}
// store context in application's metadata ...
webapp.setMetaData(CONTEXT_KEY, new ApplicationContextHolder(ctx));
// ... and create and register the annotation aware injector
- InjectorHolder
- .setInjector(new AnnotSpringInjector(new ContextLocator()));
+ InjectorHolder.setInjector(new AnnotSpringInjector(new ContextLocator()));
}
/**
- * This is a holder for the application context. The reason we need a holder
- * is that metadata only supports storing serializable objects but
- * application context is not. The holder acts as a serializable wrapper for
- * the context. Notice that although holder implements IClusterable it
- * really is not because it has a reference to non serializable context -
- * but this is ok because metadata objects in application are never
- * serialized.
+ * This is a holder for the application context. The reason we need a holder is that metadata
+ * only supports storing serializable objects but application context is not. The holder acts as
+ * a serializable wrapper for the context. Notice that although holder implements IClusterable
+ * it really is not because it has a reference to non serializable context - but this is ok
+ * because metadata objects in application are never serialized.
*
* @author ivaynberg
*
*/
- private static class ApplicationContextHolder implements IClusterable {
+ private static class ApplicationContextHolder implements IClusterable
+ {
private static final long serialVersionUID = 1L;
private final ApplicationContext context;
@@ -125,34 +123,39 @@
*
* @param context
*/
- public ApplicationContextHolder(ApplicationContext context) {
+ public ApplicationContextHolder(ApplicationContext context)
+ {
this.context = context;
}
/**
* @return the context
*/
- public ApplicationContext getContext() {
+ public ApplicationContext getContext()
+ {
return context;
}
}
/**
- * A context locator that locates the context in application's metadata.
- * This locator also keeps a transient cache of the lookup.
+ * A context locator that locates the context in application's metadata. This locator also keeps
+ * a transient cache of the lookup.
*
* @author ivaynberg
*
*/
- private static class ContextLocator implements ISpringContextLocator {
+ private static class ContextLocator implements ISpringContextLocator
+ {
private transient ApplicationContext context;
private static final long serialVersionUID = 1L;
- public ApplicationContext getSpringContext() {
- if (context == null) {
- context = ((ApplicationContextHolder) Application.get()
- .getMetaData(CONTEXT_KEY)).getContext();
+ public ApplicationContext getSpringContext()
+ {
+ if (context == null)
+ {
+ context = ((ApplicationContextHolder)Application.get().getMetaData(CONTEXT_KEY))
+ .getContext();
}
return context;
}
Modified: wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java?rev=584970&r1=584969&r2=584970&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java (original)
+++ wicket/trunk/jdk-1.5/wicket-spring-annot/src/main/java/org/apache/wicket/spring/injection/annot/test/AnnotApplicationContextMock.java Mon Oct 15 16:14:09 2007
@@ -21,11 +21,9 @@
import org.apache.wicket.spring.test.ApplicationContextMock;
import org.apache.wicket.spring.test.SpringContextLocatorMock;
-
/**
- * Spring application context mock that does all the initialization required to
- * setup an {@link AnnotSpringInjector} that will use this mock context as its
- * source of beans.
+ * Spring application context mock that does all the initialization required to setup an
+ * {@link AnnotSpringInjector} that will use this mock context as its source of beans.
* <p>
* Example
*
@@ -38,8 +36,7 @@
* Page deletePage=new DeleteContactPage(new DummyHomePage(), 10));
* </pre>
*
- * DeleteContactPage will have its dependencies initialized by the
- * {@link AnnotSpringInjector}
+ * DeleteContactPage will have its dependencies initialized by the {@link AnnotSpringInjector}
*
* @author Igor Vaynberg (ivaynberg)
*
@@ -51,8 +48,7 @@
/**
* Constructor
* <p>
- * Sets up an {@link AnnotSpringInjector} that will use this mock context as
- * its source of beans
+ * Sets up an {@link AnnotSpringInjector} that will use this mock context as its source of beans
*
*
*/
Modified: wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java?rev=584970&r1=584969&r2=584970&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java (original)
+++ wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java Mon Oct 15 16:14:09 2007
@@ -29,18 +29,20 @@
import org.apache.wicket.spring.test.ApplicationContextMock;
import org.springframework.context.ApplicationContext;
-
/**
* Tests for BeanAnnotLocatorFactory
*
* @author igor
*
*/
-public class AnnotProxyFieldValueFactoryTest extends TestCase {
- ISpringContextLocator mockCtxLocator = new ISpringContextLocator() {
+public class AnnotProxyFieldValueFactoryTest extends TestCase
+{
+ ISpringContextLocator mockCtxLocator = new ISpringContextLocator()
+ {
private static final long serialVersionUID = 1L;
- public ApplicationContext getSpringContext() {
+ public ApplicationContext getSpringContext()
+ {
ApplicationContextMock mock = new ApplicationContextMock();
mock.putBean(new Bean());
mock.putBean("somebean", new Bean2());
@@ -50,15 +52,15 @@
Injectable obj = new Injectable();
- AnnotProxyFieldValueFactory factory = new AnnotProxyFieldValueFactory(
- mockCtxLocator);
+ AnnotProxyFieldValueFactory factory = new AnnotProxyFieldValueFactory(mockCtxLocator);
/**
* Test the factory
*
* @throws Exception
*/
- public void testFactory() throws Exception {
+ public void testFactory() throws Exception
+ {
SpringBeanLocator locator = null;
Object proxy = null;
@@ -68,16 +70,14 @@
field = obj.getClass().getDeclaredField("beanByClass");
proxy = factory.getFieldValue(field, obj);
- locator = (SpringBeanLocator) ((ILazyInitProxy) proxy)
- .getObjectLocator();
+ locator = (SpringBeanLocator)((ILazyInitProxy)proxy).getObjectLocator();
assertTrue(locator.getBeanType().equals(Bean.class));
assertTrue(locator.getSpringContextLocator() == mockCtxLocator);
assertTrue(factory.getFieldValue(field, obj) instanceof ILazyInitProxy);
field = obj.getClass().getDeclaredField("beanByName");
proxy = factory.getFieldValue(field, obj);
- locator = (SpringBeanLocator) ((ILazyInitProxy) proxy)
- .getObjectLocator();
+ locator = (SpringBeanLocator)((ILazyInitProxy)proxy).getObjectLocator();
assertTrue(locator.getBeanName().equals("somebean"));
assertTrue(locator.getBeanType().equals(Bean2.class));
assertTrue(locator.getSpringContextLocator() == mockCtxLocator);
@@ -85,12 +85,12 @@
}
/**
- * test the cache, make sure the same proxy is returned for the same
- * dependency it represents
+ * test the cache, make sure the same proxy is returned for the same dependency it represents
*
* @throws Exception
*/
- public void testCache() throws Exception {
+ public void testCache() throws Exception
+ {
Field field = obj.getClass().getDeclaredField("beanByClass");
Object proxy1 = factory.getFieldValue(field, obj);
Object proxy2 = factory.getFieldValue(field, obj);
@@ -105,30 +105,36 @@
/**
* Test creation fails with null springcontextlocator
*/
- public void testNullContextLocator() {
- try {
+ public void testNullContextLocator()
+ {
+ try
+ {
new AnnotProxyFieldValueFactory(null);
fail();
- } catch (IllegalArgumentException e) {
+ }
+ catch (IllegalArgumentException e)
+ {
// noop
}
}
-
+
public void testFailsIfBeanWithIdIsNotFound() throws Exception
{
InjectableWithReferenceToNonexistingBean obj = new InjectableWithReferenceToNonexistingBean();
Field field = obj.getClass().getDeclaredField("nonExisting");
- try
+ try
{
factory.getFieldValue(field, obj);
fail();
}
- catch (RuntimeException e) {
+ catch (RuntimeException e)
+ {
}
}
-
- static class InjectableWithReferenceToNonexistingBean {
- @SpringBean(name="nonExisting")
+
+ static class InjectableWithReferenceToNonexistingBean
+ {
+ @SpringBean(name = "nonExisting")
@SuppressWarnings("unused")
private Bean nonExisting;
}
Modified: wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java?rev=584970&r1=584969&r2=584970&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java (original)
+++ wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/spring/injection/util/Injectable.java Mon Oct 15 16:14:09 2007
@@ -18,7 +18,6 @@
import org.apache.wicket.spring.injection.annot.SpringBean;
-
/**
* Mock for an object with some SpringBean annotations
*
@@ -35,18 +34,19 @@
@SpringBean(name = "somebean")
private Bean2 beanByName;
- public Bean getBeanByClass() {
+ public Bean getBeanByClass()
+ {
return beanByClass;
}
- public Bean2 getBeanByName() {
+ public Bean2 getBeanByName()
+ {
return beanByName;
}
- public Bean getNobean() {
+ public Bean getNobean()
+ {
return nobean;
}
-
-
}
Modified: wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java?rev=584970&r1=584969&r2=584970&view=diff
==============================================================================
--- wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java (original)
+++ wicket/trunk/jdk-1.5/wicket-spring-annot/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java Mon Oct 15 16:14:09 2007
@@ -16,11 +16,9 @@
*/
package org.apache.wicket.util.license;
-
/**
- * Test that the license headers are in place in this project. The tests are run
- * from {@link ApacheLicenseHeaderTestCase}, but you can add project specific
- * tests here if needed.
+ * Test that the license headers are in place in this project. The tests are run from
+ * {@link ApacheLicenseHeaderTestCase}, but you can add project specific tests here if needed.
*
* @author Frank Bille Jensen (frankbille)
*/
@@ -31,6 +29,6 @@
*/
public ApacheLicenceHeaderTest()
{
-// addHeaders = true;
+ // addHeaders = true;
}
}