diff --git a/.gitattributes b/.gitattributes index 818f83e0459..383a30eb04e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -172,6 +172,8 @@ icu4c/source/tools/tzcode/zdump.c -text icu4j/.classpath -text icu4j/.project -text icu4j/eclipseFragment.txt -text +icu4j/eclipseProjectMisc/initSrc.launch -text +icu4j/eclipseProjectMisc/normSrc.launch -text icu4j/ee.foundation.jar -text icu4j/license.html -text icu4j/preprocessor.txt -text diff --git a/icu4j/.externalToolBuilders/icu4j_Resources.launch b/icu4j/.externalToolBuilders/icu4j_Resources.launch index 69217f3f05f..e5367505ca2 100644 --- a/icu4j/.externalToolBuilders/icu4j_Resources.launch +++ b/icu4j/.externalToolBuilders/icu4j_Resources.launch @@ -1,23 +1,21 @@ - - + - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/icu4j/.project b/icu4j/.project index 1a303d7db48..93ed62b2c73 100644 --- a/icu4j/.project +++ b/icu4j/.project @@ -12,7 +12,7 @@ org.eclipse.ui.externaltools.ExternalToolBuilder - full,incremental, + full, LaunchConfigHandle diff --git a/icu4j/.settings/org.eclipse.jdt.core.prefs b/icu4j/.settings/org.eclipse.jdt.core.prefs index 6742b2cec4d..d3b3ff19c54 100644 --- a/icu4j/.settings/org.eclipse.jdt.core.prefs +++ b/icu4j/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,6 @@ -#Wed Mar 07 11:31:50 EST 2007 +#Wed Aug 22 13:05:31 EDT 2007 eclipse.preferences.version=1 +instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true org.eclipse.jdt.core.codeComplete.argumentPrefixes= org.eclipse.jdt.core.codeComplete.argumentSuffixes= org.eclipse.jdt.core.codeComplete.fieldPrefixes= @@ -88,6 +89,7 @@ org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 org.eclipse.jdt.core.formatter.blank_lines_before_method=1 org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line @@ -101,9 +103,14 @@ org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line org.eclipse.jdt.core.formatter.comment.clear_blank_lines=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 @@ -278,6 +285,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=inser 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 @@ -298,9 +306,12 @@ 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=80 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/icu4j/.settings/org.eclipse.jdt.ui.prefs b/icu4j/.settings/org.eclipse.jdt.ui.prefs index 8bcc3761ddb..efab0a00691 100644 --- a/icu4j/.settings/org.eclipse.jdt.ui.prefs +++ b/icu4j/.settings/org.eclipse.jdt.ui.prefs @@ -1,11 +1,12 @@ -#Wed Mar 07 11:31:50 EST 2007 +#Wed Aug 22 13:05:31 EDT 2007 eclipse.preferences.version=1 -formatter_profile=_ICU4J -formatter_settings_version=10 +formatter_profile=_ICU4J standard +formatter_settings_version=11 +instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true internal.default.compliance=user org.eclipse.jdt.ui.exception.name=e org.eclipse.jdt.ui.gettersetter.use.is=true org.eclipse.jdt.ui.javadoc=true org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= +org.eclipse.jdt.ui.overrideannotation=false +org.eclipse.jdt.ui.text.custom_code_templates= diff --git a/icu4j/eclipseProjectMisc/initSrc.launch b/icu4j/eclipseProjectMisc/initSrc.launch new file mode 100644 index 00000000000..9a1b84e3362 --- /dev/null +++ b/icu4j/eclipseProjectMisc/initSrc.launch @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icu4j/eclipseProjectMisc/normSrc.launch b/icu4j/eclipseProjectMisc/normSrc.launch new file mode 100644 index 00000000000..179d952ec8d --- /dev/null +++ b/icu4j/eclipseProjectMisc/normSrc.launch @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +