[jbosscache-dev] IDE settings in SVN Was: [jbosscache-commits] JBoss Cache SVN: r4438 - in core/trunk: .settings and 10 other directories.
Jason T. Greene
jason.greene at redhat.com
Sun Aug 26 20:04:00 EDT 2007
Yes the mvn eclipse:eclipse task should be ran to generate these. We
could bind this (and the idea equivalent) to the main compile task,
which would simplify this for users.
Manik Surtani wrote:
> Guys,
>
> Could we not check in IDE settings (Eclipse or IntelliJ) into SVN? I'd
> rather have the source tree free of user-specific or IDE-specific
> settings. Could we pls remove these?
>
> - Manik
>
> Begin forwarded message:
>
>> From: jbosscache-commits at lists.jboss.org
>> Date: 24 August 2007 18:14:17 BDT
>> To: jbosscache-commits at lists.jboss.org
>> Subject: [jbosscache-commits] JBoss Cache SVN: r4438 - in core/trunk:
>> .settings and 10 other directories.
>> Reply-To: jbosscache-commits at lists.jboss.org
>>
>> Author: genman
>> Date: 2007-08-24 13:14:16 -0400 (Fri, 24 Aug 2007)
>> New Revision: 4438
>>
>> Added:
>> core/trunk/.settings/
>> core/trunk/.settings/org.eclipse.jdt.core.prefs
>> core/trunk/.settings/org.eclipse.jdt.ui.prefs
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/Fqn.java
>> core/trunk/src/main/java/org/jboss/cache/Version.java
>>
>> core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
>>
>> core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java
>> core/trunk/src/main/java/org/jboss/cache/demo/JBossCacheGUI.java
>>
>> core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
>>
>>
>> core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterceptor.java
>>
>>
>> core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java
>>
>>
>> core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
>>
>> core/trunk/src/main/java/org/jboss/cache/interceptors/UnlockInterceptor.java
>>
>> core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
>>
>> core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java
>> core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java
>>
>> core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java
>>
>> core/trunk/src/main/java/org/jboss/cache/lock/LockStrategyRepeatableRead.java
>>
>> core/trunk/src/main/java/org/jboss/cache/util/MapCopy.java
>>
>> core/trunk/src/main/java/org/jboss/cache/util/SimpleImmutableEntry.java
>> core/trunk/src/main/java/org/jboss/cache/util/Util.java
>> Log:
>> Fix misc issues found with "findbugs" tool
>> Fix regression in Version for parsing version strings with two elements
>>
>> Added: core/trunk/.settings/org.eclipse.jdt.core.prefs
>> ===================================================================
>> ---
>> core/trunk/.settings/org.eclipse.jdt.core.prefs
>> (rev 0)
>> +++ core/trunk/.settings/org.eclipse.jdt.core.prefs 2007-08-24
>> 17:14:16 UTC (rev 4438)
>> @@ -0,0 +1,251 @@
>> +#Wed Aug 15 11:19:52 PDT 2007
>> +eclipse.preferences.version=1
>> +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
>> +org.eclipse.jdt.core.compiler.compliance=1.5
>> +org.eclipse.jdt.core.compiler.source=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=52
>> +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=1
>> +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_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=next_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.format_comments=false
>> +org.eclipse.jdt.core.formatter.comment.format_header=false
>> +org.eclipse.jdt.core.formatter.comment.format_html=true
>> +org.eclipse.jdt.core.formatter.comment.format_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.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=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not
>> insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=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=do
>> not 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_postfix_operator=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not
>> insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
>>
>> +org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not
>> insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do
>> not insert
>> +org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do
>> not insert
>> +org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
>> +org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
>>
>> +org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
>> +org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
>> +org.eclipse.jdt.core.formatter.lineSplit=120
>> +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
>>
>> +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
>> +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
>> +org.eclipse.jdt.core.formatter.tabulation.char=space
>> +org.eclipse.jdt.core.formatter.tabulation.size=3
>> +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
>>
>>
>> Added: core/trunk/.settings/org.eclipse.jdt.ui.prefs
>> ===================================================================
>> ---
>> core/trunk/.settings/org.eclipse.jdt.ui.prefs
>> (rev 0)
>> +++ core/trunk/.settings/org.eclipse.jdt.ui.prefs 2007-08-24
>> 17:14:16 UTC (rev 4438)
>> @@ -0,0 +1,6 @@
>> +#Wed Aug 15 11:19:52 PDT 2007
>> +eclipse.preferences.version=1
>> +formatter_profile=_JBoss
>> +formatter_settings_version=10
>> +internal.default.compliance=default
>> +org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0"
>> encoding\="UTF-8"?><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 * Returns ${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
>> */</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 * Constructs a new
>> ${enclosing_type}.\r\n * ${tags}\r\n */</template><template
>> autoinsert\="true" conte!
>> xt\="filecomment_context" deleted\="false" description\="Comment for
>> created Java files" enabled\="true"
>> id\="org.eclipse.jdt.ui.text.codetemplates.filecomment"
>> name\="filecomment">/**\r\n * \r\n */</template><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 Elias Ross\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 auto!
>> insert\="false" context\="overridecomment_context" deleted\="false" de
>> scription\="Comment for overriding methods" enabled\="true"
>> id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment"
>> name\="overridecomment"></template><template autoinsert\="false"
>> 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 */</template><template
>> autoinsert\="true" context\="newtype_context" deleted\="false"
>> description\="Newly created files" enabled\="true"
>> id\="org.eclipse.jdt.ui.text.codetemplates.newtype"
>> name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</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\="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"
>> descripti!
>> on\="Code in created method stubs" enabled\="true" id\="org.eclipse.jd
>> t.ui.text.codetemplates.methodbody"
>> name\="methodbody">${body_statement}</template><template
>> autoinsert\="false" context\="constructorbody_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></templates>
>>
>> Modified: core/trunk/src/main/java/org/jboss/cache/Fqn.java
>> ===================================================================
>> --- core/trunk/src/main/java/org/jboss/cache/Fqn.java 2007-08-24
>> 17:12:24 UTC (rev 4437)
>> +++ core/trunk/src/main/java/org/jboss/cache/Fqn.java 2007-08-24
>> 17:14:16 UTC (rev 4438)
>> @@ -76,7 +76,7 @@
>> * Immutable root FQN.
>> */
>> public static final Fqn ROOT = new Fqn();
>> - private static Log log = LogFactory.getLog(Fqn.class);
>> + private final static Log log = LogFactory.getLog(Fqn.class);
>> // a cached string representation of this Fqn, used by toString to
>> it isn't calculated again every time.
>> private String cachedStringRep;
>>
>>
>> Modified: core/trunk/src/main/java/org/jboss/cache/Version.java
>> ===================================================================
>> --- core/trunk/src/main/java/org/jboss/cache/Version.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++ core/trunk/src/main/java/org/jboss/cache/Version.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -1,6 +1,6 @@
>> package org.jboss.cache;
>>
>> -import java.util.StringTokenizer;
>> +import net.jcip.annotations.Immutable;
>>
>> /**
>> * Contains version information about this release of JBoss Cache.
>> @@ -8,12 +8,13 @@
>> * @author Bela Ban
>> * @version $Id$
>> */
>> + at Immutable
>> public class Version
>> {
>> public static final String version = "2.1.0-SNAPSHOT";
>> public static final String codename = "Alegrias";
>> - public static byte[] version_id = {'0', '2', '1', '0', 'S'};
>> public static final String cvs = "$Id$";
>> + static final byte[] version_id = {'0', '2', '1', '0', 'S'};
>>
>> private static final int MAJOR_SHIFT = 11;
>> private static final int MINOR_SHIFT = 6;
>> @@ -103,10 +104,16 @@
>> return 1241;
>>
>> String parts[] = versionString.split("[\\.\\-]");
>> - if (parts.length < 3)
>> - throw new IllegalArgumentException("versionString should be
>> at least 3 parts!");
>> -
>> - return encodeVersion(Integer.parseInt(parts[0]),
>> Integer.parseInt(parts[1]), Integer.parseInt(parts[2]));
>> + int a = 0;
>> + int b = 0;
>> + int c = 0;
>> + if (parts.length > 0)
>> + a = Integer.parseInt(parts[0]);
>> + if (parts.length > 1)
>> + b = Integer.parseInt(parts[1]);
>> + if (parts.length > 2)
>> + c = Integer.parseInt(parts[2]);
>> + return encodeVersion(a, b, c);
>> }
>>
>> public static String getVersionString(short versionShort)
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
>>
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -131,6 +131,8 @@
>>
>> private ViewChangeListener viewChangeListener; // the view-change
>> viewChangeListener
>>
>> + private boolean receivedBuddyInfo;
>> +
>> public BuddyManager(BuddyReplicationConfig config)
>> {
>> this.config = config;
>> @@ -415,6 +417,7 @@
>> synchronized (poolInfoNotifierLock)
>> {
>> log.trace("Notifying any waiting view change threads that we
>> have received buddy pool info.");
>> + receivedBuddyInfo = true;
>> poolInfoNotifierLock.notifyAll();
>> }
>> }
>> @@ -1062,7 +1065,9 @@
>> synchronized (poolInfoNotifierLock)
>> {
>> log.trace("Not received necessary buddy pool info for
>> all new members yet; waiting on poolInfoNotifierLock.");
>> - poolInfoNotifierLock.wait();
>> + while (!receivedBuddyInfo)
>> + poolInfoNotifierLock.wait();
>> + receivedBuddyInfo = false;
>> }
>> }
>>
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -265,25 +265,24 @@
>>
>> public boolean equals(Object obj)
>> {
>> - return equalsExcludingProperties(obj)
>> - && safeEquals(this.properties,
>> ((IndividualCacheLoaderConfig) obj).properties);
>> + if (!(obj instanceof IndividualCacheLoaderConfig))
>> + return false;
>> + IndividualCacheLoaderConfig i =
>> (IndividualCacheLoaderConfig)obj;
>> + return equalsExcludingProperties(i)
>> + && safeEquals(this.properties, i.properties);
>> }
>>
>> protected boolean equalsExcludingProperties(Object obj)
>> {
>> - if (this == obj)
>> - return true;
>> + if (!(obj instanceof IndividualCacheLoaderConfig))
>> + return false;
>> + IndividualCacheLoaderConfig other =
>> (IndividualCacheLoaderConfig)obj;
>>
>> - if (obj instanceof IndividualCacheLoaderConfig)
>> - {
>> - IndividualCacheLoaderConfig other =
>> (IndividualCacheLoaderConfig) obj;
>> - return safeEquals(this.className, other.className)
>> - && (this.async == other.async)
>> - && (this.ignoreModifications ==
>> other.ignoreModifications)
>> - && (this.fetchPersistentState ==
>> other.fetchPersistentState)
>> - && safeEquals(this.singletonStoreConfig,
>> other.singletonStoreConfig);
>> - }
>> - return false;
>> + return safeEquals(this.className, other.className)
>> + && (this.async == other.async)
>> + && (this.ignoreModifications ==
>> other.ignoreModifications)
>> + && (this.fetchPersistentState ==
>> other.fetchPersistentState)
>> + && safeEquals(this.singletonStoreConfig,
>> other.singletonStoreConfig);
>>
>> }
>>
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/demo/JBossCacheGUI.java
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/demo/JBossCacheGUI.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/demo/JBossCacheGUI.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -72,22 +72,22 @@
>> {
>> private static final long serialVersionUID = -1242167331988194987L;
>>
>> - private CacheModelDelegate cacheModelDelegate;
>> - private Cache cache;
>> + private transient CacheModelDelegate cacheModelDelegate;
>> + private transient Cache cache;
>> private DefaultTreeModel tree_model = null;
>> - private Log log = LogFactory.getLog(getClass());
>> + private transient Log log = LogFactory.getLog(getClass());
>> private JTree jtree = null;
>> private DefaultTableModel tableModel = new DefaultTableModel();
>> private JTable table = new JTable(tableModel);
>> private JBossCacheGUI.DisplayNode myNodeRoot = new
>> JBossCacheGUI.DisplayNode(Fqn.SEPARATOR);
>> - private Node root;
>> - private Node selected_node = null;
>> + private transient Node root;
>> + private transient Node selected_node = null;
>> private JPanel tablePanel = null;
>> private JPopupMenu operationsPopup = null, dataModificationsPopup
>> = null;
>> private static final int KEY_COL_WIDTH = 20;
>> private static final int VAL_COL_WIDTH = 300;
>> private TransactionManager tx_mgr = null;
>> - private Transaction tx = null;
>> + private transient Transaction tx = null;
>> private JPanel mainPanel;
>> private List<Address> membership = new LinkedList<Address>();
>> private Address coordinator = null;
>> @@ -98,7 +98,7 @@
>> * resource-managemenet requirement, such as in an application
>> server, newCachedThreadPool is a good option as it
>> * provides better queuing performance.
>> */
>> - private Executor executor;
>> + private transient Executor executor;
>>
>> public JBossCacheGUI(CacheModelDelegate cacheDelegate, boolean
>> useConsole) throws Exception
>> {
>> @@ -242,10 +242,9 @@
>> public void setCacheModelDelegate(final CacheModelDelegate
>> cacheModelDelegate)
>> {
>> this.cacheModelDelegate = cacheModelDelegate;
>> - cache = this.cacheModelDelegate.getGenericCache();
>> -
>> if (this.cacheModelDelegate != null)
>> {
>> + this.cache = this.cacheModelDelegate.getGenericCache();
>> Runtime.getRuntime().addShutdownHook(
>> new Thread()
>> {
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
>>
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -567,12 +567,4 @@
>> return nodeData;
>> }
>>
>> - private void warnCustom()
>> - {
>> - log.warn("CacheLoader.get(Fqn) returned a null; assuming the
>> node nodes not exist.");
>> - log.warn("The CacheLoader interface has changed since
>> JBossCache 1.3.x");
>> - log.warn("Please see
>> http://jira.jboss.com/jira/browse/JBCACHE-118");
>> - log.warn("CacheLoader.get() should return an empty Map if the
>> node does exist but doesn't have any attributes.");
>> - }
>> -
>> }
>> \ No newline at end of file
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterceptor.java
>>
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterceptor.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/interceptors/CacheStoreInterceptor.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -96,7 +96,8 @@
>> // this is a commit call.
>> if (log.isTraceEnabled()) log.trace("Calling
>> loader.commit() for gtx " + gtx);
>> // sync call (a write) on the loader
>> - List fqnsModified =
>> getFqnsFromModificationList(tx_table.get(gtx).getCacheLoaderModifications());
>>
>> + // ignore modified FQNs
>> + // List fqnsModified =
>> getFqnsFromModificationList(tx_table.get(gtx).getCacheLoaderModifications());
>>
>> try
>> {
>> loader.commit(gtx);
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java
>>
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -41,8 +41,6 @@
>> {
>> private TransactionTable tx_table = null;
>>
>> - boolean writeLockOnChildInsertRemove = true;
>> -
>> /**
>> * Map<Object, java.util.List>. Keys = threads, values = lists of
>> locks held by that thread
>> */
>> @@ -57,7 +55,6 @@
>> tx_table = cache.getTransactionTable();
>> lock_table = cache.getLockTable();
>> lock_acquisition_timeout =
>> cache.getConfiguration().getLockAcquisitionTimeout();
>> - writeLockOnChildInsertRemove =
>> cache.getConfiguration().isLockParentForChildInsertRemove();
>> }
>>
>>
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -289,7 +289,8 @@
>> // we need to attach this tx to the InvocationContext.
>> ctx.setTransaction(tx);
>> }
>> - if (tx != null) m = attachGlobalTransaction(ctx, tx, m);
>> + if (tx != null)
>> + attachGlobalTransaction(ctx, tx, m);
>>
>> GlobalTransaction gtx = ctx.getGlobalTransaction();
>>
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/interceptors/UnlockInterceptor.java
>>
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/interceptors/UnlockInterceptor.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/interceptors/UnlockInterceptor.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -31,7 +31,6 @@
>>
>> public Object invoke(InvocationContext ctx) throws Throwable
>> {
>> - MethodCall m = ctx.getMethodCall();
>> try
>> {
>> return super.invoke(ctx);
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/jmx/CacheJmxWrapper.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -1084,7 +1084,7 @@
>> this,
>> getNextNotificationSequenceNumber(), now, msg,
>> "State", "java.lang.Integer",
>> - new Integer(oldState), new Integer(newState)
>> + Integer.valueOf(oldState), Integer.valueOf(newState)
>> );
>> stateChangeNotification.setUserData(t);
>>
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/loader/CacheLoaderManager.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -8,7 +8,6 @@
>>
>> import org.apache.commons.logging.Log;
>> import org.apache.commons.logging.LogFactory;
>> -import org.jboss.cache.Cache;
>> import org.jboss.cache.CacheException;
>> import org.jboss.cache.CacheSPI;
>> import org.jboss.cache.Fqn;
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -14,7 +14,6 @@
>> import java.sql.PreparedStatement;
>> import java.sql.ResultSet;
>> import java.sql.SQLException;
>> -import java.util.Collections;
>> import java.util.HashMap;
>> import java.util.List;
>> import java.util.Map;
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -333,8 +333,9 @@
>> fqn = (Fqn) input.readObject();
>> n = (NodeSPI) c.getRoot().getChild(fqn);
>> if (n == null)
>> - {// node doesn't exist - return null
>> - output.writeObject(n);
>> + {
>> + // node doesn't exist - return null
>> + output.writeObject(null);
>> break;
>> }
>> Map map = n.getDataDirect();
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/lock/LockStrategyRepeatableRead.java
>>
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/lock/LockStrategyRepeatableRead.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/lock/LockStrategyRepeatableRead.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -54,6 +54,6 @@
>>
>> public String toString()
>> {
>> - return lock_ != null? lock_.toString() : null;
>> + return lock_ != null? lock_.toString() : "(null)";
>> }
>> }
>>
>> Modified: core/trunk/src/main/java/org/jboss/cache/util/MapCopy.java
>> ===================================================================
>> --- core/trunk/src/main/java/org/jboss/cache/util/MapCopy.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++ core/trunk/src/main/java/org/jboss/cache/util/MapCopy.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -28,7 +28,7 @@
>>
>> private static final long serialVersionUID = -958813082188242956L;
>>
>> - private List<Entry<K, V>> data = new ArrayList<Entry<K, V>>();
>> + private final List<Entry<K, V>> data;
>>
>> private transient Set<Map.Entry<K, V>> entrySet;
>>
>> @@ -39,6 +39,7 @@
>> */
>> public MapCopy(Map<K, V> m)
>> {
>> + data = new ArrayList<Entry<K, V>>(m.size());
>> for (Map.Entry<K, V> me : m.entrySet())
>> {
>> if (me == null)
>> @@ -50,7 +51,7 @@
>>
>> public MapCopy()
>> {
>> - this(new HashMap<K, V>());
>> + this(new HashMap<K, V>(0));
>> }
>>
>> /**
>>
>> Modified:
>> core/trunk/src/main/java/org/jboss/cache/util/SimpleImmutableEntry.java
>> ===================================================================
>> ---
>> core/trunk/src/main/java/org/jboss/cache/util/SimpleImmutableEntry.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++
>> core/trunk/src/main/java/org/jboss/cache/util/SimpleImmutableEntry.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -45,6 +45,8 @@
>> @Override
>> public boolean equals(Object o)
>> {
>> + if (!(o instanceof Map.Entry))
>> + return false;
>> Map.Entry e2 = (Map.Entry) o;
>> return (getKey() == null ? e2.getKey() == null :
>> getKey().equals(e2.getKey()))
>> && (getValue() == null ? e2.getValue() == null :
>> getValue().equals(e2.getValue()));
>>
>> Modified: core/trunk/src/main/java/org/jboss/cache/util/Util.java
>> ===================================================================
>> --- core/trunk/src/main/java/org/jboss/cache/util/Util.java
>> 2007-08-24 17:12:24 UTC (rev 4437)
>> +++ core/trunk/src/main/java/org/jboss/cache/util/Util.java
>> 2007-08-24 17:14:16 UTC (rev 4438)
>> @@ -73,27 +73,30 @@
>> MapModifications mods = new MapModifications();
>>
>> // let's start with what's been added and modified.
>> - for (Object key : post.keySet())
>> + for (Map.Entry me : post.entrySet())
>> {
>> + Object key = me.getKey();
>> + Object value = me.getValue();
>> if (pre.containsKey(key))
>> {
>> - if (!post.get(key).equals(pre.get(key)))
>> + if (!value.equals(pre.get(key)))
>> {
>> - mods.modifiedEntries.put(key, post.get(key));
>> + mods.modifiedEntries.put(key, value);
>> }
>> }
>> else
>> {
>> - mods.addedEntries.put(key, post.get(key));
>> + mods.addedEntries.put(key, value);
>> }
>> }
>>
>> // now the removed entries.
>> - for (Object key : pre.keySet())
>> + for (Map.Entry me : pre.entrySet())
>> {
>> + Object key = me.getKey();
>> if (!post.containsKey(key))
>> {
>> - mods.removedEntries.put(key, pre.get(key));
>> + mods.removedEntries.put(key, me.getValue());
>> }
>> }
>>
>>
>> _______________________________________________
>> jbosscache-commits mailing list
>> jbosscache-commits at lists.jboss.org
>> https://lists.jboss.org/mailman/listinfo/jbosscache-commits
>
> --
> Manik Surtani
>
> Lead, JBoss Cache
> JBoss, a division of Red Hat
>
>
>
> _______________________________________________
> jbosscache-dev mailing list
> jbosscache-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/jbosscache-dev
--
Jason T. Greene
Lead, POJO Cache
JBoss, a division of Red Hat
More information about the jbosscache-dev
mailing list