comparison mx/eclipse-settings/org.eclipse.jdt.core.prefs @ 7552:a200d10867f1

Merge.
author Doug Simon <doug.simon@oracle.com>
date Thu, 24 Jan 2013 17:03:46 +0100
parents 4a11124a3563
children 630ea5001e33
comparison
equal deleted inserted replaced
7551:68a59067974a 7552:a200d10867f1
129 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled 129 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
130 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL 130 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
131 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX 131 org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
132 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false 132 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
133 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 133 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
134 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
134 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 135 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
135 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 136 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
136 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 137 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
137 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 138 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
138 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 139 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
139 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 140 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
140 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 141 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
141 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 142 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
142 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 143 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
143 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 144 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
145 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
144 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 146 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
145 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 147 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
146 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 148 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
147 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 149 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
150 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
148 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 151 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
149 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 152 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
150 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 153 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
151 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 154 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
152 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 155 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
156 org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
153 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 157 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
154 org.eclipse.jdt.core.formatter.blank_lines_after_package=1 158 org.eclipse.jdt.core.formatter.blank_lines_after_package=1
155 org.eclipse.jdt.core.formatter.blank_lines_before_field=0 159 org.eclipse.jdt.core.formatter.blank_lines_before_field=0
156 org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 160 org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
157 org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 161 org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
184 org.eclipse.jdt.core.formatter.comment.format_source_code=true 188 org.eclipse.jdt.core.formatter.comment.format_source_code=true
185 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true 189 org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
186 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true 190 org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
187 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert 191 org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
188 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert 192 org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
189 org.eclipse.jdt.core.formatter.comment.line_length=120 193 org.eclipse.jdt.core.formatter.comment.line_length=100
194 org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
195 org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
196 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true
190 org.eclipse.jdt.core.formatter.compact_else_if=true 197 org.eclipse.jdt.core.formatter.compact_else_if=true
191 org.eclipse.jdt.core.formatter.continuation_indentation=4 198 org.eclipse.jdt.core.formatter.continuation_indentation=4
192 org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=4 199 org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=4
200 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
201 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
193 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false 202 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
203 org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
194 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true 204 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
195 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true 205 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
196 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true 206 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
197 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true 207 org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
198 org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true 208 org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
199 org.eclipse.jdt.core.formatter.indent_empty_lines=false 209 org.eclipse.jdt.core.formatter.indent_empty_lines=false
200 org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true 210 org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
201 org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true 211 org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
202 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true 212 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
203 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true 213 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
204 org.eclipse.jdt.core.formatter.indentation.size=8 214 org.eclipse.jdt.core.formatter.indentation.size=4
205 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert 215 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
216 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=do not insert
206 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert 217 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
207 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert 218 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
208 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert 219 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
220 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
221 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
222 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
223 org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
209 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert 224 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
210 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert 225 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
211 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert 226 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
212 org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert 227 org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
213 org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert 228 org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
270 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert 285 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
271 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert 286 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
272 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert 287 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
273 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert 288 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
274 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert 289 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
290 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
275 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert 291 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
276 org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert 292 org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
277 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert 293 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
278 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert 294 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
279 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert 295 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
280 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert 296 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
297 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
281 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert 298 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
282 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert 299 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
283 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert 300 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
284 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert 301 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
285 org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert 302 org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
299 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert 316 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
300 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert 317 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
301 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert 318 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
302 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert 319 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
303 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert 320 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
321 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
304 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert 322 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
305 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert 323 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
306 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert 324 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
307 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert 325 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
308 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert 326 org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
354 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert 372 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
355 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert 373 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
356 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert 374 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
357 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert 375 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
358 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert 376 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
377 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
359 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert 378 org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
360 org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert 379 org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
361 org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert 380 org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
362 org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert 381 org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
363 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert 382 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
364 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert 383 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
365 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert 384 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
366 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert 385 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
367 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert 386 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
387 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
368 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert 388 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
369 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert 389 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
370 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert 390 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
371 org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert 391 org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
372 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert 392 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
386 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 406 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
387 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 407 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
388 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true 408 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
389 org.eclipse.jdt.core.formatter.tabulation.char=space 409 org.eclipse.jdt.core.formatter.tabulation.char=space
390 org.eclipse.jdt.core.formatter.tabulation.size=4 410 org.eclipse.jdt.core.formatter.tabulation.size=4
411 org.eclipse.jdt.core.formatter.use_on_off_tags=true
391 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false 412 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
392 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false 413 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
414 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
415 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
393 org.eclipse.jdt.core.incompatibleJDKLevel=ignore 416 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
394 org.eclipse.jdt.core.incompleteClasspath=error 417 org.eclipse.jdt.core.incompleteClasspath=error