View | Details | Raw Unified | Return to bug 269496 | Differences between
and this patch

Collapse All | Expand All

(-).settings/org.eclipse.jdt.core.prefs (-237 / +315 lines)
Lines 1-265 Link Here
1 
#Mon Aug 24 11:50:51 EDT 2009
 1 
#Thu Mar 04 10:20:10 EST 2010
2 
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
 2 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
3 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
 3 
org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
4 
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
 4 
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
5 
org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
 5 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
6 
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
 6 
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
7 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
 7 
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
8 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
 8 
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
9 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
 9 
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
10 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
 10 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
11 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
 11 
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
12 
org.eclipse.jdt.core.compiler.compliance=1.4
 12 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
13 
org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
 13 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
14 
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
15 
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
16 
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
17 
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
18 
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
19 
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
20 
org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
21 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
22 
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
23 
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
14 
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
 24 
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
15 
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
 25 
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
16 
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
 26 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
17 
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
 27 
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
18 
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
19 
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
20 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
21 
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
22 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
23 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
 28 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
24 
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
 29 
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
25 
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 30 
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
26 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
 31 
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
27 
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
 32 
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
28 
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
 33 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
29 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
 34 
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
30 
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 35 
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
36 
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
37 
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
38 
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
39 
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
40 
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
41 
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
42 
org.eclipse.jdt.core.formatter.comment.format_source_code=true
43 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
44 
org.eclipse.jdt.core.compiler.debug.localVariable=generate
31 
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
 45 
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
32 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
 46 
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
33 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
 47 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
34 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
 48 
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
35 
org.eclipse.jdt.core.formatter.comment.format_html=true
 49 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
36 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
 50 
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
37 
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
 51 
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
38 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
 52 
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
39 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
 53 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
54 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
55 
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
56 
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
40 
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 57 
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
41 
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
42 
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
43 
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
44 
org.eclipse.jdt.core.compiler.debug.localVariable=generate
45 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
46 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
47 
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
48 
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
49 
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
50 
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
51 
org.eclipse.jdt.core.formatter.tabulation.size=4
52 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
53 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
 58 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
54 
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
 59 
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
55 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
56 
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
57 
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
58 
org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
59 
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
60 
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
61 
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
62 
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 60 
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
63 
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
 61 
org.eclipse.jdt.core.formatter.comment.format_header=false
64 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
 62 
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
65 
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 63 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
66 
org.eclipse.jdt.core.formatter.tabulation.char=tab
 64 
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
67 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
 65 
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
68 
org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
 66 
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
69 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
 67 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
70 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
 68 
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
71 
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
 69 
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
72 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
 70 
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
73 
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
 71 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
74 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
 72 
org.eclipse.jdt.core.formatter.comment.line_length=80
75 
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
 73 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
74 
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
75 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
76 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
 76 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
77 
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 77 
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
78 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
 78 
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
79 
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 79 
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
80 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
 80 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
81 
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
 81 
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
82 
org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
 82 
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
83 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
84 
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
83 
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
 85 
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
84 
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 86 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
85 
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
 87 
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
88 
org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
89 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
90 
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
91 
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
86 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
 92 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
87 
org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
 93 
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
88 
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
 94 
org.eclipse.jdt.core.formatter.continuation_indentation=2
89 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 95 
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
90 
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
 96 
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
91 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
 97 
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
98 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
99 
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
100 
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
101 
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
102 
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
103 
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
104 
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
105 
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
106 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
107 
org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
108 
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
109 
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
110 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
111 
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
112 
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
113 
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
114 
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
115 
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error
116 
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
117 
org.eclipse.jdt.core.formatter.comment.format_block_comments=false
118 
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
119 
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
120 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
121 
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
122 
org.eclipse.jdt.core.formatter.comment.format_html=true
123 
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
124 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
125 
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
126 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
127 
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
128 
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
129 
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
130 
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
131 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
132 
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
133 
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
134 
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
135 
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
136 
org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert
137 
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
138 
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
139 
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
140 
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
92 
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 141 
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
142 
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
93 
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
 143 
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
94 
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
 144 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
95 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
 145 
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
96 
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
 146 
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
97 
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
 147 
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
98 
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
 148 
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
99 
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
 149 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
100 
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 150 
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
101 
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 151 
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
102 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
 152 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
103 
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 153 
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
104 
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
 154 
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
155 
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
156 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
105 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
 157 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
106 
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
 158 
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
107 
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
 159 
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
108 
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
109 
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
110 
org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
111 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
112 
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
113 
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
114 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
 160 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
115 
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
 161 
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
162 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
116 
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
 163 
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
117 
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
 164 
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
118 
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
 165 
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
119 
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
120 
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
121 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
122 
org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
123 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
124 
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
125 
org.eclipse.jdt.core.formatter.comment.format_block_comments=false
126 
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
127 
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
128 
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
129 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
 166 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
130 
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 167 
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
131 
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
 168 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
132 
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
 169 
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
133 
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
 170 
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
134 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
 171 
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
135 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
136 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
137 
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
138 
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
139 
org.eclipse.jdt.core.formatter.lineSplit=800
140 
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
141 
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
142 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
 172 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
143 
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
 173 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
144 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
 174 
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
145 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
 175 
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
146 
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
 176 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
147 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
 177 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
148 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
 178 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
149 
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
 179 
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
150 
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
 180 
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
151 
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 181 
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
152 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
 182 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
153 
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
 183 
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
154 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
 184 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
155 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
 185 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
156 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
 186 
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
157 
org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
 187 
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
158 
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 188 
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
159 
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
 189 
org.eclipse.jdt.core.formatter.tabulation.char=tab
160 
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
 190 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
161 
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
162 
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
163 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
164 
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
 191 
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
165 
org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
 192 
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
166 
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
 193 
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
167 
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
 194 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
168 
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
 195 
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
169 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
170 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
171 
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 196 
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
197 
org.eclipse.jdt.core.formatter.compact_else_if=true
198 
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
199 
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
200 
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
201 
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
202 
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
203 
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
204 
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
172 
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 205 
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
173 
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
 206 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
174 
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
 207 
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
175 
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
 208 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
176 
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
 209 
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
177 
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
 210 
org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
178 
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
 211 
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
179 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
180 
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
181 
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
182 
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
183 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
184 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
185 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
186 
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
187 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
188 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
189 
org.eclipse.jdt.core.formatter.comment.format_header=false
190 
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
191 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
192 
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
193 
eclipse.preferences.version=1
194 
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
195 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
196 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
197 
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
198 
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
199 
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
200 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
201 
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
202 
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
203 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
 212 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
204 
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 213 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
205 
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
 214 
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
206 
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 215 
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
207 
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
 216 
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
208 
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
209 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
210 
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
211 
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
212 
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
213 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
214 
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
215 
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
 217 
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
216 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
 218 
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
217 
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
 219 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
218 
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false
 220 
org.eclipse.jdt.core.formatter.comment.format_line_comments=false
219 
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
 221 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
220 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
 222 
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
221 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
 223 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
222 
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
 224 
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
223 
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
 225 
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
224 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
 226 
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
225 
org.eclipse.jdt.core.formatter.indentation.size=4
 227 
org.eclipse.jdt.core.formatter.indentation.size=4
226 
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
 228 
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
229 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
230 
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
231 
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
232 
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
233 
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
234 
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
235 
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
236 
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
237 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
238 
org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
239 
org.eclipse.jdt.core.compiler.problem.deprecation=warning
240 
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
241 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
242 
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
243 
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
244 
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
245 
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
227 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
 246 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
228 
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
 247 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
229 
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
 248 
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
230 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
 249 
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
231 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 250 
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
232 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
 251 
org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
233 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
 252 
org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
234 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
 253 
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
254 
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
255 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
235 
org.eclipse.jdt.core.formatter.indent_empty_lines=false
 256 
org.eclipse.jdt.core.formatter.indent_empty_lines=false
236 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
 257 
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
237 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
 258 
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
238 
org.eclipse.jdt.core.formatter.comment.format_line_comments=false
 259 
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
239 
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
 260 
org.eclipse.jdt.core.compiler.problem.deadCode=warning
240 
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 261 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
241 
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
 262 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
263 
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
264 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
265 
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
266 
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
267 
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
268 
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
269 
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
270 
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
271 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
272 
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
242 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
 273 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
243 
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 274 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
244 
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
 275 
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
245 
org.eclipse.jdt.core.formatter.compact_else_if=true
 276 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
246 
org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
 277 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
278 
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
279 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
280 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
281 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
282 
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
283 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
284 
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
285 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
286 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
287 
org.eclipse.jdt.core.compiler.problem.nullReference=error
288 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
289 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
290 
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
291 
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
292 
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
293 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
294 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
295 
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
296 
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
297 
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
298 
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
299 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
300 
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
301 
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
302 
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
303 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
304 
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
305 
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
306 
org.eclipse.jdt.core.formatter.lineSplit=800
307 
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
308 
org.eclipse.jdt.core.compiler.source=1.3
309 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert
310 
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
311 
org.eclipse.jdt.core.formatter.tabulation.size=4
312 
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
313 
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
314 
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
315 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
316 
org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
317 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
318 
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
319 
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
320 
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
321 
org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
322 
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
323 
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
324 
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
247 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
 325 
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
248 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
 326 
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
249 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
 327 
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
250 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
 328 
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
251 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
 329 
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
252 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
 330 
org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
253 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
 331 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
254 
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
 332 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
255 
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
 333 
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
256 
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
257 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
 334 
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
258 
org.eclipse.jdt.core.compiler.source=1.3
 335 
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
259 
org.eclipse.jdt.core.formatter.comment.format_source_code=true
 336 
eclipse.preferences.version=1
260 
org.eclipse.jdt.core.formatter.comment.line_length=80
 337 
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
261 
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
 338 
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
262 
org.eclipse.jdt.core.formatter.continuation_indentation=2
 339 
org.eclipse.jdt.core.compiler.compliance=1.4
263 
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
 340 
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
264 
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 341 
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
265 
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
 342 
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
343 
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
(-)META-INF/MANIFEST.MF (-2 / +3 lines)
Lines 2-14 Link Here
2 
Bundle-ManifestVersion: 2
 2 
Bundle-ManifestVersion: 2
3 
Bundle-Name: %pluginName
 3 
Bundle-Name: %pluginName
4 
Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin;singleton:=true
 4 
Bundle-SymbolicName: org.eclipse.equinox.frameworkadmin;singleton:=true
5 
Bundle-Version: 1.0.200.qualifier
 5 
Bundle-Version: 2.0.0.qualifier
6 
Bundle-Vendor: %providerName
 6 
Bundle-Vendor: %providerName
7 
Bundle-Localization: plugin
 7 
Bundle-Localization: plugin
8 
Import-Package: org.eclipse.osgi.service.pluginconversion;version="1.0.0",
 8 
Import-Package: org.eclipse.osgi.service.pluginconversion;version="1.0.0",
9 
 org.eclipse.osgi.util;version="1.1.0",
 9 
 org.eclipse.osgi.util;version="1.1.0",
10 
 org.osgi.framework;version="1.3.0"
 10 
 org.osgi.framework;version="1.3.0"
11 
Export-Package: org.eclipse.equinox.internal.frameworkadmin.utils;
 11 
Export-Package: org.eclipse.equinox.frameworkadmin;version="2.0.0",
12 
 org.eclipse.equinox.internal.frameworkadmin.utils;
12 
  x-friends:="org.eclipse.equinox.frameworkadmin.equinox,
 13 
  x-friends:="org.eclipse.equinox.frameworkadmin.equinox,
13 
   org.eclipse.equinox.p2.metadata.generator,
 14 
   org.eclipse.equinox.p2.metadata.generator,
14 
   org.eclipse.equinox.p2.publisher,
 15 
   org.eclipse.equinox.p2.publisher,
(-)src/org/eclipse/equinox/frameworkadmin/BundleInfo.java (+323 lines)
Added Link Here
1 
/*******************************************************************************
2 
 * Copyright (c) 2007, 2010 IBM Corporation and others.
3 
 * All rights reserved. This program and the accompanying materials
4 
 * are made available under the terms of the Eclipse Public License v1.0
5 
 * which accompanies this distribution, and is available at
6 
 * http://www.eclipse.org/legal/epl-v10.html
7 
 *
8 
 * Contributors:
9 
 *     IBM Corporation - initial API and implementation
10 
 *******************************************************************************/
11 
package org.eclipse.equinox.frameworkadmin;
12 

            

            

              13
              
import java.net.URI;

            

            

              14
              
import org.eclipse.core.runtime.URIUtil;

            

            

              15
              
import org.osgi.framework.Version;

            

            

              16
              

            

            

              17
              
/**

            

            

              18
              
 * This object represents information of a bundle. 

            

            

              19
              
 * @since 2.0

            

            

              20
              
 */

            

            

              21
              
public class BundleInfo {

            

            

              22
              
	public static final String EMPTY_VERSION = "0.0.0"; //$NON-NLS-1$

            

            

              23
              
	public static final int NO_LEVEL = -1;

            

            

              24
              
	public static final int NO_BUNDLEID = -1;

            

            

              25
              

            

            

              26
              
	private String symbolicName = null;

            

            

              27
              
	private String version = EMPTY_VERSION;

            

            

              28
              
	private URI baseLocation = null;

            

            

              29
              
	private URI location = null;

            

            

              30
              
	private long bundleId = NO_BUNDLEID;

            

            

              31
              

            

            

              32
              
	private boolean markedAsStarted = false;

            

            

              33
              
	private int startLevel = NO_LEVEL;

            

            

              34
              
	private boolean resolved = false;

            

            

              35
              

            

            

              36
              
	private String manifest = null;

            

            

              37
              
	private String fragmentHost = null;

            

            

              38
              

            

            

              39
              
	/**

            

            

              40
              
	 * Create a new BundleInfo object

            

            

              41
              
	 */

            

            

              42
              
	public BundleInfo() {

            

            

              43
              
	}

            

            

              44
              

            

            

              45
              
	/**

            

            

              46
              
	 * Create a new BundleInfo object

            

            

              47
              
	 * @param location - the location of the bundle

            

            

              48
              
	 */

            

            

              49
              
	public BundleInfo(URI location) {

            

            

              50
              
		this.location = location;

            

            

              51
              
	}

            

            

              52
              

            

            

              53
              
	/**

            

            

              54
              
	 * Create a new BundleInfo object

            

            

              55
              
	 * @param location - the location of the bundle

            

            

              56
              
	 * @param startLevel - the start to be used or {@link BundleInfo#NO_LEVEL}

            

            

              57
              
	 * @param started - whether or not the bundle should be started

            

            

              58
              
	 */

            

            

              59
              
	public BundleInfo(URI location, int startLevel, boolean started) {

            

            

              60
              
		this.location = location;

            

            

              61
              
		this.startLevel = startLevel < 0 ? NO_LEVEL : startLevel;

            

            

              62
              
		this.markedAsStarted = started;

            

            

              63
              
	}

            

            

              64
              

            

            

              65
              
	/**

            

            

              66
              
	 * Create a new BundleInfo object

            

            

              67
              
	 * @param symbolic  The Bundle-SymbolicName name for this bundle

            

            

              68
              
	 * @param version - The version for this bundle, this must be a valid {@link Version} string, if null is passed {@link #EMPTY_VERSION} will be used instead

            

            

              69
              
	 * @param location - the location of the bundle

            

            

              70
              
	 * @param startLevel - the start level of the bundle or {@link BundleInfo#NO_LEVEL}

            

            

              71
              
	 * @param started - whether or not the bundle should be started

            

            

              72
              
	 */

            

            

              73
              
	public BundleInfo(String symbolic, String version, URI location, int startLevel, boolean started) {

            

            

              74
              
		this.symbolicName = symbolic;

            

            

              75
              
		this.version = version != null ? version : EMPTY_VERSION;

            

            

              76
              
		this.location = location;

            

            

              77
              
		this.markedAsStarted = started;

            

            

              78
              
		this.startLevel = startLevel < 0 ? NO_LEVEL : startLevel;

            

            

              79
              
	}

            

            

              80
              

            

            

              81
              
	/**

            

            

              82
              
	 * Get the bundle id

            

            

              83
              
	 * @return the bundle id or {@link #NO_BUNDLEID}

            

            

              84
              
	 */

            

            

              85
              
	public long getBundleId() {

            

            

              86
              
		return bundleId;

            

            

              87
              
	}

            

            

              88
              

            

            

              89
              
	/**

            

            

              90
              
	 * The base location

            

            

              91
              
	 * An absolute URI which may be used to resolve relative {@link #getLocation()} URIs

            

            

              92
              
	 * @return absolute URI or null if not set

            

            

              93
              
	 */

            

            

              94
              
	public URI getBaseLocation() {

            

            

              95
              
		return baseLocation;

            

            

              96
              
	}

            

            

              97
              

            

            

              98
              
	/**

            

            

              99
              
	 * The location of this bundle.

            

            

              100
              
	 * A location is required if this bundle will be persisted into a configuration file

            

            

              101
              
	 * @return URI location or null if not set

            

            

              102
              
	 */

            

            

              103
              
	public URI getLocation() {

            

            

              104
              
		return location;

            

            

              105
              
	}

            

            

              106
              

            

            

              107
              
	/**

            

            

              108
              
	 * The manifest for this bundle

            

            

              109
              
	 * @return the manifest or null if not set

            

            

              110
              
	 */

            

            

              111
              
	public String getManifest() {

            

            

              112
              
		return manifest;

            

            

              113
              
	}

            

            

              114
              

            

            

              115
              
	/**

            

            

              116
              
	 * The start level for this bundle

            

            

              117
              
	 * @return the start level or {@link #NO_LEVEL}

            

            

              118
              
	 */

            

            

              119
              
	public int getStartLevel() {

            

            

              120
              
		return startLevel;

            

            

              121
              
	}

            

            

              122
              

            

            

              123
              
	/**

            

            

              124
              
	 * The Bundle-SymbolicName for this bundle.

            

            

              125
              
	 * A symbolic name is required if this bundle will be persisted into a configuration file

            

            

              126
              
	 * @return the symbolic name or null if not set

            

            

              127
              
	 */

            

            

              128
              
	public String getSymbolicName() {

            

            

              129
              
		return symbolicName;

            

            

              130
              
	}

            

            

              131
              

            

            

              132
              
	/**

            

            

              133
              
	 * Return the version

            

            

              134
              
	 * @return an {@link Version} string, or "0.0.0" if not set 

            

            

              135
              
	 */

            

            

              136
              
	public String getVersion() {

            

            

              137
              
		if (version == null)

            

            

              138
              
			return EMPTY_VERSION;

            

            

              139
              
		return version;

            

            

              140
              
	}

            

            

              141
              

            

            

              142
              
	/**

            

            

              143
              
	 * Return the host if this bundle is a fragment

            

            

              144
              
	 * @return the host, or null if this is not a fragment

            

            

              145
              
	 */

            

            

              146
              
	public String getFragmentHost() {

            

            

              147
              
		return fragmentHost;

            

            

              148
              
	}

            

            

              149
              

            

            

              150
              
	/**

            

            

              151
              
	 * Whether or not this bundle is marked to be started

            

            

              152
              
	 * Default is false

            

            

              153
              
	 * @return boolean

            

            

              154
              
	 */

            

            

              155
              
	public boolean isMarkedAsStarted() {

            

            

              156
              
		return markedAsStarted;

            

            

              157
              
	}

            

            

              158
              

            

            

              159
              
	/**

            

            

              160
              
	 * Whether or not this bundle is resolved

            

            

              161
              
	 * Default is false

            

            

              162
              
	 * @return boolean

            

            

              163
              
	 */

            

            

              164
              
	public boolean isResolved() {

            

            

              165
              
		return resolved;

            

            

              166
              
	}

            

            

              167
              

            

            

              168
              
	/**

            

            

              169
              
	 * Set the bundle id

            

            

              170
              
	 * @param bundleId

            

            

              171
              
	 */

            

            

              172
              
	public void setBundleId(long bundleId) {

            

            

              173
              
		this.bundleId = bundleId;

            

            

              174
              
	}

            

            

              175
              

            

            

              176
              
	/**

            

            

              177
              
	 * Set a base location against which relative {@link #getLocation()} URIs may be resolved

            

            

              178
              
	 * @param baseLocation - an absolute URI

            

            

              179
              
	 */

            

            

              180
              
	public void setBaseLocation(URI baseLocation) {

            

            

              181
              
		this.baseLocation = baseLocation;

            

            

              182
              
	}

            

            

              183
              

            

            

              184
              
	/**

            

            

              185
              
	 * Set the location for this bundle.

            

            

              186
              
	 * @param location

            

            

              187
              
	 */

            

            

              188
              
	public void setLocation(URI location) {

            

            

              189
              
		this.location = location;

            

            

              190
              
	}

            

            

              191
              

            

            

              192
              
	/**

            

            

              193
              
	 * Set the manifest for this bundle

            

            

              194
              
	 * @param manifest

            

            

              195
              
	 */

            

            

              196
              
	public void setManifest(String manifest) {

            

            

              197
              
		this.manifest = manifest;

            

            

              198
              
	}

            

            

              199
              

            

            

              200
              
	/**

            

            

              201
              
	 * Set whether or not this bundle should be started

            

            

              202
              
	 * @param markedAsStarted

            

            

              203
              
	 */

            

            

              204
              
	public void setMarkedAsStarted(boolean markedAsStarted) {

            

            

              205
              
		this.markedAsStarted = markedAsStarted;

            

            

              206
              
	}

            

            

              207
              

            

            

              208
              
	/** 

            

            

              209
              
	 * Set whether or not the bundle is resolved

            

            

              210
              
	 * @param resolved

            

            

              211
              
	 */

            

            

              212
              
	public void setResolved(boolean resolved) {

            

            

              213
              
		this.resolved = resolved;

            

            

              214
              
	}

            

            

              215
              

            

            

              216
              
	/**

            

            

              217
              
	 * Set the start level.

            

            

              218
              
	 * @param level if a value < 0 is passed, the start level will be set to {@link #NO_LEVEL}

            

            

              219
              
	 */

            

            

              220
              
	public void setStartLevel(int level) {

            

            

              221
              
		this.startLevel = level < 0 ? NO_LEVEL : level;

            

            

              222
              
	}

            

            

              223
              

            

            

              224
              
	/**

            

            

              225
              
	 * Set the Bundle-SymbolicName

            

            

              226
              
	 * @param symbolicName

            

            

              227
              
	 */

            

            

              228
              
	public void setSymbolicName(String symbolicName) {

            

            

              229
              
		this.symbolicName = symbolicName;

            

            

              230
              
	}

            

            

              231
              

            

            

              232
              
	/**

            

            

              233
              
	 * Set the version, should be a valid {@link Version} string

            

            

              234
              
	 * @param value

            

            

              235
              
	 */

            

            

              236
              
	public void setVersion(String value) {

            

            

              237
              
		this.version = value;

            

            

              238
              
	}

            

            

              239
              

            

            

              240
              
	/**

            

            

              241
              
	 * Set the host if this bundle is a fragment

            

            

              242
              
	 * @param fragmentHost

            

            

              243
              
	 */

            

            

              244
              
	public void setFragmentHost(String fragmentHost) {

            

            

              245
              
		this.fragmentHost = fragmentHost;

            

            

              246
              
	}

            

            

              247
              

            

            

              248
              
	/* (non-Javadoc)

            

            

              249
              
	 * @see java.lang.Object#toString()

            

            

              250
              
	 */

            

            

              251
              
	public String toString() {

            

            

              252
              
		StringBuffer buffer = new StringBuffer();

            

            

              253
              
		buffer.append("BundleInfo("); //$NON-NLS-1$

            

            

              254
              
		if (symbolicName != null)

            

            

              255
              
			buffer.append(symbolicName);

            

            

              256
              
		buffer.append(", "); //$NON-NLS-1$

            

            

              257
              
		if (version != null)

            

            

              258
              
			buffer.append(version);

            

            

              259
              

            

            

              260
              
		if (fragmentHost != null) {

            

            

              261
              
			buffer.append(", fragmentHost="); //$NON-NLS-1$

            

            

              262
              
			buffer.append(fragmentHost);

            

            

              263
              
		}

            

            

              264
              

            

            

              265
              
		if (baseLocation != null) {

            

            

              266
              
			buffer.append(", baseLocation="); //$NON-NLS-1$

            

            

              267
              
			buffer.append(baseLocation);

            

            

              268
              
		}

            

            

              269
              
		buffer.append(", location="); //$NON-NLS-1$

            

            

              270
              
		buffer.append(location);

            

            

              271
              
		buffer.append(", startLevel="); //$NON-NLS-1$

            

            

              272
              
		buffer.append(startLevel);

            

            

              273
              
		buffer.append(", toBeStarted="); //$NON-NLS-1$

            

            

              274
              
		buffer.append(markedAsStarted);

            

            

              275
              
		buffer.append(", resolved="); //$NON-NLS-1$

            

            

              276
              
		buffer.append(resolved);

            

            

              277
              
		buffer.append(", id="); //$NON-NLS-1$

            

            

              278
              
		buffer.append(this.bundleId);//		buffer.append(',').append(manifest == null ? "no manifest" : "manifest available");

            

            

              279
              
		buffer.append(',').append(manifest == null ? "no manifest" : "manifest available"); //$NON-NLS-1$ //$NON-NLS-2$

            

            

              280
              
		buffer.append(')');

            

            

              281
              
		return buffer.toString();

            

            

              282
              
	}

            

            

              283
              

            

            

              284
              
	public int hashCode() {

            

            

              285
              
		final int prime = 31;

            

            

              286
              
		int result = 1;

            

            

              287
              
		result = prime * result + ((symbolicName == null) ? 0 : symbolicName.hashCode());

            

            

              288
              
		result = prime * result + ((version == null) ? 0 : version.hashCode());

            

            

              289
              
		return result;

            

            

              290
              
	}

            

            

              291
              

            

            

              292
              
	public boolean equals(Object obj) {

            

            

              293
              
		if (this == obj)

            

            

              294
              
			return true;

            

            

              295
              

            

            

              296
              
		if (obj == null)

            

            

              297
              
			return false;

            

            

              298
              

            

            

              299
              
		if (getClass() != obj.getClass())

            

            

              300
              
			return false;

            

            

              301
              

            

            

              302
              
		BundleInfo other = (BundleInfo) obj;

            

            

              303
              
		if (symbolicName == null) {

            

            

              304
              
			if (other.symbolicName != null)

            

            

              305
              
				return false;

            

            

              306
              
		} else if (!symbolicName.equals(other.symbolicName))

            

            

              307
              
			return false;

            

            

              308
              

            

            

              309
              
		if (version == null) {

            

            

              310
              
			if (other.version != null)

            

            

              311
              
				return false;

            

            

              312
              
		} else if (!version.equals(other.version))

            

            

              313
              
			return false;

            

            

              314
              

            

            

              315
              
		if (location == null || other.location == null)

            

            

              316
              
			return true;

            

            

              317
              

            

            

              318
              
		//compare absolute location URIs

            

            

              319
              
		URI absoluteLocation = baseLocation == null ? location : URIUtil.append(baseLocation, location.toString());

            

            

              320
              
		URI otherAbsoluteLocation = other.baseLocation == null ? other.location : URIUtil.append(other.baseLocation, other.location.toString());

            

            

              321
              
		return URIUtil.sameURI(absoluteLocation, otherAbsoluteLocation);

            

            

              322
              
	}

            

            

              323
              
}

            



(-)src/org/eclipse/equinox/internal/frameworkadmin/utils/SimpleBundlesState.java
      (-4 / +6 lines)




  

    
      
            Lines 14-19
          
      
      
        Link Here
      
    
  

        

          14
          
import java.io.IOException;

          14
          
import java.io.IOException;

        

        

          15
          
import java.net.URI;

          15
          
import java.net.URI;

        

        

          16
          
import java.util.*;

          16
          
import java.util.*;

        

            

              
              
              17
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          17
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          18
          
import org.osgi.framework.Constants;

          19
          
import org.osgi.framework.Constants;

        

        

          19
          

          20
          

        

  

    
      
            Lines 188-207
          
      
      
        Link Here
      
    
  

        

          188
          
			String manifestVersion = Utils.getManifestMainAttributes(location, Constants.BUNDLE_MANIFESTVERSION);

          189
          
			String manifestVersion = Utils.getManifestMainAttributes(location, Constants.BUNDLE_MANIFESTVERSION);

        

        

          189
          
			if (manifestVersion == null)

          190
          
			if (manifestVersion == null)

        

        

          190
          
				continue;

          191
          
				continue;

        

          
            

              191
              
			if (manifestVersion.equals("1") || manifestVersion.equals("1.0"))


              192
              
			if (manifestVersion.equals("1") || manifestVersion.equals("1.0")) //$NON-NLS-1$//$NON-NLS-2$

            

        

          192
          
				continue;

          193
          
				continue;

        

        

          193
          

          194
          

        

        

          194
          
			String fragmentHost = Utils.getManifestMainAttributes(location, Constants.FRAGMENT_HOST);

          195
          
			String fragmentHost = Utils.getManifestMainAttributes(location, Constants.FRAGMENT_HOST);

        

        

          195
          
			if (fragmentHost == null)

          196
          
			if (fragmentHost == null)

        

        

          196
          
				continue;

          197
          
				continue;

        

          
            

              197
              
			int index = fragmentHost.indexOf(";");


              198
              
			int index = fragmentHost.indexOf(";"); //$NON-NLS-1$

            

        

          198
          
			if (index == -1)

          199
          
			if (index == -1)

        

        

          199
          
				continue;

          200
          
				continue;

        

        

          200
          
			String symbolicName = fragmentHost.substring(0, index).trim();

          201
          
			String symbolicName = fragmentHost.substring(0, index).trim();

        

        

          201
          
			String parameter = fragmentHost.substring(index + 1).trim();

          202
          
			String parameter = fragmentHost.substring(index + 1).trim();

        

        

          202
          
			// TODO What to do ,in case of alias name of system bundle is not used ?

          203
          
			// TODO What to do ,in case of alias name of system bundle is not used ?

        

        

          203
          
			if (symbolicName.equals(Constants.SYSTEM_BUNDLE_SYMBOLICNAME))

          204
          
			if (symbolicName.equals(Constants.SYSTEM_BUNDLE_SYMBOLICNAME))

        

          
            

              204
              
				if (parameter.equals(Constants.EXTENSION_DIRECTIVE + ":=" + Constants.EXTENSION_FRAMEWORK)) {


              205
              
				if (parameter.equals(Constants.EXTENSION_DIRECTIVE + ":=" + Constants.EXTENSION_FRAMEWORK)) { //$NON-NLS-1$

            

        

          205
          
					list.add(location);

          206
          
					list.add(location);

        

        

          206
          
					break;

          207
          
					break;

        

        

          207
          
				}

          208
          
				}

        

  

    
      
            Lines 228-234
          
      
      
        Link Here
      
    
  

        

          228
          
			this.installBundle(bInfos[j]);

          229
          
			this.installBundle(bInfos[j]);

        

        

          229
          

          230
          

        

        

          230
          
		if (getSystemBundle() == null) {

          231
          
		if (getSystemBundle() == null) {

        

          
            

              231
              
			BundleInfo sysBInfo = new BundleInfo(launcherData.getFwJar().toURI(), 0, true, 0);


              232
              
			BundleInfo sysBInfo = new BundleInfo(launcherData.getFwJar().toURI(), 0, true);

            

            

              
              

              233
              
			sysBInfo.setBundleId(0);

            

        

          232
          
			this.installBundle(sysBInfo);

          234
          
			this.installBundle(sysBInfo);

        

        

          233
          
		}

          235
          
		}

        

        

          234
          
	}

          236
          
	}

        



(-)src/org/eclipse/equinox/internal/frameworkadmin/utils/Utils.java
      (-12 / +12 lines)




  

    
      
            Lines 18-24
          
      
      
        Link Here
      
    
  

        

          18
          
import java.util.zip.ZipEntry;

          18
          
import java.util.zip.ZipEntry;

        

        

          19
          
import java.util.zip.ZipFile;

          19
          
import java.util.zip.ZipFile;

        

        

          20
          
import org.eclipse.core.runtime.*;

          20
          
import org.eclipse.core.runtime.*;

        

          
            

              21
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;


              21
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          22
          
import org.eclipse.osgi.service.pluginconversion.PluginConversionException;

          22
          
import org.eclipse.osgi.service.pluginconversion.PluginConversionException;

        

        

          23
          
import org.eclipse.osgi.service.pluginconversion.PluginConverter;

          23
          
import org.eclipse.osgi.service.pluginconversion.PluginConverter;

        

        

          24
          
import org.eclipse.osgi.util.ManifestElement;

          24
          
import org.eclipse.osgi.util.ManifestElement;

        

  

    
      
            Lines 131-137
          
      
      
        Link Here
      
    
  

        

          131
          
	public static URL checkFullUrl(URL url, String urlName) throws IllegalArgumentException {//throws ManipulatorException {

          131
          
	public static URL checkFullUrl(URL url, String urlName) throws IllegalArgumentException {//throws ManipulatorException {

        

        

          132
          
		if (url == null)

          132
          
		if (url == null)

        

        

          133
          
			throw new IllegalArgumentException(urlName + " is null");

          133
          
			throw new IllegalArgumentException(urlName + " is null");

        

          
            

              134
              
		if (!url.getProtocol().endsWith("file"))


              134
              
		if (!url.getProtocol().endsWith("file")) //$NON-NLS-1$

            

        

          135
          
			return url;

          135
          
			return url;

        

        

          136
          
		File file = new File(url.getFile());

          136
          
		File file = new File(url.getFile());

        

        

          137
          
		if (!file.isAbsolute())

          137
          
		if (!file.isAbsolute())

        

  

    
      
            Lines 139-145
          
      
      
        Link Here
      
    
  

        

          139
          
		if (file.getAbsolutePath().startsWith(PATH_SEP))

          139
          
		if (file.getAbsolutePath().startsWith(PATH_SEP))

        

        

          140
          
			return url;

          140
          
			return url;

        

        

          141
          
		try {

          141
          
		try {

        

          
            

              142
              
			return getUrl("file", null, PATH_SEP + file.getAbsolutePath());


              142
              
			return getUrl("file", null, PATH_SEP + file.getAbsolutePath()); //$NON-NLS-1$

            

        

          143
          
		} catch (MalformedURLException e) {

          143
          
		} catch (MalformedURLException e) {

        

        

          144
          
			throw new IllegalArgumentException(urlName + "(" + "file:" + PATH_SEP + file.getAbsolutePath() + ") is not fully quallified");

          144
          
			throw new IllegalArgumentException(urlName + "(" + "file:" + PATH_SEP + file.getAbsolutePath() + ") is not fully quallified");

        

        

          145
          
		}

          145
          
		}

        

  

    
      
            Lines 190-196
          
      
      
        Link Here
      
    
  

        

          190
          
	}

          190
          
	}

        

        

          191
          

          191
          

        

        

          192
          
	public static String[] getClauses(String header) {

          192
          
	public static String[] getClauses(String header) {

        

          
            

              193
              
		StringTokenizer token = new StringTokenizer(header, ",");


              193
              
		StringTokenizer token = new StringTokenizer(header, ","); //$NON-NLS-1$

            

        

          194
          
		List list = new LinkedList();

          194
          
		List list = new LinkedList();

        

        

          195
          
		while (token.hasMoreTokens()) {

          195
          
		while (token.hasMoreTokens()) {

        

        

          196
          
			list.add(token.nextToken());

          196
          
			list.add(token.nextToken());

        

  

    
      
            Lines 219-225
          
      
      
        Link Here
      
    
  

        

          219
          
			return basicLoadManifest(URIUtil.toFile(location));

          219
          
			return basicLoadManifest(URIUtil.toFile(location));

        

        

          220
          

          220
          

        

        

          221
          
		try {

          221
          
		try {

        

          
            

              222
              
			URL url = new URL("jar:" + location.toString() + "!/");


              222
              
			URL url = new URL("jar:" + location.toString() + "!/"); //$NON-NLS-1$//$NON-NLS-2$

            

        

          223
          
			JarURLConnection jarConnection = (JarURLConnection) url.openConnection();

          223
          
			JarURLConnection jarConnection = (JarURLConnection) url.openConnection();

        

        

          224
          
			ZipFile jar = jarConnection.getJarFile();

          224
          
			ZipFile jar = jarConnection.getJarFile();

        

        

          225
          

          225
          

        

  

    
      
            Lines 296-309
          
      
      
        Link Here
      
    
  

        

          296
          
	 * 	"hogehoge.yyyyMMddHHmmss".

          296
          
	 * 	"hogehoge.yyyyMMddHHmmss".

        

        

          297
          
	 */

          297
          
	 */

        

        

          298
          
	public static File getSimpleDataFormattedFile(File file) {

          298
          
	public static File getSimpleDataFormattedFile(File file) {

        

          
            

              299
              
		SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");


              299
              
		SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss"); //$NON-NLS-1$

            

        

          300
          
		String date = df.format(new Date());

          300
          
		String date = df.format(new Date());

        

        

          301
          
		String filename = file.getName();

          301
          
		String filename = file.getName();

        

          
            

              302
              
		int index = filename.lastIndexOf(".");


              302
              
		int index = filename.lastIndexOf("."); //$NON-NLS-1$

            

        

          303
          
		if (index != -1)

          303
          
		if (index != -1)

        

          
            

              304
              
			filename = filename.substring(0, index) + "." + date + "." + filename.substring(index + 1);


              304
              
			filename = filename.substring(0, index) + "." + date + "." + filename.substring(index + 1); //$NON-NLS-1$ //$NON-NLS-2$

            

        

          305
          
		else

          305
          
		else

        

          
            

              306
              
			filename = filename + "." + date;


              306
              
			filename = filename + "." + date; //$NON-NLS-1$

            

        

          307
          
		File dest = new File(file.getParentFile(), filename);

          307
          
		File dest = new File(file.getParentFile(), filename);

        

        

          308
          
		return dest;

          308
          
		return dest;

        

        

          309
          
	}

          309
          
	}

        

  

    
      
            Lines 330-344
          
      
      
        Link Here
      
    
  

        

          330
          

          330
          

        

        

          331
          
	public static URL getUrlInFull(String path, URL from) throws MalformedURLException {//throws ManipulatorException {

          331
          
	public static URL getUrlInFull(String path, URL from) throws MalformedURLException {//throws ManipulatorException {

        

        

          332
          
		Utils.checkFullUrl(from, "from");

          332
          
		Utils.checkFullUrl(from, "from");

        

          
            

              333
              
		path = Utils.replaceAll(path, File.separator, "/");


              333
              
		path = Utils.replaceAll(path, File.separator, "/"); //$NON-NLS-1$

            

        

          334
          
		//System.out.println("from.toExternalForm()=" + from.toExternalForm());

          334
          
		//System.out.println("from.toExternalForm()=" + from.toExternalForm());

        

        

          335
          
		String fromSt = Utils.removeLastCh(from.toExternalForm(), '/');

          335
          
		String fromSt = Utils.removeLastCh(from.toExternalForm(), '/');

        

        

          336
          
		//System.out.println("fromSt=" + fromSt);

          336
          
		//System.out.println("fromSt=" + fromSt);

        

          
            

              337
              
		if (path.startsWith("/")) {


              337
              
		if (path.startsWith("/")) { //$NON-NLS-1$

            

        

          338
          
			String fileSt = from.getFile();

          338
          
			String fileSt = from.getFile();

        

        

          339
          
			return new URL(fromSt.substring(0, fromSt.lastIndexOf(fileSt) - 1) + path);

          339
          
			return new URL(fromSt.substring(0, fromSt.lastIndexOf(fileSt) - 1) + path);

        

        

          340
          
		}

          340
          
		}

        

          
            

              341
              
		return new URL(fromSt + "/" + path);


              341
              
		return new URL(fromSt + "/" + path); //$NON-NLS-1$

            

        

          342
          
	}

          342
          
	}

        

        

          343
          

          343
          

        

        

          344
          
	private static Properties manifestToProperties(Map d) {

          344
          
	private static Properties manifestToProperties(Map d) {

        



(-)src/org/eclipse/equinox/internal/provisional/configuratormanipulator/ConfiguratorManipulator.java
      (-3 / +5 lines)




  

    
      
            Lines 12-29
          
      
      
        Link Here
      
    
  

        

          12
          

          12
          

        

        

          13
          
import java.io.File;

          13
          
import java.io.File;

        

        

          14
          
import java.io.IOException;

          14
          
import java.io.IOException;

        

          
            

              15
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;


              15
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

            

              
              

              16
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin;

            

            


              17
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

            

        

          16
          

          18
          

        

        

          17
          
/**

          19
          
/**

        

        

          18
          
 * 

          20
          
 * 

        

        

          19
          
 * This interface provides methods that enable client bundles to 

          21
          
 * This interface provides methods that enable client bundles to 

        

        

          20
          
 * manipulate the corresponding ConfiguratorBundle.

          22
          
 * manipulate the corresponding ConfiguratorBundle.

        

        

          21
          
 * 

          23
          
 * 

        

          
            

              22
              
 *  @see Configurator


              24
              
 *  see org.eclipse.equinox.internal.provisional.configurator.Configurator

            

        

          23
          
 */

          25
          
 */

        

        

          24
          

          26
          

        

        

          25
          
public interface ConfiguratorManipulator {

          27
          
public interface ConfiguratorManipulator {

        

          
            

              26
              
	String SERVICE_PROP_KEY_CONFIGURATOR_BUNDLESYMBOLICNAME = "org.eclipse.equinox.configurator.BundleSymbolicName";


              28
              
	String SERVICE_PROP_KEY_CONFIGURATOR_BUNDLESYMBOLICNAME = "org.eclipse.equinox.configurator.BundleSymbolicName"; //$NON-NLS-1$

            

        

          27
          

          29
          

        

        

          28
          
	/**

          30
          
	/**

        

        

          29
          
	 * Save configuration for the corresponding Configurator Bundle so that 

          31
          
	 * Save configuration for the corresponding Configurator Bundle so that 

        



(-)src/org/eclipse/equinox/internal/provisional/configuratormanipulator/ConfiguratorManipulatorFactory.java
      (-1 / +1 lines)




  

    
      
            Lines 18-24
          
      
      
        Link Here
      
    
  

        

          18
          
 *  @see FrameworkAdmin

          18
          
 *  @see FrameworkAdmin

        

        

          19
          
 */

          19
          
 */

        

        

          20
          
public abstract class ConfiguratorManipulatorFactory {

          20
          
public abstract class ConfiguratorManipulatorFactory {

        

          
            

              21
              
	public final static String SYSTEM_PROPERTY_KEY = "org.eclipse.equinox.configuratorManipulatorFactory";


              21
              
	public final static String SYSTEM_PROPERTY_KEY = "org.eclipse.equinox.configuratorManipulatorFactory"; //$NON-NLS-1$

            

        

          22
          

          22
          

        

        

          23
          
	abstract protected ConfiguratorManipulator createConfiguratorManipulator();

          23
          
	abstract protected ConfiguratorManipulator createConfiguratorManipulator();

        

        

          24
          

          24
          

        



(-)src/org/eclipse/equinox/internal/provisional/frameworkadmin/BundleInfo.java
      (-231 lines)




  

    
      
          Removed
      
      
        Link Here
      
    
  

            

              1
              
/*******************************************************************************

            

            

              2
              
 * Copyright (c) 2007, 2009 IBM Corporation and others.

            

            

              3
              
 * All rights reserved. This program and the accompanying materials

            

            

              4
              
 * are made available under the terms of the Eclipse Public License v1.0

            

            

              5
              
 * which accompanies this distribution, and is available at

            

            

              6
              
 * http://www.eclipse.org/legal/epl-v10.html

            

            

              7
              
 *

            

            

              8
              
 * Contributors:

            

            

              9
              
 *     IBM Corporation - initial API and implementation

            

            

              10
              
 *******************************************************************************/

            

            

              11
              
package org.eclipse.equinox.internal.provisional.frameworkadmin;

            

            

              12
              

            

            

              13
              
import java.net.URI;

            

            

              14
              
import org.eclipse.core.runtime.URIUtil;

            

            

              15
              

            

            

              16
              
/**

            

            

              17
              
 * This object represents information of a bundle. This class is a copy of the BundleInfo

            

            

              18
              
 * class in org.eclipse.equinox.simpleconfigurator

            

            

              19
              
 *

            

            

              20
              
 */

            

            

              21
              
public class BundleInfo {

            

            

              22
              
	public static final int NO_LEVEL = -1;

            

            

              23
              
	public static final int NO_BUNDLEID = -1;

            

            

              24
              

            

            

              25
              
	private String symbolicName = null;

            

            

              26
              
	private String version = null;

            

            

              27
              
	private URI baseLocation;

            

            

              28
              
	private URI location;

            

            

              29
              
	private long bundleId = NO_BUNDLEID;

            

            

              30
              

            

            

              31
              
	private boolean markedAsStarted = false;

            

            

              32
              
	private int startLevel = NO_LEVEL;

            

            

              33
              
	private boolean resolved = false;

            

            

              34
              

            

            

              35
              
	private String manifest;

            

            

              36
              
	private String fragmentHost;

            

            

              37
              

            

            

              38
              
	public BundleInfo() {

            

            

              39
              
	}

            

            

              40
              

            

            

              41
              
	public BundleInfo(URI location) {

            

            

              42
              
		this.location = location;

            

            

              43
              
	}

            

            

              44
              

            

            

              45
              
	public BundleInfo(URI location, boolean started) {

            

            

              46
              
		this.location = location;

            

            

              47
              
		this.markedAsStarted = started;

            

            

              48
              
	}

            

            

              49
              

            

            

              50
              
	public BundleInfo(URI location, int startLevel) {

            

            

              51
              
		this.location = location;

            

            

              52
              
		this.startLevel = startLevel;

            

            

              53
              
	}

            

            

              54
              

            

            

              55
              
	public BundleInfo(URI location, int startLevel, boolean started) {

            

            

              56
              
		this.location = location;

            

            

              57
              
		this.startLevel = startLevel;

            

            

              58
              
		this.markedAsStarted = started;

            

            

              59
              
	}

            

            

              60
              

            

            

              61
              
	public BundleInfo(URI location, int startLevel, boolean started, long bundleId) {

            

            

              62
              
		this.location = location;

            

            

              63
              
		this.startLevel = startLevel;

            

            

              64
              
		this.markedAsStarted = started;

            

            

              65
              
		this.bundleId = bundleId;

            

            

              66
              
	}

            

            

              67
              

            

            

              68
              
	public BundleInfo(String symbolic, String version, URI location, int startLevel, boolean started) {

            

            

              69
              
		this.symbolicName = symbolic;

            

            

              70
              
		this.version = version;

            

            

              71
              
		this.location = location;

            

            

              72
              
		this.markedAsStarted = started;

            

            

              73
              
		this.startLevel = startLevel;

            

            

              74
              
	}

            

            

              75
              

            

            

              76
              
	public long getBundleId() {

            

            

              77
              
		return bundleId;

            

            

              78
              
	}

            

            

              79
              

            

            

              80
              
	public URI getBaseLocation() {

            

            

              81
              
		return baseLocation;

            

            

              82
              
	}

            

            

              83
              

            

            

              84
              
	public URI getLocation() {

            

            

              85
              
		return location;

            

            

              86
              
	}

            

            

              87
              

            

            

              88
              
	public String getManifest() {

            

            

              89
              
		return manifest;

            

            

              90
              
	}

            

            

              91
              

            

            

              92
              
	public int getStartLevel() {

            

            

              93
              
		return startLevel;

            

            

              94
              
	}

            

            

              95
              

            

            

              96
              
	public String getSymbolicName() {

            

            

              97
              
		return symbolicName;

            

            

              98
              
	}

            

            

              99
              

            

            

              100
              
	public String getVersion() {

            

            

              101
              
		return version;

            

            

              102
              
	}

            

            

              103
              

            

            

              104
              
	public String getFragmentHost() {

            

            

              105
              
		return fragmentHost;

            

            

              106
              
	}

            

            

              107
              

            

            

              108
              
	public boolean isMarkedAsStarted() {

            

            

              109
              
		return markedAsStarted;

            

            

              110
              
	}

            

            

              111
              

            

            

              112
              
	public boolean isResolved() {

            

            

              113
              
		return resolved;

            

            

              114
              
	}

            

            

              115
              

            

            

              116
              
	public void setBundleId(long bundleId) {

            

            

              117
              
		this.bundleId = bundleId;

            

            

              118
              
	}

            

            

              119
              

            

            

              120
              
	public void setBaseLocation(URI baseLocation) {

            

            

              121
              
		this.baseLocation = baseLocation;

            

            

              122
              
	}

            

            

              123
              

            

            

              124
              
	public void setLocation(URI location) {

            

            

              125
              
		this.location = location;

            

            

              126
              
	}

            

            

              127
              

            

            

              128
              
	public void setManifest(String manifest) {

            

            

              129
              
		this.manifest = manifest;

            

            

              130
              
	}

            

            

              131
              

            

            

              132
              
	public void setMarkedAsStarted(boolean markedAsStarted) {

            

            

              133
              
		this.markedAsStarted = markedAsStarted;

            

            

              134
              
	}

            

            

              135
              

            

            

              136
              
	public void setResolved(boolean resolved) {

            

            

              137
              
		this.resolved = resolved;

            

            

              138
              
	}

            

            

              139
              

            

            

              140
              
	public void setStartLevel(int level) {

            

            

              141
              
		this.startLevel = level;

            

            

              142
              
	}

            

            

              143
              

            

            

              144
              
	public void setSymbolicName(String symbolicName) {

            

            

              145
              
		this.symbolicName = symbolicName;

            

            

              146
              
	}

            

            

              147
              

            

            

              148
              
	public void setVersion(String value) {

            

            

              149
              
		this.version = value;

            

            

              150
              
	}

            

            

              151
              

            

            

              152
              
	public void setFragmentHost(String fragmentHost) {

            

            

              153
              
		this.fragmentHost = fragmentHost;

            

            

              154
              
	}

            

            

              155
              

            

            

              156
              
	/* (non-Javadoc)

            

            

              157
              
	 * @see java.lang.Object#toString()

            

            

              158
              
	 */

            

            

              159
              
	public String toString() {

            

            

              160
              
		StringBuffer buffer = new StringBuffer();

            

            

              161
              
		buffer.append("BundleInfo("); //$NON-NLS-1$

            

            

              162
              
		if (symbolicName != null)

            

            

              163
              
			buffer.append(symbolicName);

            

            

              164
              
		buffer.append(", "); //$NON-NLS-1$

            

            

              165
              
		if (version != null)

            

            

              166
              
			buffer.append(version);

            

            

              167
              

            

            

              168
              
		if (fragmentHost != null) {

            

            

              169
              
			buffer.append(", fragmentHost="); //$NON-NLA-1$

            

            

              170
              
			buffer.append(fragmentHost);

            

            

              171
              
		}

            

            

              172
              

            

            

              173
              
		if (baseLocation != null) {

            

            

              174
              
			buffer.append(", baseLocation="); //$NON-NLS-1$

            

            

              175
              
			buffer.append(baseLocation);

            

            

              176
              
		}

            

            

              177
              
		buffer.append(", location="); //$NON-NLS-1$

            

            

              178
              
		buffer.append(location);

            

            

              179
              
		buffer.append(", startLevel="); //$NON-NLS-1$

            

            

              180
              
		buffer.append(startLevel);

            

            

              181
              
		buffer.append(", toBeStarted="); //$NON-NLS-1$

            

            

              182
              
		buffer.append(markedAsStarted);

            

            

              183
              
		buffer.append(", resolved="); //$NON-NLS-1$

            

            

              184
              
		buffer.append(resolved);

            

            

              185
              
		buffer.append(", id="); //$NON-NLS-1$

            

            

              186
              
		buffer.append(this.bundleId);//		buffer.append(',').append(manifest == null ? "no manifest" : "manifest available");

            

            

              187
              
		buffer.append(',').append(manifest == null ? "no manifest" : "manifest available"); //$NON-NLS-1$ //$NON-NLS-2$

            

            

              188
              
		buffer.append(')');

            

            

              189
              
		return buffer.toString();

            

            

              190
              
	}

            

            

              191
              

            

            

              192
              
	public int hashCode() {

            

            

              193
              
		final int prime = 31;

            

            

              194
              
		int result = 1;

            

            

              195
              
		result = prime * result + ((symbolicName == null) ? 0 : symbolicName.hashCode());

            

            

              196
              
		result = prime * result + ((version == null) ? 0 : version.hashCode());

            

            

              197
              
		return result;

            

            

              198
              
	}

            

            

              199
              

            

            

              200
              
	public boolean equals(Object obj) {

            

            

              201
              
		if (this == obj)

            

            

              202
              
			return true;

            

            

              203
              

            

            

              204
              
		if (obj == null)

            

            

              205
              
			return false;

            

            

              206
              

            

            

              207
              
		if (getClass() != obj.getClass())

            

            

              208
              
			return false;

            

            

              209
              

            

            

              210
              
		BundleInfo other = (BundleInfo) obj;

            

            

              211
              
		if (symbolicName == null) {

            

            

              212
              
			if (other.symbolicName != null)

            

            

              213
              
				return false;

            

            

              214
              
		} else if (!symbolicName.equals(other.symbolicName))

            

            

              215
              
			return false;

            

            

              216
              

            

            

              217
              
		if (version == null) {

            

            

              218
              
			if (other.version != null)

            

            

              219
              
				return false;

            

            

              220
              
		} else if (!version.equals(other.version))

            

            

              221
              
			return false;

            

            

              222
              

            

            

              223
              
		if (location == null || other.location == null)

            

            

              224
              
			return true;

            

            

              225
              

            

            

              226
              
		//compare absolute location URIs

            

            

              227
              
		URI absoluteLocation = baseLocation == null ? location : URIUtil.append(baseLocation, location.toString());

            

            

              228
              
		URI otherAbsoluteLocation = other.baseLocation == null ? other.location : URIUtil.append(other.baseLocation, other.location.toString());

            

            

              229
              
		return URIUtil.sameURI(absoluteLocation, otherAbsoluteLocation);

            

            

              230
              
	}

            

            

              231
              
}

            



(-)src/org/eclipse/equinox/internal/provisional/frameworkadmin/BundlesState.java
      (-8 / +10 lines)




  

    
      
            Lines 10-15
          
      
      
        Link Here
      
    
  

        

          10
          
 *******************************************************************************/

          10
          
 *******************************************************************************/

        

        

          11
          
package org.eclipse.equinox.internal.provisional.frameworkadmin;

          11
          
package org.eclipse.equinox.internal.provisional.frameworkadmin;

        

        

          12
          

          12
          

        

            

              
              
              13
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

            

              14
              

            

        

          13
          
/**

          15
          
/**

        

        

          14
          
 * This API is used for expecting bundles state virtually.

          16
          
 * This API is used for expecting bundles state virtually.

        

        

          15
          
 * 

          17
          
 * 

        

  

    
      
            Lines 66-79
          
      
      
        Link Here
      
    
  

        

          66
          
	 * to resolve the specified bInfo under the state currently composed.  

          68
          
	 * to resolve the specified bInfo under the state currently composed.  

        

        

          67
          
	 * 

          69
          
	 * 

        

        

          68
          
	 * If this implementation doesn't support resolving state,

          70
          
	 * If this implementation doesn't support resolving state,

        

          
            

              69
              
	 * FrameworkAdminRuntimeException with a cause of {@value FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}


              71
              
	 * FrameworkAdminRuntimeException with a cause of {@link FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}

            

        

          70
          
	 * will be thrown.

          72
          
	 * will be thrown.

        

        

          71
          
	 * 

          73
          
	 * 

        

        

          72
          
	 * XXX this method is prepared mainly for debugging. 

          74
          
	 * XXX this method is prepared mainly for debugging. 

        

        

          73
          
	 * 

          75
          
	 * 

        

        

          74
          
	 * @param bInfo

          76
          
	 * @param bInfo

        

        

          75
          
	 * @return array of Strings which tells the unsatisfied constaints.

          77
          
	 * @return array of Strings which tells the unsatisfied constaints.

        

          
            

              76
              
	 * @throws FrameworkAdminRuntimeException if this implementation doesn't support resolving state, FrameworkAdminRuntimeException with a cause of {@value FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}  will be thrown.


              78
              
	 * @throws FrameworkAdminRuntimeException if this implementation doesn't support resolving state, FrameworkAdminRuntimeException with a cause of {@link FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}  will be thrown.

            

        

          77
          
	 */

          79
          
	 */

        

        

          78
          
	public String[] getUnsatisfiedConstraints(BundleInfo bInfo) throws FrameworkAdminRuntimeException;

          80
          
	public String[] getUnsatisfiedConstraints(BundleInfo bInfo) throws FrameworkAdminRuntimeException;

        

        

          79
          

          81
          

        

  

    
      
            Lines 99-109
          
      
      
        Link Here
      
    
  

        

          99
          
	 * Otherwise false. 

          101
          
	 * Otherwise false. 

        

        

          100
          
	 * 

          102
          
	 * 

        

        

          101
          
	 * If this implementation doesn't support resolving state,

          103
          
	 * If this implementation doesn't support resolving state,

        

          
            

              102
              
	 * FrameworkAdminRuntimeException with a cause of {@value FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}


              104
              
	 * FrameworkAdminRuntimeException with a cause of {@link FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}

            

        

          103
          
	 * will be thrown.

          105
          
	 * will be thrown.

        

        

          104
          
	 * 

          106
          
	 * 

        

        

          105
          
	 * @return true if the state currently composed is resolved after the last change of the state. Otherwise false. 

          107
          
	 * @return true if the state currently composed is resolved after the last change of the state. Otherwise false. 

        

          
            

              106
              
	 * @throws FrameworkAdminRuntimeException if this implementation doesn't support resolving state, FrameworkAdminRuntimeException with a cause of {@value FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}  will be thrown.


              108
              
	 * @throws FrameworkAdminRuntimeException if this implementation doesn't support resolving state, FrameworkAdminRuntimeException with a cause of {@link FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}  will be thrown.

            

        

          107
          
	 */

          109
          
	 */

        

        

          108
          
	public boolean isResolved() throws FrameworkAdminRuntimeException;

          110
          
	public boolean isResolved() throws FrameworkAdminRuntimeException;

        

        

          109
          

          111
          

        

  

    
      
            Lines 112-122
          
      
      
        Link Here
      
    
  

        

          112
          
	 * Otherwise false. 

          114
          
	 * Otherwise false. 

        

        

          113
          
	 * 

          115
          
	 * 

        

        

          114
          
	 * If this implementation doesn't support resolving state,

          116
          
	 * If this implementation doesn't support resolving state,

        

          
            

              115
              
	 * FwLauncherException with a cause of {@value FwLauncherException#UNSUPPORTED_OPERATION}


              117
              
	 * FwLauncherException with a cause of {@link FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}

            

        

          116
          
	 * will be thrown.

          118
          
	 * will be thrown.

        

        

          117
          
	 * 

          119
          
	 * 

        

        

          118
          
	 * @return true if the specified bundle is resolved. Otherwise false. 

          120
          
	 * @return true if the specified bundle is resolved. Otherwise false. 

        

          
            

              119
              
	 * @throws FrameworkAdminRuntimeException if this implementation doesn't support resolving state, FrameworkAdminRuntimeException with a cause of {@value FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}  will be thrown.


              121
              
	 * @throws FrameworkAdminRuntimeException if this implementation doesn't support resolving state, FrameworkAdminRuntimeException with a cause of {@link FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}  will be thrown.

            

        

          120
          
	 */

          122
          
	 */

        

        

          121
          
	public boolean isResolved(BundleInfo bInfo) throws FrameworkAdminRuntimeException;

          123
          
	public boolean isResolved(BundleInfo bInfo) throws FrameworkAdminRuntimeException;

        

        

          122
          

          124
          

        

  

    
      
            Lines 124-130
          
      
      
        Link Here
      
    
  

        

          124
          
	 * Resolves the constraints contained in this state.

          126
          
	 * Resolves the constraints contained in this state.

        

        

          125
          
	 * 

          127
          
	 * 

        

        

          126
          
	 * If this implementation doesn't support resolving state,

          128
          
	 * If this implementation doesn't support resolving state,

        

          
            

              127
              
	 * FrameworkAdminRuntimeException with a cause of {@value FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}


              129
              
	 * FrameworkAdminRuntimeException with a cause of {@link FrameworkAdminRuntimeException#UNSUPPORTED_OPERATION}

            

        

          128
          
	 * will be thrown.

          130
          
	 * will be thrown.

        

        

          129
          
	 * 	 

          131
          
	 * 	 

        

        

          130
          
	 * @param incremental a flag controlling whether resolution should be incremental

          132
          
	 * @param incremental a flag controlling whether resolution should be incremental

        

  

    
      
            Lines 138-142
          
      
      
        Link Here
      
    
  

        

          138
          
	 * @param bInfo BundleInfo to be uninstalled

          140
          
	 * @param bInfo BundleInfo to be uninstalled

        

        

          139
          
	 * @throws FrameworkAdminRuntimeException - If the {@link FrameworkAdmin} service created the parent {@link Manipulator} is unregistered. 

          141
          
	 * @throws FrameworkAdminRuntimeException - If the {@link FrameworkAdmin} service created the parent {@link Manipulator} is unregistered. 

        

        

          140
          
	 */

          142
          
	 */

        

          
            

              141
              
	void uninstallBundle(BundleInfo bInfo) throws FrameworkAdminRuntimeException;;


              143
              
	void uninstallBundle(BundleInfo bInfo) throws FrameworkAdminRuntimeException;

            

        

          142
          
}

          144
          
}

        



(-)src/org/eclipse/equinox/internal/provisional/frameworkadmin/ConfigData.java
      (-4 / +5 lines)




  

    
      
            Lines 12-17
          
      
      
        Link Here
      
    
  

        

          12
          
package org.eclipse.equinox.internal.provisional.frameworkadmin;

          12
          
package org.eclipse.equinox.internal.provisional.frameworkadmin;

        

        

          13
          

          13
          

        

        

          14
          
import java.util.*;

          14
          
import java.util.*;

        

            

              
              
              15
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          15
          

          16
          

        

        

          16
          
/**

          17
          
/**

        

        

          17
          
 * This object is instantiated by {@link Manipulator#getConfigData()};

          18
          
 * This object is instantiated by {@link Manipulator#getConfigData()};

        

  

    
      
            Lines 161-175
          
      
      
        Link Here
      
    
  

        

          161
          

          162
          

        

        

          162
          
	private static void setPropsStrings(StringBuffer sb, Properties props) {

          163
          
	private static void setPropsStrings(StringBuffer sb, Properties props) {

        

        

          163
          
		if (props.size() > 0) {

          164
          
		if (props.size() > 0) {

        

          
            

              164
              
			sb.append("\n");


              165
              
			sb.append("\n"); //$NON-NLS-1$

            

        

          165
          
			for (Enumeration enumeration = props.keys(); enumeration.hasMoreElements();) {

          166
          
			for (Enumeration enumeration = props.keys(); enumeration.hasMoreElements();) {

        

        

          166
          
				String key = (String) enumeration.nextElement();

          167
          
				String key = (String) enumeration.nextElement();

        

        

          167
          
				String value = props.getProperty(key);

          168
          
				String value = props.getProperty(key);

        

          
            

              168
              
				if (value == null || value.equals(""))


              169
              
				if (value == null || value.equals("")) //$NON-NLS-1$

            

        

          169
          
					continue;

          170
          
					continue;

        

          
            

              170
              
				sb.append("\t{" + key + " ,\t" + value + "}\n");


              171
              
				sb.append("\t{" + key + " ,\t" + value + "}\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

            

        

          171
          
			}

          172
          
			}

        

        

          172
          
		} else

          173
          
		} else

        

          
            

              173
              
			sb.append("empty\n");


              174
              
			sb.append("empty\n"); //$NON-NLS-1$

            

        

          174
          
	}

          175
          
	}

        

        

          175
          
}

          176
          
}

        



(-)src/org/eclipse/equinox/internal/provisional/frameworkadmin/FrameworkAdmin.java
      (-5 / +5 lines)




  

    
      
            Lines 65-76
          
      
      
        Link Here
      
    
  

        

          65
          
 */

          65
          
 */

        

        

          66
          
public interface FrameworkAdmin {

          66
          
public interface FrameworkAdmin {

        

        

          67
          

          67
          

        

          
            

              68
              
	String SERVICE_PROP_KEY_FW_NAME = "org.eclipse.equinox.frameworkhandler.framework.name";


              68
              
	String SERVICE_PROP_KEY_FW_NAME = "org.eclipse.equinox.frameworkhandler.framework.name"; //$NON-NLS-1$

            

            

              69
              
	String SERVICE_PROP_KEY_FW_VERSION = "org.eclipse.equinox.frameworkhandler.framework.version";


              69
              
	String SERVICE_PROP_KEY_FW_VERSION = "org.eclipse.equinox.frameworkhandler.framework.version"; //$NON-NLS-1$

            

        

          70
          

          70
          

        

          
            

              71
              
	String SERVICE_PROP_KEY_LAUNCHER_NAME = "org.eclipse.equinox.frameworkhandler.launcher.name";


              71
              
	String SERVICE_PROP_KEY_LAUNCHER_NAME = "org.eclipse.equinox.frameworkhandler.launcher.name"; //$NON-NLS-1$

            

            

              72
              
	String SERVICE_PROP_KEY_LAUNCHER_VERSION = "org.eclipse.equinox.frameworkhandler.launcher.version";


              72
              
	String SERVICE_PROP_KEY_LAUNCHER_VERSION = "org.eclipse.equinox.frameworkhandler.launcher.version"; //$NON-NLS-1$

            

            

              73
              
	String SERVICE_PROP_KEY_RUNNING_SYSTEM_FLAG = "org.eclipse.equinox.frameworkhandler.runningfwflag";


              73
              
	String SERVICE_PROP_KEY_RUNNING_SYSTEM_FLAG = "org.eclipse.equinox.frameworkhandler.runningfwflag"; //$NON-NLS-1$

            

        

          74
          

          74
          

        

        

          75
          
	/**

          75
          
	/**

        

        

          76
          
	 * Create new instance of {@link Manipulator} and return it.

          76
          
	 * Create new instance of {@link Manipulator} and return it.

        



(-)src/org/eclipse/equinox/internal/provisional/frameworkadmin/LauncherData.java
      (-20 / +20 lines)




  

    
      
            Lines 143-149
          
      
      
        Link Here
      
    
  

        

          143
          
		// backwards compatibility we remove all program args until the 

          143
          
		// backwards compatibility we remove all program args until the 

        

        

          144
          
		// next program arg key 

          144
          
		// next program arg key 

        

        

          145
          
		// (see bug 253862)

          145
          
		// (see bug 253862)

        

          
            

              146
              
		if (!arg.startsWith("-"))


              146
              
		if (!arg.startsWith("-")) //$NON-NLS-1$

            

        

          147
          
			return;

          147
          
			return;

        

        

          148
          

          148
          

        

        

          149
          
		int index = programArgs.indexOf(arg);

          149
          
		int index = programArgs.indexOf(arg);

        

  

    
      
            Lines 216-252
          
      
      
        Link Here
      
    
  

        

          216
          

          216
          

        

        

          217
          
	public String toString() {

          217
          
	public String toString() {

        

        

          218
          
		StringBuffer sb = new StringBuffer();

          218
          
		StringBuffer sb = new StringBuffer();

        

          
            

              219
              
		sb.append("Class:" + this.getClass().getName() + "\n");


              219
              
		sb.append("Class:" + this.getClass().getName() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

            

              220
              
		sb.append("fwName=" + this.fwName + "\n");


              220
              
		sb.append("fwName=" + this.fwName + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

            

              221
              
		sb.append("fwVersion=" + this.fwVersion + "\n");


              221
              
		sb.append("fwVersion=" + this.fwVersion + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

            

              222
              
		sb.append("launcherName=" + this.launcherName + "\n");


              222
              
		sb.append("launcherName=" + this.launcherName + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

            

              223
              
		sb.append("launcherVersion=" + this.launcherVersion + "\n");


              223
              
		sb.append("launcherVersion=" + this.launcherVersion + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

        

          224
          

          224
          

        

          
            

              225
              
		sb.append("jvm=" + this.jvm + "\n");


              225
              
		sb.append("jvm=" + this.jvm + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

        

          226
          
		if (this.jvmArgs.size() == 0)

          226
          
		if (this.jvmArgs.size() == 0)

        

          
            

              227
              
			sb.append("jvmArgs = null\n");


              227
              
			sb.append("jvmArgs = null\n"); //$NON-NLS-1$

            

        

          228
          
		else {

          228
          
		else {

        

          
            

              229
              
			sb.append("jvmArgs=\n");


              229
              
			sb.append("jvmArgs=\n"); //$NON-NLS-1$

            

        

          230
          
			int i = 0;

          230
          
			int i = 0;

        

        

          231
          
			for (Iterator iterator = jvmArgs.iterator(); iterator.hasNext(); iterator.next())

          231
          
			for (Iterator iterator = jvmArgs.iterator(); iterator.hasNext(); iterator.next())

        

          
            

              232
              
				sb.append("\tjvmArgs[" + i++ + "]=" + iterator + "\n");


              232
              
				sb.append("\tjvmArgs[" + i++ + "]=" + iterator + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

            

        

          233
          

          233
          

        

        

          234
          
		}

          234
          
		}

        

        

          235
          
		if (this.programArgs.size() == 0)

          235
          
		if (this.programArgs.size() == 0)

        

          
            

              236
              
			sb.append("programArgs = null\n");


              236
              
			sb.append("programArgs = null\n"); //$NON-NLS-1$

            

        

          237
          
		else {

          237
          
		else {

        

          
            

              238
              
			sb.append("programArgs=\n");


              238
              
			sb.append("programArgs=\n"); //$NON-NLS-1$

            

        

          239
          
			int i = 0;

          239
          
			int i = 0;

        

        

          240
          
			for (Iterator iterator = programArgs.iterator(); iterator.hasNext(); iterator.next())

          240
          
			for (Iterator iterator = programArgs.iterator(); iterator.hasNext(); iterator.next())

        

          
            

              241
              
				sb.append("\tprogramArgs[" + i++ + "]=" + iterator + "\n");


              241
              
				sb.append("\tprogramArgs[" + i++ + "]=" + iterator + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

            

        

          242
          
		}

          242
          
		}

        

          
            

              243
              
		sb.append("fwConfigLocation=" + this.fwConfigLocation + "\n");


              243
              
		sb.append("fwConfigLocation=" + this.fwConfigLocation + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

            

              244
              
		sb.append("fwJar=" + this.fwJar + "\n");


              244
              
		sb.append("fwJar=" + this.fwJar + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

            

              245
              
		sb.append("fwPersistentDataLocation=" + this.fwPersistentDataLocation + "\n");


              245
              
		sb.append("fwPersistentDataLocation=" + this.fwPersistentDataLocation + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

            

              246
              
		sb.append("home=" + this.home + "\n");


              246
              
		sb.append("home=" + this.home + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

            

              247
              
		sb.append("launcher=" + this.launcher + "\n");


              247
              
		sb.append("launcher=" + this.launcher + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

            

              248
              
		sb.append("launcherConfigLocation=" + this.launcherConfigLocation + "\n");


              248
              
		sb.append("launcherConfigLocation=" + this.launcherConfigLocation + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

            

              249
              
		sb.append("clean=" + this.isClean() + "\n");


              249
              
		sb.append("clean=" + this.isClean() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

            

        

          250
          

          250
          

        

        

          251
          
		return sb.toString();

          251
          
		return sb.toString();

        

        

          252
          
	}

          252
          
	}

        



(-)src/org/eclipse/equinox/internal/provisional/frameworkadmin/Manipulator.java
      (-1 / +2 lines)




  

    
      
            Lines 12-17
          
      
      
        Link Here
      
    
  

        

          12
          

          12
          

        

        

          13
          
import java.io.File;

          13
          
import java.io.File;

        

        

          14
          
import java.io.IOException;

          14
          
import java.io.IOException;

        

            

              
              
              15
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          15
          
import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;

          16
          
import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;

        

        

          16
          

          17
          

        

        

          17
          
/**

          18
          
/**

        

  

    
      
            Lines 113-119
          
      
      
        Link Here
      
    
  

        

          113
          
	 * 

          114
          
	 * 

        

        

          114
          
	 * This method will check last modified time of all launcher configuration file, framework configuration file,

          115
          
	 * This method will check last modified time of all launcher configuration file, framework configuration file,

        

        

          115
          
	 * and framework persistent storage according to the parameters set.

          116
          
	 * and framework persistent storage according to the parameters set.

        

          
            

              116
              
	 * @return


              117
              
	 * @return long

            

        

          117
          
	 */

          118
          
	 */

        

        

          118
          
	long getTimeStamp();

          119
          
	long getTimeStamp();

        

        

          119
          

          120
          

        



(-)META-INF/MANIFEST.MF
      (-1 / +2 lines)




  

    
      
            Lines 6-11
          
      
      
        Link Here
      
    
  

        

          6
          
Bundle-Vendor: %providerName

          6
          
Bundle-Vendor: %providerName

        

        

          7
          
Bundle-Localization: plugin

          7
          
Bundle-Localization: plugin

        

        

          8
          
Import-Package: org.eclipse.core.runtime.internal.adaptor,

          8
          
Import-Package: org.eclipse.core.runtime.internal.adaptor,

        

            

              
              
              9
              
 org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",

            

        

          9
          
 org.eclipse.equinox.internal.frameworkadmin.utils,

          10
          
 org.eclipse.equinox.internal.frameworkadmin.utils,

        

        

          10
          
 org.eclipse.equinox.internal.provisional.configuratormanipulator,

          11
          
 org.eclipse.equinox.internal.provisional.configuratormanipulator,

        

        

          11
          
 org.eclipse.equinox.internal.provisional.frameworkadmin,

          12
          
 org.eclipse.equinox.internal.provisional.frameworkadmin,

        

  

    
      
            Lines 18-24
          
      
      
        Link Here
      
    
  

        

          18
          
 org.osgi.service.log;version="1.3.0",

          19
          
 org.osgi.service.log;version="1.3.0",

        

        

          19
          
 org.osgi.service.startlevel;version="1.0.0",

          20
          
 org.osgi.service.startlevel;version="1.0.0",

        

        

          20
          
 org.osgi.util.tracker;version="1.3.0"

          21
          
 org.osgi.util.tracker;version="1.3.0"

        

          
            

              21
              
Export-Package: org.eclipse.equinox.internal.frameworkadmin.equinox;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.metadata.generator",


              22
              
Export-Package: org.eclipse.equinox.internal.frameworkadmin.equinox;x-friends:="org.eclipse.equinox.p2.publisher,org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.simpleconfigurator.manipulator",

            

        

          22
          
 org.eclipse.equinox.internal.frameworkadmin.equinox.utils;x-internal:=true

          23
          
 org.eclipse.equinox.internal.frameworkadmin.equinox.utils;x-internal:=true

        

        

          23
          
Require-Bundle: org.eclipse.equinox.common

          24
          
Require-Bundle: org.eclipse.equinox.common

        

        

          24
          
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,

          25
          
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,

        



(-)src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java
      (+1 lines)




  

    
      
            Lines 15-20
          
      
      
        Link Here
      
    
  

        

          15
          
import java.net.URISyntaxException;

          15
          
import java.net.URISyntaxException;

        

        

          16
          
import java.util.*;

          16
          
import java.util.*;

        

        

          17
          
import org.eclipse.core.runtime.internal.adaptor.EclipseEnvironmentInfo;

          17
          
import org.eclipse.core.runtime.internal.adaptor.EclipseEnvironmentInfo;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils;

          19
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils;

        

        

          19
          
import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState;

          20
          
import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState;

        

        

          20
          
import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;

          21
          
import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;

        



(-)src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwConfigFileParser.java
      (+1 lines)




  

    
      
            Lines 14-19
          
      
      
        Link Here
      
    
  

        

          14
          
import java.net.*;

          14
          
import java.net.*;

        

        

          15
          
import java.util.*;

          15
          
import java.util.*;

        

        

          16
          
import org.eclipse.core.runtime.URIUtil;

          16
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              17
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          17
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils;

          18
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils;

        

        

          18
          
import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;

          19
          
import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;

        

        

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          20
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        



(-)src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxManipulatorImpl.java
      (+1 lines)




  

    
      
            Lines 15-20
          
      
      
        Link Here
      
    
  

        

          15
          
import java.net.*;

          15
          
import java.net.*;

        

        

          16
          
import java.util.*;

          16
          
import java.util.*;

        

        

          17
          
import org.eclipse.core.runtime.*;

          17
          
import org.eclipse.core.runtime.*;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState;

          19
          
import org.eclipse.equinox.internal.frameworkadmin.utils.SimpleBundlesState;

        

        

          19
          
import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;

          20
          
import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;

        

        

          20
          
import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;

          21
          
import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/AbstractFwkAdminTest.java
      (+1 lines)




  

    
      
            Lines 17-22
          
      
      
        Link Here
      
    
  

        

          17
          
import java.util.Properties;

          17
          
import java.util.Properties;

        

        

          18
          
import junit.framework.TestCase;

          18
          
import junit.framework.TestCase;

        

        

          19
          
import org.eclipse.core.runtime.*;

          19
          
import org.eclipse.core.runtime.*;

        

            

              
              
              20
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          20
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.ParserUtils;

          21
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.ParserUtils;

        

        

          21
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils;

          22
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.utils.FileUtils;

        

        

          22
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          23
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/Bug196525.java
      (+1 lines)




  

    
      
            Lines 15-20
          
      
      
        Link Here
      
    
  

        

          15
          
import java.net.URISyntaxException;

          15
          
import java.net.URISyntaxException;

        

        

          16
          
import org.eclipse.core.runtime.FileLocator;

          16
          
import org.eclipse.core.runtime.FileLocator;

        

        

          17
          
import org.eclipse.core.runtime.URIUtil;

          17
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          19
          
import org.osgi.framework.BundleException;

          20
          
import org.osgi.framework.BundleException;

        

        

          20
          

          21
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/Bug258370.java
      (+1 lines)




  

    
      
            Lines 15-20
          
      
      
        Link Here
      
    
  

        

          15
          
import java.net.URISyntaxException;

          15
          
import java.net.URISyntaxException;

        

        

          16
          
import org.eclipse.core.runtime.FileLocator;

          16
          
import org.eclipse.core.runtime.FileLocator;

        

        

          17
          
import org.eclipse.core.runtime.URIUtil;

          17
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          19
          
import org.osgi.framework.BundleException;

          20
          
import org.osgi.framework.BundleException;

        

        

          20
          

          21
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/CleanupTest.java
      (-2 / +2 lines)




  

    
      
            Lines 15-21
          
      
      
        Link Here
      
    
  

        

          15
          
import java.net.URISyntaxException;

          15
          
import java.net.URISyntaxException;

        

        

          16
          
import org.eclipse.core.runtime.FileLocator;

          16
          
import org.eclipse.core.runtime.FileLocator;

        

        

          17
          
import org.eclipse.core.runtime.URIUtil;

          17
          
import org.eclipse.core.runtime.URIUtil;

        

          
            

              18
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;


              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

        

        

          20
          

          20
          

        

        

          21
          
public class CleanupTest extends FwkAdminAndSimpleConfiguratorTest {

          21
          
public class CleanupTest extends FwkAdminAndSimpleConfiguratorTest {

        

  

    
      
            Lines 90-96
          
      
      
        Link Here
      
    
  

        

          90
          
	}

          90
          
	}

        

        

          91
          

          91
          

        

        

          92
          
	public void testWithMutipleBundles() throws IOException, URISyntaxException {

          92
          
	public void testWithMutipleBundles() throws IOException, URISyntaxException {

        

          
            

              93
              
		BundleInfo bi = new BundleInfo(URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1"))), 2);


              93
              
		BundleInfo bi = new BundleInfo(URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1"))), 2, false);

            

        

          94
          
		m.getConfigData().addBundle(bi);

          94
          
		m.getConfigData().addBundle(bi);

        

        

          95
          
		m.save(false);

          95
          
		m.save(false);

        

        

          96
          

          96
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/FrameworkExtensionTest.java
      (-1 / +1 lines)




  

    
      
            Lines 12-18
          
      
      
        Link Here
      
    
  

        

          12
          

          12
          

        

        

          13
          
import org.eclipse.core.runtime.FileLocator;

          13
          
import org.eclipse.core.runtime.FileLocator;

        

        

          14
          
import org.eclipse.core.runtime.URIUtil;

          14
          
import org.eclipse.core.runtime.URIUtil;

        

          
            

              15
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;


              15
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          16
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

          16
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

        

        

          17
          
import org.osgi.framework.Constants;

          17
          
import org.osgi.framework.Constants;

        

        

          18
          

          18
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/FwkAdminAndSimpleConfiguratorTest.java
      (+1 lines)




  

    
      
            Lines 14-19
          
      
      
        Link Here
      
    
  

        

          14
          
import java.io.IOException;

          14
          
import java.io.IOException;

        

        

          15
          
import org.eclipse.core.runtime.FileLocator;

          15
          
import org.eclipse.core.runtime.FileLocator;

        

        

          16
          
import org.eclipse.core.runtime.URIUtil;

          16
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              17
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          17
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          18
          
import org.osgi.framework.BundleException;

          19
          
import org.osgi.framework.BundleException;

        

        

          19
          

          20
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/LauncherConfigLocationTest.java
      (+1 lines)




  

    
      
            Lines 15-20
          
      
      
        Link Here
      
    
  

        

          15
          
import java.net.URISyntaxException;

          15
          
import java.net.URISyntaxException;

        

        

          16
          
import org.eclipse.core.runtime.FileLocator;

          16
          
import org.eclipse.core.runtime.FileLocator;

        

        

          17
          
import org.eclipse.core.runtime.URIUtil;

          17
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          19
          
import org.osgi.framework.BundleException;

          20
          
import org.osgi.framework.BundleException;

        

        

          20
          

          21
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/MacOSLikeSetup.java
      (+1 lines)




  

    
      
            Lines 12-17
          
      
      
        Link Here
      
    
  

        

          12
          
import java.io.IOException;

          12
          
import java.io.IOException;

        

        

          13
          
import java.net.URISyntaxException;

          13
          
import java.net.URISyntaxException;

        

        

          14
          
import org.eclipse.core.runtime.FileLocator;

          14
          
import org.eclipse.core.runtime.FileLocator;

        

            

              
              
              15
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          15
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxConstants;

          16
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxConstants;

        

        

          16
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          17
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          17
          
import org.eclipse.osgi.service.environment.Constants;

          18
          
import org.eclipse.osgi.service.environment.Constants;

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/ManipulatorTests.java
      (+1 lines)




  

    
      
            Lines 15-20
          
      
      
        Link Here
      
    
  

        

          15
          
import java.util.Properties;

          15
          
import java.util.Properties;

        

        

          16
          
import org.eclipse.core.runtime.FileLocator;

          16
          
import org.eclipse.core.runtime.FileLocator;

        

        

          17
          
import org.eclipse.core.runtime.URIUtil;

          17
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          19
          

          20
          

        

        

          20
          
public class ManipulatorTests extends AbstractFwkAdminTest {

          21
          
public class ManipulatorTests extends AbstractFwkAdminTest {

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/NoConfigurationValueInEclipseIni.java
      (+1 lines)




  

    
      
            Lines 13-18
          
      
      
        Link Here
      
    
  

        

          13
          
import java.net.URISyntaxException;

          13
          
import java.net.URISyntaxException;

        

        

          14
          
import org.eclipse.core.runtime.FileLocator;

          14
          
import org.eclipse.core.runtime.FileLocator;

        

        

          15
          
import org.eclipse.core.runtime.URIUtil;

          15
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              16
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          16
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          17
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          17
          
import org.osgi.framework.BundleException;

          18
          
import org.osgi.framework.BundleException;

        

        

          18
          

          19
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/NoRenamingLauncherIni.java
      (+1 lines)




  

    
      
            Lines 15-20
          
      
      
        Link Here
      
    
  

        

          15
          
import java.net.URISyntaxException;

          15
          
import java.net.URISyntaxException;

        

        

          16
          
import org.eclipse.core.runtime.FileLocator;

          16
          
import org.eclipse.core.runtime.FileLocator;

        

        

          17
          
import org.eclipse.core.runtime.URIUtil;

          17
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          19
          
import org.osgi.framework.BundleException;

          20
          
import org.osgi.framework.BundleException;

        

        

          20
          

          21
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/OSGiVersionChange.java
      (-1 / +3 lines)




  

    
      
            Lines 14-20
          
      
      
        Link Here
      
    
  

        

          14
          
import java.net.URISyntaxException;

          14
          
import java.net.URISyntaxException;

        

        

          15
          
import org.eclipse.core.runtime.FileLocator;

          15
          
import org.eclipse.core.runtime.FileLocator;

        

        

          16
          
import org.eclipse.core.runtime.URIUtil;

          16
          
import org.eclipse.core.runtime.URIUtil;

        

          
            

              17
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;


              17
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

            

              
              

              18
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdminRuntimeException;

            

            


              19
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

            

        

          18
          
import org.osgi.framework.BundleException;

          20
          
import org.osgi.framework.BundleException;

        

        

          19
          

          21
          

        

        

          20
          
public class OSGiVersionChange extends FwkAdminAndSimpleConfiguratorTest {

          22
          
public class OSGiVersionChange extends FwkAdminAndSimpleConfiguratorTest {

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/RelativePathTest.java
      (-1 / +2 lines)




  

    
      
            Lines 15-20
          
      
      
        Link Here
      
    
  

        

          15
          
import java.net.URL;

          15
          
import java.net.URL;

        

        

          16
          
import org.eclipse.core.runtime.FileLocator;

          16
          
import org.eclipse.core.runtime.FileLocator;

        

        

          17
          
import org.eclipse.core.runtime.URIUtil;

          17
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxManipulatorImpl;

          19
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxManipulatorImpl;

        

        

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          20
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          20
          

          21
          

        

  

    
      
            Lines 72-78
          
      
      
        Link Here
      
    
  

        

          72
          
		assertContent(new File(configurationFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), "file:plugins/org.eclipse.equinox.simpleconfigurator.jar");

          73
          
		assertContent(new File(configurationFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), "file:plugins/org.eclipse.equinox.simpleconfigurator.jar");

        

        

          73
          
		assertContent(new File(configurationFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), "file:plugins/org.eclipse.osgi.jar");

          74
          
		assertContent(new File(configurationFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), "file:plugins/org.eclipse.osgi.jar");

        

        

          74
          

          75
          

        

          
            

              75
              
		BundleInfo bi = new BundleInfo(URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1"))), 2);


              76
              
		BundleInfo bi = new BundleInfo(URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1"))), 2, false);

            

        

          76
          
		manipulator.getConfigData().addBundle(bi);

          77
          
		manipulator.getConfigData().addBundle(bi);

        

        

          77
          
		manipulator.save(false);

          78
          
		manipulator.save(false);

        

        

          78
          
		//		assertContent(new File(configurationFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1")).toExternalForm());

          79
          
		//		assertContent(new File(configurationFolder, "org.eclipse.equinox.simpleconfigurator/bundles.info"), FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1")).toExternalForm());

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/RemovingABundle.java
      (+1 lines)




  

    
      
            Lines 14-19
          
      
      
        Link Here
      
    
  

        

          14
          
import java.io.IOException;

          14
          
import java.io.IOException;

        

        

          15
          
import org.eclipse.core.runtime.FileLocator;

          15
          
import org.eclipse.core.runtime.FileLocator;

        

        

          16
          
import org.eclipse.core.runtime.URIUtil;

          16
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              17
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          17
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          18
          
import org.osgi.framework.BundleException;

          19
          
import org.osgi.framework.BundleException;

        

        

          19
          

          20
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/RemovingAllBundles.java
      (+1 lines)




  

    
      
            Lines 15-20
          
      
      
        Link Here
      
    
  

        

          15
          
import java.net.URISyntaxException;

          15
          
import java.net.URISyntaxException;

        

        

          16
          
import org.eclipse.core.runtime.FileLocator;

          16
          
import org.eclipse.core.runtime.FileLocator;

        

        

          17
          
import org.eclipse.core.runtime.URIUtil;

          17
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          19
          
import org.osgi.framework.BundleException;

          20
          
import org.osgi.framework.BundleException;

        

        

          20
          

          21
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/RenamingLauncherIni.java
      (+1 lines)




  

    
      
            Lines 15-20
          
      
      
        Link Here
      
    
  

        

          15
          
import java.net.URISyntaxException;

          15
          
import java.net.URISyntaxException;

        

        

          16
          
import org.eclipse.core.runtime.FileLocator;

          16
          
import org.eclipse.core.runtime.FileLocator;

        

        

          17
          
import org.eclipse.core.runtime.URIUtil;

          17
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          19
          
import org.osgi.framework.BundleException;

          20
          
import org.osgi.framework.BundleException;

        

        

          20
          

          21
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/SimpleConfiguratorComingAndGoing.java
      (-1 / +2 lines)




  

    
      
            Lines 15-20
          
      
      
        Link Here
      
    
  

        

          15
          
import java.net.URISyntaxException;

          15
          
import java.net.URISyntaxException;

        

        

          16
          
import org.eclipse.core.runtime.FileLocator;

          16
          
import org.eclipse.core.runtime.FileLocator;

        

        

          17
          
import org.eclipse.core.runtime.URIUtil;

          17
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          19
          
import org.osgi.framework.BundleException;

          20
          
import org.osgi.framework.BundleException;

        

        

          20
          

          21
          

        

  

    
      
            Lines 31-37
          
      
      
        Link Here
      
    
  

        

          31
          
	}

          32
          
	}

        

        

          32
          

          33
          

        

        

          33
          
	public void testWithMutipleBundles() throws IOException, BundleException, URISyntaxException {

          34
          
	public void testWithMutipleBundles() throws IOException, BundleException, URISyntaxException {

        

          
            

              34
              
		BundleInfo bi = new BundleInfo(URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1"))), 2);


              35
              
		BundleInfo bi = new BundleInfo(URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/bundle_1"))), 2, false);

            

        

          35
          
		m.getConfigData().addBundle(bi);

          36
          
		m.getConfigData().addBundle(bi);

        

        

          36
          
		m.save(false);

          37
          
		m.save(false);

        

        

          37
          

          38
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/SimpleConfiguratorTest.java
      (+1 lines)




  

    
      
            Lines 15-20
          
      
      
        Link Here
      
    
  

        

          15
          
import java.net.URISyntaxException;

          15
          
import java.net.URISyntaxException;

        

        

          16
          
import org.eclipse.core.runtime.FileLocator;

          16
          
import org.eclipse.core.runtime.FileLocator;

        

        

          17
          
import org.eclipse.core.runtime.URIUtil;

          17
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          19
          
import org.osgi.framework.BundleException;

          20
          
import org.osgi.framework.BundleException;

        

        

          20
          

          21
          

        



(-)src/org/eclipse/equinox/frameworkadmin/tests/TestRunningInstance.java
      (-1 / +3 lines)




  

    
      
            Lines 11-17
          
      
      
        Link Here
      
    
  

        

          11
          
package org.eclipse.equinox.frameworkadmin.tests;

          11
          
package org.eclipse.equinox.frameworkadmin.tests;

        

        

          12
          

          12
          

        

        

          13
          
import org.eclipse.core.runtime.Platform;

          13
          
import org.eclipse.core.runtime.Platform;

        

          
            

              14
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;


              14
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

            

              
              

              15
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin;

            

            


              16
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

            

        

          15
          
import org.osgi.framework.*;

          17
          
import org.osgi.framework.*;

        

        

          16
          

          18
          

        

        

          17
          
public class TestRunningInstance extends AbstractFwkAdminTest {

          19
          
public class TestRunningInstance extends AbstractFwkAdminTest {

        



(-)META-INF/MANIFEST.MF
      (-1 / +2 lines)




  

    
      
            Lines 22-27
          
      
      
        Link Here
      
    
  

        

          22
          
Bundle-ActivationPolicy: lazy

          22
          
Bundle-ActivationPolicy: lazy

        

        

          23
          
Import-Package: javax.xml.parsers,

          23
          
Import-Package: javax.xml.parsers,

        

        

          24
          
 org.eclipse.equinox.app;version="1.0.0",

          24
          
 org.eclipse.equinox.app;version="1.0.0",

        

            

              
              
              25
              
 org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",

            

        

          25
          
 org.eclipse.equinox.internal.frameworkadmin.equinox,

          26
          
 org.eclipse.equinox.internal.frameworkadmin.equinox,

        

        

          26
          
 org.eclipse.equinox.internal.frameworkadmin.utils,

          27
          
 org.eclipse.equinox.internal.frameworkadmin.utils,

        

        

          27
          
 org.eclipse.equinox.internal.p2.metadata,

          28
          
 org.eclipse.equinox.internal.p2.metadata,

        

  

    
      
            Lines 30-36
          
      
      
        Link Here
      
    
  

        

          30
          
 org.eclipse.equinox.internal.p2.repository.helpers,

          31
          
 org.eclipse.equinox.internal.p2.repository.helpers,

        

        

          31
          
 org.eclipse.equinox.internal.provisional.frameworkadmin,

          32
          
 org.eclipse.equinox.internal.provisional.frameworkadmin,

        

        

          32
          
 org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,

          33
          
 org.eclipse.equinox.internal.provisional.p2.artifact.repository.processing,

        

            

              33
              
 org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,

              
              
            

        

          34
          
 org.eclipse.equinox.p2.metadata;version="[2.0.0,3.0.0)",

          34
          
 org.eclipse.equinox.p2.metadata;version="[2.0.0,3.0.0)",

        

        

          35
          
 org.eclipse.equinox.p2.metadata.expression;version="[2.0.0,3.0.0)",

          35
          
 org.eclipse.equinox.p2.metadata.expression;version="[2.0.0,3.0.0)",

        

        

          36
          
 org.eclipse.equinox.p2.query;version="[2.0.0,3.0.0)",

          36
          
 org.eclipse.equinox.p2.query;version="[2.0.0,3.0.0)",

        

  

    
      
            Lines 38-43
          
      
      
        Link Here
      
    
  

        

          38
          
 org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",

          38
          
 org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",

        

        

          39
          
 org.eclipse.equinox.p2.repository.artifact.spi;version="[2.0.0,3.0.0)",

          39
          
 org.eclipse.equinox.p2.repository.artifact.spi;version="[2.0.0,3.0.0)",

        

        

          40
          
 org.eclipse.equinox.p2.repository.metadata;version="[2.0.0,3.0.0)",

          40
          
 org.eclipse.equinox.p2.repository.metadata;version="[2.0.0,3.0.0)",

        

            

              
              
              41
              
 org.eclipse.equinox.simpleconfigurator.manipulator;version="[2.0.0,3.0.0)",

            

        

          41
          
 org.w3c.dom,

          42
          
 org.w3c.dom,

        

        

          42
          
 org.xml.sax,

          43
          
 org.xml.sax,

        

        

          43
          
 org.xml.sax.helpers

          44
          
 org.xml.sax.helpers

        



(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java
      (-2 / +3 lines)




  

    
      
            Lines 14-29
          
      
      
        Link Here
      
    
  

        

          14
          
import java.io.IOException;

          14
          
import java.io.IOException;

        

        

          15
          
import java.net.*;

          15
          
import java.net.*;

        

        

          16
          
import java.util.*;

          16
          
import java.util.*;

        

            

              
              
              17
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          17
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser;

          18
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser;

        

        

          18
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxManipulatorImpl;

          19
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxManipulatorImpl;

        

        

          19
          
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;

          20
          
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;

        

        

          20
          
import org.eclipse.equinox.internal.p2.metadata.generator.Activator;

          21
          
import org.eclipse.equinox.internal.p2.metadata.generator.Activator;

        

        

          21
          
import org.eclipse.equinox.internal.p2.metadata.generator.Messages;

          22
          
import org.eclipse.equinox.internal.p2.metadata.generator.Messages;

        

        

          22
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          23
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

            

              23
              
import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;

              
              
            

        

          24
          
import org.eclipse.equinox.p2.metadata.IInstallableUnit;

          24
          
import org.eclipse.equinox.p2.metadata.IInstallableUnit;

        

        

          25
          
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;

          25
          
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;

        

        

          26
          
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;

          26
          
import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;

        

            

              
              
              27
              
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;

            

        

          27
          
import org.eclipse.osgi.service.environment.EnvironmentInfo;

          28
          
import org.eclipse.osgi.service.environment.EnvironmentInfo;

        

        

          28
          
import org.eclipse.osgi.util.NLS;

          29
          
import org.eclipse.osgi.util.NLS;

        

        

          29
          
import org.osgi.framework.*;

          30
          
import org.osgi.framework.*;

        

  

    
      
            Lines 274-280
          
      
      
        Link Here
      
    
  

        

          274
          
			try {

          275
          
			try {

        

        

          275
          
				//config.ini uses simpleconfigurator, read the bundles.info and replace the bundle infos

          276
          
				//config.ini uses simpleconfigurator, read the bundles.info and replace the bundle infos

        

        

          276
          
				SimpleConfiguratorManipulator simpleManipulator = (SimpleConfiguratorManipulator) ServiceHelper.getService(Activator.getContext(), SimpleConfiguratorManipulator.class.getName());

          277
          
				SimpleConfiguratorManipulator simpleManipulator = (SimpleConfiguratorManipulator) ServiceHelper.getService(Activator.getContext(), SimpleConfiguratorManipulator.class.getName());

        

          
            

              277
              
				BundleInfo[] bundleInfos = simpleManipulator.loadConfiguration(new URL(value), null);


              278
              
				BundleInfo[] bundleInfos = simpleManipulator.loadConfiguration(new URL(value).openStream(), null);

            

        

          278
          
				data.setBundles(bundleInfos);

          279
          
				data.setBundles(bundleInfos);

        

        

          279
          
			} catch (MalformedURLException e1) {

          280
          
			} catch (MalformedURLException e1) {

        

        

          280
          
				// ignore

          281
          
				// ignore

        



(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java
      (-1 / +3 lines)




  

    
      
            Lines 16-21
          
      
      
        Link Here
      
    
  

        

          16
          
import java.util.*;

          16
          
import java.util.*;

        

        

          17
          
import java.util.Map.Entry;

          17
          
import java.util.Map.Entry;

        

        

          18
          
import org.eclipse.core.runtime.*;

          18
          
import org.eclipse.core.runtime.*;

        

            

              
              
              19
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          19
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxConstants;

          20
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxConstants;

        

        

          20
          
import org.eclipse.equinox.internal.p2.core.helpers.*;

          21
          
import org.eclipse.equinox.internal.p2.core.helpers.*;

        

        

          21
          
import org.eclipse.equinox.internal.p2.core.helpers.FileUtils.IPathComputer;

          22
          
import org.eclipse.equinox.internal.p2.core.helpers.FileUtils.IPathComputer;

        

  

    
      
            Lines 23-29
          
      
      
        Link Here
      
    
  

        

          23
          
import org.eclipse.equinox.internal.p2.metadata.generator.*;

          24
          
import org.eclipse.equinox.internal.p2.metadata.generator.*;

        

        

          24
          
import org.eclipse.equinox.internal.p2.metadata.generator.Messages;

          25
          
import org.eclipse.equinox.internal.p2.metadata.generator.Messages;

        

        

          25
          
import org.eclipse.equinox.internal.p2.metadata.generator.features.*;

          26
          
import org.eclipse.equinox.internal.p2.metadata.generator.features.*;

        

          
            

              26
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;


              27
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;

            

            

              
              

              28
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.LauncherData;

            

        

          27
          
import org.eclipse.equinox.p2.core.ProvisionException;

          29
          
import org.eclipse.equinox.p2.core.ProvisionException;

        

        

          28
          
import org.eclipse.equinox.p2.metadata.*;

          30
          
import org.eclipse.equinox.p2.metadata.*;

        

        

          29
          
import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;

          31
          
import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;

        



(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/GeneratorBundleInfo.java
      (-1 / +1 lines)




  

    
      
            Lines 10-16
          
      
      
        Link Here
      
    
  

        

          10
          
 *******************************************************************************/

          10
          
 *******************************************************************************/

        

        

          11
          
package org.eclipse.equinox.internal.provisional.p2.metadata.generator;

          11
          
package org.eclipse.equinox.internal.provisional.p2.metadata.generator;

        

        

          12
          

          12
          

        

          
            

              13
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;


              13
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          14
          

          14
          

        

        

          15
          
public class GeneratorBundleInfo extends BundleInfo {

          15
          
public class GeneratorBundleInfo extends BundleInfo {

        

        

          16
          
	//	public static final int NO_LEVEL = -1;

          16
          
	//	public static final int NO_LEVEL = -1;

        



(-)src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/MetadataGeneratorHelper.java
      (-1 / +1 lines)




  

    
      
            Lines 24-35
          
      
      
        Link Here
      
    
  

        

          24
          
import java.util.zip.ZipFile;

          24
          
import java.util.zip.ZipFile;

        

        

          25
          
import org.eclipse.core.runtime.Path;

          25
          
import org.eclipse.core.runtime.Path;

        

        

          26
          
import org.eclipse.core.runtime.URIUtil;

          26
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              27
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          27
          
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;

          28
          
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;

        

        

          28
          
import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;

          29
          
import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;

        

        

          29
          
import org.eclipse.equinox.internal.p2.metadata.generator.Activator;

          30
          
import org.eclipse.equinox.internal.p2.metadata.generator.Activator;

        

        

          30
          
import org.eclipse.equinox.internal.p2.metadata.generator.LocalizationHelper;

          31
          
import org.eclipse.equinox.internal.p2.metadata.generator.LocalizationHelper;

        

        

          31
          
import org.eclipse.equinox.internal.p2.metadata.generator.features.SiteCategory;

          32
          
import org.eclipse.equinox.internal.p2.metadata.generator.features.SiteCategory;

        

            

              32
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          33
          
import org.eclipse.equinox.p2.metadata.*;

          33
          
import org.eclipse.equinox.p2.metadata.*;

        

        

          34
          
import org.eclipse.equinox.p2.metadata.Version;

          34
          
import org.eclipse.equinox.p2.metadata.Version;

        

        

          35
          
import org.eclipse.equinox.p2.metadata.VersionRange;

          35
          
import org.eclipse.equinox.p2.metadata.VersionRange;

        



(-)META-INF/MANIFEST.MF
      (-1 / +2 lines)




  

    
      
            Lines 34-39
          
      
      
        Link Here
      
    
  

        

          34
          
Bundle-ActivationPolicy: lazy

          34
          
Bundle-ActivationPolicy: lazy

        

        

          35
          
Import-Package: javax.xml.parsers,

          35
          
Import-Package: javax.xml.parsers,

        

        

          36
          
 org.eclipse.equinox.app;version="1.0.0";resolution:=optional,

          36
          
 org.eclipse.equinox.app;version="1.0.0";resolution:=optional,

        

            

              
              
              37
              
 org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",

            

        

          37
          
 org.eclipse.equinox.internal.frameworkadmin.equinox,

          38
          
 org.eclipse.equinox.internal.frameworkadmin.equinox,

        

        

          38
          
 org.eclipse.equinox.internal.frameworkadmin.utils,

          39
          
 org.eclipse.equinox.internal.frameworkadmin.utils,

        

        

          39
          
 org.eclipse.equinox.internal.p2.artifact.repository,

          40
          
 org.eclipse.equinox.internal.p2.artifact.repository,

        

  

    
      
            Lines 44-50
          
      
      
        Link Here
      
    
  

        

          44
          
 org.eclipse.equinox.internal.p2.metadata.index,

          45
          
 org.eclipse.equinox.internal.p2.metadata.index,

        

        

          45
          
 org.eclipse.equinox.internal.p2.metadata.repository,

          46
          
 org.eclipse.equinox.internal.p2.metadata.repository,

        

        

          46
          
 org.eclipse.equinox.internal.provisional.frameworkadmin,

          47
          
 org.eclipse.equinox.internal.provisional.frameworkadmin,

        

            

              47
              
 org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator,

              
              
            

        

          48
          
 org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",

          48
          
 org.eclipse.equinox.p2.core;version="[2.0.0,3.0.0)",

        

        

          49
          
 org.eclipse.equinox.p2.metadata;version="[2.0.0,3.0.0)",

          49
          
 org.eclipse.equinox.p2.metadata;version="[2.0.0,3.0.0)",

        

        

          50
          
 org.eclipse.equinox.p2.metadata.expression;version="[2.0.0,3.0.0)",

          50
          
 org.eclipse.equinox.p2.metadata.expression;version="[2.0.0,3.0.0)",

        

  

    
      
            Lines 54-59
          
      
      
        Link Here
      
    
  

        

          54
          
 org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",

          54
          
 org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",

        

        

          55
          
 org.eclipse.equinox.p2.repository.artifact.spi;version="[2.0.0,3.0.0)",

          55
          
 org.eclipse.equinox.p2.repository.artifact.spi;version="[2.0.0,3.0.0)",

        

        

          56
          
 org.eclipse.equinox.p2.repository.metadata;version="[2.0.0,3.0.0)",

          56
          
 org.eclipse.equinox.p2.repository.metadata;version="[2.0.0,3.0.0)",

        

            

              
              
              57
              
 org.eclipse.equinox.simpleconfigurator.manipulator;version="[2.0.0,3.0.0)",

            

        

          57
          
 org.eclipse.equinox.p2.repository.spi,

          58
          
 org.eclipse.equinox.p2.repository.spi,

        

        

          58
          
 org.eclipse.osgi.service.datalocation;version="1.2.0",

          59
          
 org.eclipse.osgi.service.datalocation;version="1.2.0",

        

        

          59
          
 org.eclipse.osgi.service.environment;version="1.1.0",

          60
          
 org.eclipse.osgi.service.environment;version="1.1.0",

        



(-)src/org/eclipse/equinox/internal/p2/publisher/eclipse/DataLoader.java
      (-2 / +4 lines)




  

    
      
            Lines 14-26
          
      
      
        Link Here
      
    
  

        

          14
          
import java.net.*;

          14
          
import java.net.*;

        

        

          15
          
import org.eclipse.core.runtime.IStatus;

          15
          
import org.eclipse.core.runtime.IStatus;

        

        

          16
          
import org.eclipse.core.runtime.Status;

          16
          
import org.eclipse.core.runtime.Status;

        

            

              
              
              17
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          17
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser;

          18
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxFwConfigFileParser;

        

        

          18
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxManipulatorImpl;

          19
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.EquinoxManipulatorImpl;

        

        

          19
          
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;

          20
          
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;

        

        

          20
          
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;

          21
          
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;

        

        

          21
          
import org.eclipse.equinox.internal.p2.publisher.Activator;

          22
          
import org.eclipse.equinox.internal.p2.publisher.Activator;

        

        

          22
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          23
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

          
            

              23
              
import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;


              24
              
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;

            

        

          24
          
import org.osgi.framework.Constants;

          25
          
import org.osgi.framework.Constants;

        

        

          25
          

          26
          

        

        

          26
          
public class DataLoader {

          27
          
public class DataLoader {

        

  

    
      
            Lines 86-92
          
      
      
        Link Here
      
    
  

        

          86
          
			try {

          87
          
			try {

        

        

          87
          
				//config.ini uses simpleconfigurator, read the bundles.info and replace the bundle infos

          88
          
				//config.ini uses simpleconfigurator, read the bundles.info and replace the bundle infos

        

        

          88
          
				SimpleConfiguratorManipulator simpleManipulator = (SimpleConfiguratorManipulator) ServiceHelper.getService(Activator.getContext(), SimpleConfiguratorManipulator.class.getName());

          89
          
				SimpleConfiguratorManipulator simpleManipulator = (SimpleConfiguratorManipulator) ServiceHelper.getService(Activator.getContext(), SimpleConfiguratorManipulator.class.getName());

        

          
            

              89
              
				BundleInfo[] bundleInfos = simpleManipulator.loadConfiguration(new URL(value), null);


              90
              
				//input stream will be buffered and closed for us

            

            

              
              

              91
              
				BundleInfo[] bundleInfos = simpleManipulator.loadConfiguration(new URL(value).openStream(), null);

            

        

          90
          
				data.setBundles(bundleInfos);

          92
          
				data.setBundles(bundleInfos);

        

        

          91
          
			} catch (MalformedURLException e1) {

          93
          
			} catch (MalformedURLException e1) {

        

        

          92
          
				// ignore

          94
          
				// ignore

        



(-)src/org/eclipse/equinox/internal/p2/publisher/eclipse/GeneratorBundleInfo.java
      (-1 / +1 lines)




  

    
      
            Lines 10-16
          
      
      
        Link Here
      
    
  

        

          10
          
 *******************************************************************************/

          10
          
 *******************************************************************************/

        

        

          11
          
package org.eclipse.equinox.internal.p2.publisher.eclipse;

          11
          
package org.eclipse.equinox.internal.p2.publisher.eclipse;

        

        

          12
          

          12
          

        

          
            

              13
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;


              13
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          14
          
import org.eclipse.equinox.p2.metadata.IInstallableUnit;

          14
          
import org.eclipse.equinox.p2.metadata.IInstallableUnit;

        

        

          15
          

          15
          

        

        

          16
          
public class GeneratorBundleInfo extends BundleInfo {

          16
          
public class GeneratorBundleInfo extends BundleInfo {

        



(-)src/org/eclipse/equinox/internal/p2/publisher/eclipse/IProductDescriptor.java
      (-1 / +1 lines)




  

    
      
            Lines 13-19
          
      
      
        Link Here
      
    
  

        

          13
          
import java.io.File;

          13
          
import java.io.File;

        

        

          14
          
import java.util.List;

          14
          
import java.util.List;

        

        

          15
          
import java.util.Map;

          15
          
import java.util.Map;

        

          
            

              16
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;


              16
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          17
          
import org.eclipse.equinox.p2.metadata.IVersionedId;

          17
          
import org.eclipse.equinox.p2.metadata.IVersionedId;

        

        

          18
          

          18
          

        

        

          19
          
/**

          19
          
/**

        



(-)src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java
      (-1 / +1 lines)




  

    
      
            Lines 17-26
          
      
      
        Link Here
      
    
  

        

          17
          
import java.util.*;

          17
          
import java.util.*;

        

        

          18
          
import javax.xml.parsers.SAXParser;

          18
          
import javax.xml.parsers.SAXParser;

        

        

          19
          
import javax.xml.parsers.SAXParserFactory;

          19
          
import javax.xml.parsers.SAXParserFactory;

        

            

              
              
              20
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          20
          
import org.eclipse.equinox.internal.p2.core.helpers.*;

          21
          
import org.eclipse.equinox.internal.p2.core.helpers.*;

        

        

          21
          
import org.eclipse.equinox.internal.p2.metadata.VersionedId;

          22
          
import org.eclipse.equinox.internal.p2.metadata.VersionedId;

        

        

          22
          
import org.eclipse.equinox.internal.p2.publisher.Activator;

          23
          
import org.eclipse.equinox.internal.p2.publisher.Activator;

        

            

              23
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          24
          
import org.eclipse.equinox.p2.metadata.IVersionedId;

          24
          
import org.eclipse.equinox.p2.metadata.IVersionedId;

        

        

          25
          
import org.eclipse.osgi.service.datalocation.Location;

          25
          
import org.eclipse.osgi.service.datalocation.Location;

        

        

          26
          
import org.xml.sax.Attributes;

          26
          
import org.xml.sax.Attributes;

        



(-)src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java
      (-5 / +3 lines)




  

    
      
            Lines 10-19
          
      
      
        Link Here
      
    
  

        

          10
          
 ******************************************************************************/

          10
          
 ******************************************************************************/

        

        

          11
          
package org.eclipse.equinox.p2.publisher.eclipse;

          11
          
package org.eclipse.equinox.p2.publisher.eclipse;

        

        

          12
          

          12
          

        

            

              13
              
import org.eclipse.equinox.p2.metadata.MetadataFactory;

              
              
            

            

              14
              
import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;

            

            

              15
              
import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription;

            

            

              16
              

            

        

          17
          
import java.io.*;

          13
          
import java.io.*;

        

        

          18
          
import java.util.*;

          14
          
import java.util.*;

        

        

          19
          
import java.util.Map.Entry;

          15
          
import java.util.Map.Entry;

        

  

    
      
            Lines 21-34
          
      
      
        Link Here
      
    
  

        

          21
          
import java.util.zip.ZipEntry;

          17
          
import java.util.zip.ZipEntry;

        

        

          22
          
import java.util.zip.ZipFile;

          18
          
import java.util.zip.ZipFile;

        

        

          23
          
import org.eclipse.core.runtime.*;

          19
          
import org.eclipse.core.runtime.*;

        

            

              
              
              20
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          24
          
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;

          21
          
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;

        

        

          25
          
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;

          22
          
import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;

        

        

          26
          
import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;

          23
          
import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;

        

        

          27
          
import org.eclipse.equinox.internal.p2.publisher.Activator;

          24
          
import org.eclipse.equinox.internal.p2.publisher.Activator;

        

        

          28
          
import org.eclipse.equinox.internal.p2.publisher.Messages;

          25
          
import org.eclipse.equinox.internal.p2.publisher.Messages;

        

        

          29
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.GeneratorBundleInfo;

          26
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.GeneratorBundleInfo;

        

            

              30
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          31
          
import org.eclipse.equinox.p2.metadata.*;

          27
          
import org.eclipse.equinox.p2.metadata.*;

        

            

              
              
              28
              
import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;

            

            

              29
              
import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription;

            

        

          32
          
import org.eclipse.equinox.p2.metadata.Version;

          30
          
import org.eclipse.equinox.p2.metadata.Version;

        

        

          33
          
import org.eclipse.equinox.p2.metadata.VersionRange;

          31
          
import org.eclipse.equinox.p2.metadata.VersionRange;

        

        

          34
          
import org.eclipse.equinox.p2.publisher.*;

          32
          
import org.eclipse.equinox.p2.publisher.*;

        



(-)src/org/eclipse/equinox/p2/publisher/eclipse/ConfigAdvice.java
      (-1 / +1 lines)




  

    
      
            Lines 10-17
          
      
      
        Link Here
      
    
  

        

          10
          
package org.eclipse.equinox.p2.publisher.eclipse;

          10
          
package org.eclipse.equinox.p2.publisher.eclipse;

        

        

          11
          

          11
          

        

        

          12
          
import java.util.Map;

          12
          
import java.util.Map;

        

            

              
              
              13
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          13
          
import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;

          14
          
import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;

        

            

              14
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          15
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;

          15
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;

        

        

          16
          
import org.eclipse.equinox.p2.publisher.AbstractAdvice;

          16
          
import org.eclipse.equinox.p2.publisher.AbstractAdvice;

        

        

          17
          

          17
          

        



(-)src/org/eclipse/equinox/p2/publisher/eclipse/ConfigCUsAction.java
      (-4 / +2 lines)




  

    
      
            Lines 10-25
          
      
      
        Link Here
      
    
  

        

          10
          
 ******************************************************************************/

          10
          
 ******************************************************************************/

        

        

          11
          
package org.eclipse.equinox.p2.publisher.eclipse;

          11
          
package org.eclipse.equinox.p2.publisher.eclipse;

        

        

          12
          

          12
          

        

            

              13
              
import org.eclipse.equinox.p2.metadata.MetadataFactory;

              
              
            

            

              14
              
import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;

            

            

              15
              

            

        

          16
          
import java.io.File;

          13
          
import java.io.File;

        

        

          17
          
import java.util.*;

          14
          
import java.util.*;

        

        

          18
          
import java.util.Map.Entry;

          15
          
import java.util.Map.Entry;

        

        

          19
          
import org.eclipse.core.runtime.*;

          16
          
import org.eclipse.core.runtime.*;

        

            

              
              
              17
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          20
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.GeneratorBundleInfo;

          18
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.GeneratorBundleInfo;

        

            

              21
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          22
          
import org.eclipse.equinox.p2.metadata.*;

          19
          
import org.eclipse.equinox.p2.metadata.*;

        

            

              
              
              20
              
import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;

            

        

          23
          
import org.eclipse.equinox.p2.metadata.Version;

          21
          
import org.eclipse.equinox.p2.metadata.Version;

        

        

          24
          
import org.eclipse.equinox.p2.publisher.*;

          22
          
import org.eclipse.equinox.p2.publisher.*;

        

        

          25
          
import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;

          23
          
import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;

        



(-)src/org/eclipse/equinox/p2/publisher/eclipse/IConfigAdvice.java
      (-1 / +1 lines)




  

    
      
            Lines 10-16
          
      
      
        Link Here
      
    
  

        

          10
          
package org.eclipse.equinox.p2.publisher.eclipse;

          10
          
package org.eclipse.equinox.p2.publisher.eclipse;

        

        

          11
          

          11
          

        

        

          12
          
import java.util.Map;

          12
          
import java.util.Map;

        

          
            

              13
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;


              13
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          14
          
import org.eclipse.equinox.p2.publisher.IPublisherAdvice;

          14
          
import org.eclipse.equinox.p2.publisher.IPublisherAdvice;

        

        

          15
          

          15
          

        

        

          16
          
public interface IConfigAdvice extends IPublisherAdvice {

          16
          
public interface IConfigAdvice extends IPublisherAdvice {

        



(-)src/org/eclipse/equinox/p2/publisher/eclipse/ProductFileAdvice.java
      (-1 / +1 lines)




  

    
      
            Lines 13-22
          
      
      
        Link Here
      
    
  

        

          13
          

          13
          

        

        

          14
          
import java.io.File;

          14
          
import java.io.File;

        

        

          15
          
import java.util.*;

          15
          
import java.util.*;

        

            

              
              
              16
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          16
          
import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;

          17
          
import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;

        

        

          17
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.DataLoader;

          18
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.DataLoader;

        

        

          18
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.IProductDescriptor;

          19
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.IProductDescriptor;

        

            

              19
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          20
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;

          20
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;

        

        

          21
          
import org.eclipse.equinox.p2.metadata.IVersionedId;

          21
          
import org.eclipse.equinox.p2.metadata.IVersionedId;

        

        

          22
          
import org.eclipse.equinox.p2.metadata.Version;

          22
          
import org.eclipse.equinox.p2.metadata.Version;

        



(-)All p2 Tests.launch
      (-4 / +5 lines)




  

    
      
            Lines 1-5
          
      
      
        Link Here
      
    
  

          
            

              1
              
<?xml version="1.0" encoding="UTF-8" standalone="no"?>


              1
              
<?xml version="1.0" encoding="UTF-8"?><launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

            

            

              2
              
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">


              
              
            

        

          3
          
<booleanAttribute key="append.args" value="true"/>

          2
          
<booleanAttribute key="append.args" value="true"/>

        

        

          4
          
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>

          3
          
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>

        

        

          5
          
<booleanAttribute key="askclear" value="false"/>

          4
          
<booleanAttribute key="askclear" value="false"/>

        

  

    
      
            Lines 53-70
          
      
      
        Link Here
      
    
  

        

          53
          
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

          52
          
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

        

        

          54
          
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

          53
          
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

        

        

          55
          
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

          54
          
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

        

            

              
              
              55
              
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/IBM-1.6.0-20090519-SR5"/>

            

        

          56
          
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.AutomatedTests"/>

          56
          
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.equinox.p2.tests.AutomatedTests"/>

        

        

          57
          
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog -console"/>

          57
          
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consolelog -console"/>

        

        

          58
          
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.tests"/>

          58
          
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.equinox.p2.tests"/>

        

        

          59
          
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

          59
          
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

        

          
            

              60
              
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=/home/thhal/Download/eclipse-platform-N20091109-2000-linux-gtk-x86_64.tar.gz&#13;&#10;-Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=/home/thhal/Download/eclipse-platform-3.5.1-linux-gtk-x86_64.tar.gz&#13;&#10;-Dorg.eclipse.equinox.p2.repository&#13;&#10;-Dorg.eclipse.equinox.p2.tests.current.build.repo=http://eclipsebuildserv/3.6-I-builds/&#13;&#13;&#10;-Xmx512m"/>


              60
              
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=c:/dev/platform/zips/eclipse-platform-I20100119-0800-win32.zip&#13;&#10;-Dorg.eclipse.equinox.p2.reconciler.tests.35.platform.archive=c:/dev/platform/zips/eclipse-platform-3.5-win32.zip&#13;&#10;-Dorg.eclipse.equinox.p2.repository&#13;&#10;-Dorg.eclipse.equinox.p2.tests.current.build.repo=http://eclipsebuildserv/3.6-I-builds/&#13;&#13;&#10;-Xmx512m"/>

            

        

          61
          
<stringAttribute key="pde.version" value="3.3"/>

          61
          
<stringAttribute key="pde.version" value="3.3"/>

        

        

          62
          
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>

          62
          
<stringAttribute key="product" value="org.eclipse.sdk.ide"/>

        

        

          63
          
<booleanAttribute key="run_in_ui_thread" value="true"/>

          63
          
<booleanAttribute key="run_in_ui_thread" value="true"/>

        

        

          64
          
<booleanAttribute key="show_selected_only" value="false"/>

          64
          
<booleanAttribute key="show_selected_only" value="false"/>

        

        

          65
          
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

          65
          
<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

        

        

          66
          
<booleanAttribute key="tracing" value="false"/>

          66
          
<booleanAttribute key="tracing" value="false"/>

        

            

              
              
              67
              
<booleanAttribute key="useCustomFeatures" value="false"/>

            

        

          67
          
<booleanAttribute key="useDefaultConfig" value="true"/>

          68
          
<booleanAttribute key="useDefaultConfig" value="true"/>

        

        

          68
          
<booleanAttribute key="useDefaultConfigArea" value="false"/>

          69
          
<booleanAttribute key="useDefaultConfigArea" value="false"/>

        

        

          69
          
<booleanAttribute key="useProduct" value="false"/>

          70
          
<booleanAttribute key="useProduct" value="false"/>

        

          
            

              70
              
</launchConfiguration>


              71
              
</launchConfiguration>

            



(-)META-INF/MANIFEST.MF
      (-1 / +1 lines)




  

    
      
            Lines 35-41
          
      
      
        Link Here
      
    
  

        

          35
          
 org.eclipse.equinox.p2.installer;bundle-version="[1.0.0,2.0.0)",

          35
          
 org.eclipse.equinox.p2.installer;bundle-version="[1.0.0,2.0.0)",

        

        

          36
          
 org.eclipse.equinox.simpleconfigurator;bundle-version="1.0.100",

          36
          
 org.eclipse.equinox.simpleconfigurator;bundle-version="1.0.100",

        

        

          37
          
 org.eclipse.equinox.p2.updatechecker;bundle-version="1.0.0",

          37
          
 org.eclipse.equinox.p2.updatechecker;bundle-version="1.0.0",

        

          
            

              38
              
 org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="1.0.100",


              38
              
 org.eclipse.equinox.simpleconfigurator.manipulator;version="[2.0.0,3.0.0)",

            

        

          39
          
 org.eclipse.equinox.p2.repository;bundle-version="1.0.0",

          39
          
 org.eclipse.equinox.p2.repository;bundle-version="1.0.0",

        

        

          40
          
 org.eclipse.equinox.p2.tests.verifier;bundle-version="1.0.0",

          40
          
 org.eclipse.equinox.p2.tests.verifier;bundle-version="1.0.0",

        

        

          41
          
 org.eclipse.equinox.security;bundle-version="1.0.0",

          41
          
 org.eclipse.equinox.security;bundle-version="1.0.0",

        



(-)src/org/eclipse/equinox/p2/tests/publisher/actions/AccumulateConfigDataActionTest.java
      (-1 / +1 lines)




  

    
      
            Lines 19-25
          
      
      
        Link Here
      
    
  

        

          19
          
import org.easymock.EasyMock;

          19
          
import org.easymock.EasyMock;

        

        

          20
          
import org.eclipse.core.runtime.NullProgressMonitor;

          20
          
import org.eclipse.core.runtime.NullProgressMonitor;

        

        

          21
          
import org.eclipse.core.runtime.Path;

          21
          
import org.eclipse.core.runtime.Path;

        

          
            

              22
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;


              22
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          23
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;

          23
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.ConfigData;

        

        

          24
          
import org.eclipse.equinox.p2.publisher.eclipse.*;

          24
          
import org.eclipse.equinox.p2.publisher.eclipse.*;

        

        

          25
          
import org.eclipse.equinox.p2.tests.TestActivator;

          25
          
import org.eclipse.equinox.p2.tests.TestActivator;

        



(-)src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionTest.java
      (-1 / +1 lines)




  

    
      
            Lines 19-27
          
      
      
        Link Here
      
    
  

        

          19
          
import org.easymock.Capture;

          19
          
import org.easymock.Capture;

        

        

          20
          
import org.easymock.EasyMock;

          20
          
import org.easymock.EasyMock;

        

        

          21
          
import org.eclipse.core.runtime.NullProgressMonitor;

          21
          
import org.eclipse.core.runtime.NullProgressMonitor;

        

            

              
              
              22
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          22
          
import org.eclipse.equinox.internal.p2.metadata.RequiredCapability;

          23
          
import org.eclipse.equinox.internal.p2.metadata.RequiredCapability;

        

        

          23
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;

          24
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;

        

            

              24
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          25
          
import org.eclipse.equinox.p2.metadata.*;

          25
          
import org.eclipse.equinox.p2.metadata.*;

        

        

          26
          
import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;

          26
          
import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;

        

        

          27
          
import org.eclipse.equinox.p2.publisher.*;

          27
          
import org.eclipse.equinox.p2.publisher.*;

        



(-)src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java
      (-1 / +1 lines)




  

    
      
            Lines 13-20
          
      
      
        Link Here
      
    
  

        

          13
          
import java.io.File;

          13
          
import java.io.File;

        

        

          14
          
import java.util.Map;

          14
          
import java.util.Map;

        

        

          15
          
import java.util.Properties;

          15
          
import java.util.Properties;

        

            

              
              
              16
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          16
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;

          17
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;

        

            

              17
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          18
          
import org.eclipse.equinox.p2.publisher.eclipse.ProductFileAdvice;

          18
          
import org.eclipse.equinox.p2.publisher.eclipse.ProductFileAdvice;

        

        

          19
          
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;

          19
          
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;

        

        

          20
          
import org.eclipse.equinox.p2.tests.TestData;

          20
          
import org.eclipse.equinox.p2.tests.TestData;

        



(-)src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileTest.java
      (-1 / +1 lines)




  

    
      
            Lines 12-19
          
      
      
        Link Here
      
    
  

        

          12
          
import java.util.List;

          12
          
import java.util.List;

        

        

          13
          
import java.util.Map;

          13
          
import java.util.Map;

        

        

          14
          
import junit.framework.TestCase;

          14
          
import junit.framework.TestCase;

        

            

              
              
              15
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          15
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;

          16
          
import org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile;

        

            

              16
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          17
          
import org.eclipse.equinox.p2.metadata.IVersionedId;

          17
          
import org.eclipse.equinox.p2.metadata.IVersionedId;

        

        

          18
          
import org.eclipse.equinox.p2.metadata.Version;

          18
          
import org.eclipse.equinox.p2.metadata.Version;

        

        

          19
          
import org.eclipse.equinox.p2.tests.TestData;

          19
          
import org.eclipse.equinox.p2.tests.TestData;

        



(-)src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorTests.java
      (-9 / +11 lines)




  

    
      
            Lines 12-22
          
      
      
        Link Here
      
    
  

        

          12
          
package org.eclipse.equinox.p2.tests.simpleconfigurator.manipulator;

          12
          
package org.eclipse.equinox.p2.tests.simpleconfigurator.manipulator;

        

        

          13
          

          13
          

        

        

          14
          
import java.io.File;

          14
          
import java.io.File;

        

            

              
              
              15
              
import java.io.FileInputStream;

            

        

          15
          
import java.net.URI;

          16
          
import java.net.URI;

        

          
            

              16
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;


              17
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

            

              17
              
import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;


              
              
            

        

          18
          
import org.eclipse.equinox.internal.simpleconfigurator.manipulator.SimpleConfiguratorManipulatorImpl;

          18
          
import org.eclipse.equinox.internal.simpleconfigurator.manipulator.SimpleConfiguratorManipulatorImpl;

        

            

              
              
              19
              
import org.eclipse.equinox.internal.simpleconfigurator.utils.URIUtil;

            

        

          19
          
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;

          20
          
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;

        

            

              
              
              21
              
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;

            

        

          20
          

          22
          

        

        

          21
          
public class SimpleConfiguratorManipulatorTests extends AbstractProvisioningTest {

          23
          
public class SimpleConfiguratorManipulatorTests extends AbstractProvisioningTest {

        

        

          22
          

          24
          

        

  

    
      
            Lines 24-49
          
      
      
        Link Here
      
    
  

        

          24
          
		File folder = getTestFolder("saveConfiguration");

          26
          
		File folder = getTestFolder("saveConfiguration");

        

        

          25
          
		File infoFile = new File(folder, "bundle.info");

          27
          
		File infoFile = new File(folder, "bundle.info");

        

        

          26
          

          28
          

        

          
            

              27
              
		File baseFile = getTempFolder();


              29
              
		URI baseFile = getTempFolder().toURI();

            

        

          28
          

          30
          

        

        

          29
          
		//absolute location written with base

          31
          
		//absolute location written with base

        

        

          30
          
		BundleInfo[] bundles = new BundleInfo[] {new BundleInfo("a", "1.0.0", new File(folder, "plugins/a_1.0.0.jar").toURI(), BundleInfo.NO_LEVEL, false)};

          32
          
		BundleInfo[] bundles = new BundleInfo[] {new BundleInfo("a", "1.0.0", new File(folder, "plugins/a_1.0.0.jar").toURI(), BundleInfo.NO_LEVEL, false)};

        

        

          31
          
		SimpleConfiguratorManipulator manipulator = new SimpleConfiguratorManipulatorImpl();

          33
          
		SimpleConfiguratorManipulator manipulator = new SimpleConfiguratorManipulatorImpl();

        

          
            

              32
              
		manipulator.saveConfiguration(bundles, infoFile, folder);


              34
              
		manipulator.saveConfiguration(bundles, infoFile, folder.toURI());

            

            

              33
              
		bundles = manipulator.loadConfiguration(infoFile.toURL(), baseFile);


              35
              
		bundles = manipulator.loadConfiguration(new FileInputStream(infoFile), baseFile);

            

            

              34
              
		assertEquals(bundles[0].getLocation(), new File(baseFile, "plugins/a_1.0.0.jar").toURI());


              36
              
		assertEquals(bundles[0].getLocation(), URIUtil.append(baseFile, "plugins/a_1.0.0.jar"));

            

        

          35
          

          37
          

        

        

          36
          
		//relative location written with null base

          38
          
		//relative location written with null base

        

        

          37
          
		bundles = new BundleInfo[] {new BundleInfo("b", "1.0.0", new URI("plugins/b_1.0.0.jar"), BundleInfo.NO_LEVEL, false)};

          39
          
		bundles = new BundleInfo[] {new BundleInfo("b", "1.0.0", new URI("plugins/b_1.0.0.jar"), BundleInfo.NO_LEVEL, false)};

        

        

          38
          
		manipulator.saveConfiguration(bundles, infoFile, null);

          40
          
		manipulator.saveConfiguration(bundles, infoFile, null);

        

          
            

              39
              
		bundles = manipulator.loadConfiguration(infoFile.toURL(), baseFile);


              41
              
		bundles = manipulator.loadConfiguration(new FileInputStream(infoFile), baseFile);

            

            

              40
              
		assertEquals(bundles[0].getLocation(), new File(baseFile, "plugins/b_1.0.0.jar").toURI());


              42
              
		assertEquals(bundles[0].getLocation(), URIUtil.append(baseFile, "plugins/b_1.0.0.jar"));

            

        

          41
          

          43
          

        

        

          42
          
		//absolute location written with null base

          44
          
		//absolute location written with null base

        

        

          43
          
		URI absolute = new File(folder, "plugins/c_1.0.0.jar").toURI();

          45
          
		URI absolute = new File(folder, "plugins/c_1.0.0.jar").toURI();

        

        

          44
          
		bundles = new BundleInfo[] {new BundleInfo("c", "1.0.0", absolute, BundleInfo.NO_LEVEL, false)};

          46
          
		bundles = new BundleInfo[] {new BundleInfo("c", "1.0.0", absolute, BundleInfo.NO_LEVEL, false)};

        

        

          45
          
		manipulator.saveConfiguration(bundles, infoFile, null);

          47
          
		manipulator.saveConfiguration(bundles, infoFile, null);

        

          
            

              46
              
		bundles = manipulator.loadConfiguration(infoFile.toURL(), baseFile);


              48
              
		bundles = manipulator.loadConfiguration(new FileInputStream(infoFile), baseFile);

            

        

          47
          
		assertEquals(bundles[0].getLocation(), absolute);

          49
          
		assertEquals(bundles[0].getLocation(), absolute);

        

        

          48
          
	}

          50
          
	}

        

        

          49
          
}

          51
          
}

        



(-)src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/AddSourceBundleActionTest.java
      (-1 / +1 lines)




  

    
      
            Lines 14-24
          
      
      
        Link Here
      
    
  

        

          14
          
import java.io.IOException;

          14
          
import java.io.IOException;

        

        

          15
          
import java.net.URI;

          15
          
import java.net.URI;

        

        

          16
          
import java.util.*;

          16
          
import java.util.*;

        

            

              
              
              17
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          17
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

          18
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

        

        

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.*;

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.*;

        

        

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

        

        

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.AddSourceBundleAction;

          21
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.AddSourceBundleAction;

        

            

              21
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          22
          
import org.eclipse.equinox.p2.engine.IProfile;

          22
          
import org.eclipse.equinox.p2.engine.IProfile;

        

        

          23
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

          23
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

        

        

          24
          
import org.eclipse.equinox.p2.metadata.IInstallableUnit;

          24
          
import org.eclipse.equinox.p2.metadata.IInstallableUnit;

        



(-)src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/InstallBundleActionTest.java
      (-1 / +1 lines)




  

    
      
            Lines 13-24
          
      
      
        Link Here
      
    
  

        

          13
          
import java.io.File;

          13
          
import java.io.File;

        

        

          14
          
import java.net.URI;

          14
          
import java.net.URI;

        

        

          15
          
import java.util.*;

          15
          
import java.util.*;

        

            

              
              
              16
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          16
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

          17
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

        

        

          17
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

        

        

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

        

        

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

        

        

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.InstallBundleAction;

          21
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.InstallBundleAction;

        

            

              21
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          22
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

          22
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

        

        

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

        

        

          24
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

          24
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

        



(-)src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/MarkStartedActionTest.java
      (-1 / +1 lines)




  

    
      
            Lines 13-24
          
      
      
        Link Here
      
    
  

        

          13
          
import java.io.File;

          13
          
import java.io.File;

        

        

          14
          
import java.net.URI;

          14
          
import java.net.URI;

        

        

          15
          
import java.util.*;

          15
          
import java.util.*;

        

            

              
              
              16
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          16
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

          17
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

        

        

          17
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

        

        

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

        

        

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

        

        

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.MarkStartedAction;

          21
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.MarkStartedAction;

        

            

              21
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          22
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

          22
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

        

        

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

        

        

          24
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

          24
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

        



(-)src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/RemoveSourceBundleActionTest.java
      (-1 / +1 lines)




  

    
      
            Lines 14-24
          
      
      
        Link Here
      
    
  

        

          14
          
import java.io.IOException;

          14
          
import java.io.IOException;

        

        

          15
          
import java.net.URI;

          15
          
import java.net.URI;

        

        

          16
          
import java.util.*;

          16
          
import java.util.*;

        

            

              
              
              17
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          17
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

          18
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

        

        

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.*;

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.*;

        

        

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

        

        

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.RemoveSourceBundleAction;

          21
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.RemoveSourceBundleAction;

        

            

              21
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          22
          
import org.eclipse.equinox.p2.engine.IProfile;

          22
          
import org.eclipse.equinox.p2.engine.IProfile;

        

        

          23
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

          23
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

        

        

          24
          
import org.eclipse.equinox.p2.metadata.IInstallableUnit;

          24
          
import org.eclipse.equinox.p2.metadata.IInstallableUnit;

        



(-)src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetLauncherNameActionTest.java
      (-1 / +1 lines)




  

    
      
            Lines 10-20
          
      
      
        Link Here
      
    
  

        

          10
          

          10
          

        

        

          11
          
import java.io.File;

          11
          
import java.io.File;

        

        

          12
          
import java.util.*;

          12
          
import java.util.*;

        

            

              
              
              13
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          13
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

          14
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

        

        

          14
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

          15
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

        

        

          15
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

          16
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

        

        

          16
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.SetLauncherNameAction;

          17
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.SetLauncherNameAction;

        

            

              17
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

          18
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

        

        

          19
          
import org.eclipse.equinox.p2.engine.IProfile;

          19
          
import org.eclipse.equinox.p2.engine.IProfile;

        

        

          20
          
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;

          20
          
import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;

        



(-)src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/SetStartLevelActionTest.java
      (-1 / +1 lines)




  

    
      
            Lines 13-24
          
      
      
        Link Here
      
    
  

        

          13
          
import java.io.File;

          13
          
import java.io.File;

        

        

          14
          
import java.net.URI;

          14
          
import java.net.URI;

        

        

          15
          
import java.util.*;

          15
          
import java.util.*;

        

            

              
              
              16
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          16
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

          17
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

        

        

          17
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

        

        

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

        

        

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

        

        

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.SetStartLevelAction;

          21
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.SetStartLevelAction;

        

            

              21
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          22
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

          22
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

        

        

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

        

        

          24
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

          24
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

        



(-)src/org/eclipse/equinox/p2/tests/touchpoint/eclipse/UninstallBundleActionTest.java
      (-1 / +1 lines)




  

    
      
            Lines 13-24
          
      
      
        Link Here
      
    
  

        

          13
          
import java.io.File;

          13
          
import java.io.File;

        

        

          14
          
import java.net.URI;

          14
          
import java.net.URI;

        

        

          15
          
import java.util.*;

          15
          
import java.util.*;

        

            

              
              
              16
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          16
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

          17
          
import org.eclipse.equinox.internal.p2.engine.InstallableUnitOperand;

        

        

          17
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

        

        

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

        

        

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.ActionConstants;

        

        

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.UninstallBundleAction;

          21
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.UninstallBundleAction;

        

            

              21
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          22
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

          22
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

        

        

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

        

        

          24
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

          24
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

        



(-)META-INF/MANIFEST.MF
      (+2 lines)




  

    
      
            Lines 17-22
          
      
      
        Link Here
      
    
  

        

          17
          
Bundle-ActivationPolicy: lazy

          17
          
Bundle-ActivationPolicy: lazy

        

        

          18
          
Import-Package: javax.xml.parsers,

          18
          
Import-Package: javax.xml.parsers,

        

        

          19
          
 org.eclipse.core.runtime.preferences;version="3.2.0",

          19
          
 org.eclipse.core.runtime.preferences;version="3.2.0",

        

            

              
              
              20
              
 org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",

            

        

          20
          
 org.eclipse.equinox.internal.p2.core.helpers,

          21
          
 org.eclipse.equinox.internal.p2.core.helpers,

        

        

          21
          
 org.eclipse.equinox.internal.p2.engine,

          22
          
 org.eclipse.equinox.internal.p2.engine,

        

        

          22
          
 org.eclipse.equinox.internal.p2.garbagecollector,

          23
          
 org.eclipse.equinox.internal.p2.garbagecollector,

        

  

    
      
            Lines 38-43
          
      
      
        Link Here
      
    
  

        

          38
          
 org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",

          39
          
 org.eclipse.equinox.p2.repository.artifact;version="[2.0.0,3.0.0)",

        

        

          39
          
 org.eclipse.equinox.p2.repository.artifact.spi;version="[2.0.0,3.0.0)",

          40
          
 org.eclipse.equinox.p2.repository.artifact.spi;version="[2.0.0,3.0.0)",

        

        

          40
          
 org.eclipse.equinox.p2.repository.metadata;version="[2.0.0,3.0.0)",

          41
          
 org.eclipse.equinox.p2.repository.metadata;version="[2.0.0,3.0.0)",

        

            

              
              
              42
              
 org.eclipse.equinox.simpleconfigurator.manipulator;version="[2.0.0,3.0.0)",

            

        

          41
          
 org.eclipse.osgi.service.datalocation;version="1.0.0",

          43
          
 org.eclipse.osgi.service.datalocation;version="1.0.0",

        

        

          42
          
 org.eclipse.osgi.service.environment;version="1.0.0",

          44
          
 org.eclipse.osgi.service.environment;version="1.0.0",

        

        

          43
          
 org.eclipse.osgi.service.resolver;version="1.2.0";resolution:=optional,

          45
          
 org.eclipse.osgi.service.resolver;version="1.2.0";resolution:=optional,

        



(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/EclipseMarkSetProvider.java
      (-3 / +2 lines)




  

    
      
            Lines 10-30
          
      
      
        Link Here
      
    
  

        

          10
          
 *******************************************************************************/

          10
          
 *******************************************************************************/

        

        

          11
          
package org.eclipse.equinox.internal.p2.touchpoint.eclipse;

          11
          
package org.eclipse.equinox.internal.p2.touchpoint.eclipse;

        

        

          12
          

          12
          

        

            

              13
              
import org.eclipse.equinox.p2.query.QueryUtil;

              
              
            

            

              14
              

            

        

          15
          
import java.io.File;

          13
          
import java.io.File;

        

        

          16
          
import java.util.*;

          14
          
import java.util.*;

        

            

              
              
              15
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          17
          
import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;

          16
          
import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;

        

        

          18
          
import org.eclipse.equinox.internal.p2.garbagecollector.MarkSet;

          17
          
import org.eclipse.equinox.internal.p2.garbagecollector.MarkSet;

        

        

          19
          
import org.eclipse.equinox.internal.p2.garbagecollector.MarkSetProvider;

          18
          
import org.eclipse.equinox.internal.p2.garbagecollector.MarkSetProvider;

        

        

          20
          
import org.eclipse.equinox.internal.p2.update.*;

          19
          
import org.eclipse.equinox.internal.p2.update.*;

        

            

              21
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          22
          
import org.eclipse.equinox.p2.core.IProvisioningAgent;

          20
          
import org.eclipse.equinox.p2.core.IProvisioningAgent;

        

        

          23
          
import org.eclipse.equinox.p2.core.ProvisionException;

          21
          
import org.eclipse.equinox.p2.core.ProvisionException;

        

        

          24
          
import org.eclipse.equinox.p2.engine.IProfile;

          22
          
import org.eclipse.equinox.p2.engine.IProfile;

        

        

          25
          
import org.eclipse.equinox.p2.engine.IProfileRegistry;

          23
          
import org.eclipse.equinox.p2.engine.IProfileRegistry;

        

        

          26
          
import org.eclipse.equinox.p2.metadata.*;

          24
          
import org.eclipse.equinox.p2.metadata.*;

        

        

          27
          
import org.eclipse.equinox.p2.query.IQueryResult;

          25
          
import org.eclipse.equinox.p2.query.IQueryResult;

        

            

              
              
              26
              
import org.eclipse.equinox.p2.query.QueryUtil;

            

        

          28
          
import org.eclipse.equinox.p2.repository.artifact.ArtifactKeyQuery;

          27
          
import org.eclipse.equinox.p2.repository.artifact.ArtifactKeyQuery;

        

        

          29
          
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;

          28
          
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;

        

        

          30
          

          29
          

        



(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/LazyManipulator.java
      (+1 lines)




  

    
      
            Lines 11-16
          
      
      
        Link Here
      
    
  

        

          11
          
package org.eclipse.equinox.internal.p2.touchpoint.eclipse;

          11
          
package org.eclipse.equinox.internal.p2.touchpoint.eclipse;

        

        

          12
          

          12
          

        

        

          13
          
import java.io.IOException;

          13
          
import java.io.IOException;

        

            

              
              
              14
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          14
          
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;

          15
          
import org.eclipse.equinox.internal.p2.core.helpers.LogHelper;

        

        

          15
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          16
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

        

          16
          
import org.eclipse.equinox.p2.core.IProvisioningAgent;

          17
          
import org.eclipse.equinox.p2.core.IProvisioningAgent;

        



(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/PlatformConfigurationWrapper.java
      (-1 / +1 lines)




  

    
      
            Lines 14-22
          
      
      
        Link Here
      
    
  

        

          14
          
import java.net.*;

          14
          
import java.net.*;

        

        

          15
          
import java.util.List;

          15
          
import java.util.List;

        

        

          16
          
import org.eclipse.core.runtime.*;

          16
          
import org.eclipse.core.runtime.*;

        

            

              
              
              17
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          17
          
import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;

          18
          
import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;

        

        

          18
          
import org.eclipse.equinox.internal.p2.update.*;

          19
          
import org.eclipse.equinox.internal.p2.update.*;

        

            

              19
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          20
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

          20
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

        

        

          21
          
import org.eclipse.equinox.p2.core.ProvisionException;

          21
          
import org.eclipse.equinox.p2.core.ProvisionException;

        

        

          22
          
import org.eclipse.osgi.util.NLS;

          22
          
import org.eclipse.osgi.util.NLS;

        



(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/SourceManipulator.java
      (-7 / +8 lines)




  

    
      
            Lines 1-5
          
      
      
        Link Here
      
    
  

        

          1
          
/*******************************************************************************

          1
          
/*******************************************************************************

        

          
            

              2
              
 * Copyright (c) 2008 IBM Corporation and others. All rights reserved. This


              2
              
 * Copyright (c) 2008, 2010 IBM Corporation and others. All rights reserved. This

            

        

          3
          
 * program and the accompanying materials are made available under the terms of

          3
          
 * program and the accompanying materials are made available under the terms of

        

        

          4
          
 * the Eclipse Public License v1.0 which accompanies this distribution, and is

          4
          
 * the Eclipse Public License v1.0 which accompanies this distribution, and is

        

        

          5
          
 * available at http://www.eclipse.org/legal/epl-v10.html

          5
          
 * available at http://www.eclipse.org/legal/epl-v10.html

        

  

    
      
            Lines 8-21
          
      
      
        Link Here
      
    
  

        

          8
          
 ******************************************************************************/

          8
          
 ******************************************************************************/

        

        

          9
          
package org.eclipse.equinox.internal.p2.touchpoint.eclipse;

          9
          
package org.eclipse.equinox.internal.p2.touchpoint.eclipse;

        

        

          10
          

          10
          

        

          
            

              11
              
import java.io.File;


              11
              
import java.io.*;

            

            

              12
              
import java.io.IOException;


              
              
            

        

          13
          
import java.net.MalformedURLException;

          12
          
import java.net.MalformedURLException;

        

        

          14
          
import java.util.*;

          13
          
import java.util.*;

        

          
            

              15
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;


              14
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          16
          
import org.eclipse.equinox.internal.simpleconfigurator.manipulator.SimpleConfiguratorManipulatorImpl;

          15
          
import org.eclipse.equinox.internal.simpleconfigurator.manipulator.SimpleConfiguratorManipulatorImpl;

        

        

          17
          
import org.eclipse.equinox.p2.engine.IProfile;

          16
          
import org.eclipse.equinox.p2.engine.IProfile;

        

        

          18
          
import org.eclipse.equinox.p2.metadata.Version;

          17
          
import org.eclipse.equinox.p2.metadata.Version;

        

            

              
              
              18
              
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;

            

        

          19
          

          19
          

        

        

          20
          
//This class deals with source bundles and how their addition to the source.info

          20
          
//This class deals with source bundles and how their addition to the source.info

        

        

          21
          
public class SourceManipulator {

          21
          
public class SourceManipulator {

        

  

    
      
            Lines 58-75
          
      
      
        Link Here
      
    
  

        

          58
          

          58
          

        

        

          59
          
	public void save() throws IOException {

          59
          
	public void save() throws IOException {

        

        

          60
          
		if (sourceBundles != null)

          60
          
		if (sourceBundles != null)

        

          
            

              61
              
			manipulator.saveConfiguration(sourceBundles.toArray(new BundleInfo[sourceBundles.size()]), getFileLocation(), getLauncherLocation());


              61
              
			manipulator.saveConfiguration(sourceBundles.toArray(new BundleInfo[sourceBundles.size()]), getFileLocation(), getLauncherLocation().toURI());

            

        

          62
          
	}

          62
          
	}

        

        

          63
          

          63
          

        

        

          64
          
	private void load() throws MalformedURLException, IOException {

          64
          
	private void load() throws MalformedURLException, IOException {

        

        

          65
          
		if (getFileLocation().exists())

          65
          
		if (getFileLocation().exists())

        

          
            

              66
              
			sourceBundles = new ArrayList<BundleInfo>(Arrays.asList(manipulator.loadConfiguration(getFileLocation().toURL(), getLauncherLocation())));


              66
              
			//input stream is bufferd and closed for us

            

            

              
              

              67
              
			sourceBundles = new ArrayList<BundleInfo>(Arrays.asList(manipulator.loadConfiguration(new FileInputStream(getFileLocation()), getLauncherLocation().toURI())));

            

        

          67
          
		else

          68
          
		else

        

        

          68
          
			sourceBundles = new ArrayList<BundleInfo>();

          69
          
			sourceBundles = new ArrayList<BundleInfo>();

        

        

          69
          
	}

          70
          
	}

        

        

          70
          

          71
          

        

        

          71
          
	private File getFileLocation() {

          72
          
	private File getFileLocation() {

        

          
            

              72
              
		return new File(Util.getConfigurationFolder(profile), "org.eclipse.equinox.source/source.info"); //$NON-NLS-1$


              73
              
		return new File(Util.getConfigurationFolder(profile), SimpleConfiguratorManipulator.SOURCE_INFO_PATH);

            

        

          73
          
	}

          74
          
	}

        

        

          74
          

          75
          

        

        

          75
          
	private File getLauncherLocation() {

          76
          
	private File getLauncherLocation() {

        



(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/Util.java
      (-2 / +2 lines)




  

    
      
            Lines 1-5
          
      
      
        Link Here
      
    
  

        

          1
          
/*******************************************************************************

          1
          
/*******************************************************************************

        

          
            

              2
              
 *  Copyright (c) 2007, 2009 IBM Corporation and others.


              2
              
 *  Copyright (c) 2007, 2010 IBM Corporation and others.

            

        

          3
          
 *  All rights reserved. This program and the accompanying materials

          3
          
 *  All rights reserved. This program and the accompanying materials

        

        

          4
          
 *  are made available under the terms of the Eclipse Public License v1.0

          4
          
 *  are made available under the terms of the Eclipse Public License v1.0

        

        

          5
          
 *  which accompanies this distribution, and is available at

          5
          
 *  which accompanies this distribution, and is available at

        

  

    
      
            Lines 16-23
          
      
      
        Link Here
      
    
  

        

          16
          
import java.net.*;

          16
          
import java.net.*;

        

        

          17
          
import java.util.*;

          17
          
import java.util.*;

        

        

          18
          
import org.eclipse.core.runtime.*;

          18
          
import org.eclipse.core.runtime.*;

        

            

              
              
              19
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          19
          
import org.eclipse.equinox.internal.p2.core.helpers.*;

          20
          
import org.eclipse.equinox.internal.p2.core.helpers.*;

        

            

              20
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          21
          
import org.eclipse.equinox.p2.core.*;

          21
          
import org.eclipse.equinox.p2.core.*;

        

        

          22
          
import org.eclipse.equinox.p2.engine.IProfile;

          22
          
import org.eclipse.equinox.p2.engine.IProfile;

        

        

          23
          
import org.eclipse.equinox.p2.metadata.*;

          23
          
import org.eclipse.equinox.p2.metadata.*;

        



(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/WhatIsRunning.java
      (-1 / +3 lines)




  

    
      
            Lines 8-14
          
      
      
        Link Here
      
    
  

        

          8
          
 ******************************************************************************/

          8
          
 ******************************************************************************/

        

        

          9
          
package org.eclipse.equinox.internal.p2.touchpoint.eclipse;

          9
          
package org.eclipse.equinox.internal.p2.touchpoint.eclipse;

        

        

          10
          

          10
          

        

          
            

              11
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;


              11
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

            

              
              

              12
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.FrameworkAdmin;

            

            


              13
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

            

        

          12
          

          14
          

        

        

          13
          
public class WhatIsRunning {

          15
          
public class WhatIsRunning {

        

        

          14
          
	public BundleInfo[] getBundlesBeingRun() {

          16
          
	public BundleInfo[] getBundlesBeingRun() {

        



(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/InstallBundleAction.java
      (-3 / +2 lines)




  

    
      
            Lines 8-29
          
      
      
        Link Here
      
    
  

        

          8
          
 ******************************************************************************/

          8
          
 ******************************************************************************/

        

        

          9
          
package org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions;

          9
          
package org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions;

        

        

          10
          

          10
          

        

            

              11
              
import org.eclipse.equinox.p2.query.QueryUtil;

              
              
            

            

              12
              

            

        

          13
          
import java.io.File;

          11
          
import java.io.File;

        

        

          14
          
import java.util.Collection;

          12
          
import java.util.Collection;

        

        

          15
          
import java.util.Map;

          13
          
import java.util.Map;

        

        

          16
          
import org.eclipse.core.runtime.IStatus;

          14
          
import org.eclipse.core.runtime.IStatus;

        

        

          17
          
import org.eclipse.core.runtime.Status;

          15
          
import org.eclipse.core.runtime.Status;

        

            

              
              
              16
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

          17
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

        

        

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

        

            

              20
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          21
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

        

        

          22
          
import org.eclipse.equinox.p2.core.IProvisioningAgent;

          20
          
import org.eclipse.equinox.p2.core.IProvisioningAgent;

        

        

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

          21
          
import org.eclipse.equinox.p2.engine.IProfile;

        

        

          24
          
import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;

          22
          
import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;

        

        

          25
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

          23
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

        

        

          26
          
import org.eclipse.equinox.p2.metadata.IInstallableUnit;

          24
          
import org.eclipse.equinox.p2.metadata.IInstallableUnit;

        

            

              
              
              25
              
import org.eclipse.equinox.p2.query.QueryUtil;

            

        

          27
          
import org.eclipse.osgi.util.NLS;

          26
          
import org.eclipse.osgi.util.NLS;

        

        

          28
          

          27
          

        

        

          29
          
public class InstallBundleAction extends ProvisioningAction {

          28
          
public class InstallBundleAction extends ProvisioningAction {

        



(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/MarkStartedAction.java
      (-1 / +1 lines)




  

    
      
            Lines 15-23
          
      
      
        Link Here
      
    
  

        

          15
          
import java.util.Map;

          15
          
import java.util.Map;

        

        

          16
          
import org.eclipse.core.runtime.IStatus;

          16
          
import org.eclipse.core.runtime.IStatus;

        

        

          17
          
import org.eclipse.core.runtime.Status;

          17
          
import org.eclipse.core.runtime.Status;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

        

        

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

        

            

              20
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          21
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

          21
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

        

        

          22
          
import org.eclipse.equinox.p2.core.IProvisioningAgent;

          22
          
import org.eclipse.equinox.p2.core.IProvisioningAgent;

        

        

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

        



(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/SetStartLevelAction.java
      (-1 / +1 lines)




  

    
      
            Lines 15-23
          
      
      
        Link Here
      
    
  

        

          15
          
import java.util.Map;

          15
          
import java.util.Map;

        

        

          16
          
import org.eclipse.core.runtime.IStatus;

          16
          
import org.eclipse.core.runtime.IStatus;

        

        

          17
          
import org.eclipse.core.runtime.Status;

          17
          
import org.eclipse.core.runtime.Status;

        

            

              
              
              18
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

        

        

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

          20
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

        

            

              20
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          21
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

          21
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

        

        

          22
          
import org.eclipse.equinox.p2.core.IProvisioningAgent;

          22
          
import org.eclipse.equinox.p2.core.IProvisioningAgent;

        

        

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

        



(-)src/org/eclipse/equinox/internal/p2/touchpoint/eclipse/actions/UninstallBundleAction.java
      (-3 / +2 lines)




  

    
      
            Lines 8-29
          
      
      
        Link Here
      
    
  

        

          8
          
 ******************************************************************************/

          8
          
 ******************************************************************************/

        

        

          9
          
package org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions;

          9
          
package org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions;

        

        

          10
          

          10
          

        

            

              11
              
import org.eclipse.equinox.p2.query.QueryUtil;

              
              
            

            

              12
              

            

        

          13
          
import java.io.File;

          11
          
import java.io.File;

        

        

          14
          
import java.util.Collection;

          12
          
import java.util.Collection;

        

        

          15
          
import java.util.Map;

          13
          
import java.util.Map;

        

        

          16
          
import org.eclipse.core.runtime.IStatus;

          14
          
import org.eclipse.core.runtime.IStatus;

        

        

          17
          
import org.eclipse.core.runtime.Status;

          15
          
import org.eclipse.core.runtime.Status;

        

            

              
              
              16
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

          17
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.EclipseTouchpoint;

        

        

          19
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

          18
          
import org.eclipse.equinox.internal.p2.touchpoint.eclipse.Util;

        

            

              20
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

              
              
            

        

          21
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.Manipulator;

        

        

          22
          
import org.eclipse.equinox.p2.core.IProvisioningAgent;

          20
          
import org.eclipse.equinox.p2.core.IProvisioningAgent;

        

        

          23
          
import org.eclipse.equinox.p2.engine.IProfile;

          21
          
import org.eclipse.equinox.p2.engine.IProfile;

        

        

          24
          
import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;

          22
          
import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;

        

        

          25
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

          23
          
import org.eclipse.equinox.p2.metadata.IArtifactKey;

        

        

          26
          
import org.eclipse.equinox.p2.metadata.IInstallableUnit;

          24
          
import org.eclipse.equinox.p2.metadata.IInstallableUnit;

        

            

              
              
              25
              
import org.eclipse.equinox.p2.query.QueryUtil;

            

        

          27
          
import org.eclipse.osgi.util.NLS;

          26
          
import org.eclipse.osgi.util.NLS;

        

        

          28
          

          27
          

        

        

          29
          
public class UninstallBundleAction extends ProvisioningAction {

          28
          
public class UninstallBundleAction extends ProvisioningAction {

        



(-).settings/org.eclipse.jdt.core.prefs
      (-244 / +257 lines)




  

    
      
            Lines 1-270
          
      
      
        Link Here
      
    
  

          
            

              1
              
#Wed Jan 07 13:39:09 EST 2009


              1
              
#Thu Mar 04 09:52:05 EST 2010

            

            

              2
              
eclipse.preferences.version=1


              2
              
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

            

            

              3
              
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled


              3
              
org.eclipse.jdt.core.formatter.join_lines_in_comments=true

            

            

              4
              
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2


              4
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

            

            

              5
              
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve


              5
              
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

            

            

              
              

              6
              
org.eclipse.jdt.core.formatter.comment.indent_root_tags=false

            

            


              7
              
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

            

            


              8
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

            

            


              9
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

            

            


              10
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

            

            


              11
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

            

            


              12
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

            

            


              13
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert

            

        

          6
          
org.eclipse.jdt.core.compiler.compliance=1.4

          14
          
org.eclipse.jdt.core.compiler.compliance=1.4

        

          
            

              7
              
org.eclipse.jdt.core.compiler.debug.lineNumber=generate


              15
              
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

            

            

              8
              
org.eclipse.jdt.core.compiler.debug.localVariable=generate


              16
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

            

            

              9
              
org.eclipse.jdt.core.compiler.debug.sourceFile=generate


              17
              
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

            

            

              10
              
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning


              18
              
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

            

            

              11
              
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning


              19
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

            

            

              12
              
org.eclipse.jdt.core.compiler.source=1.3


              20
              
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

            

            

              13
              
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false


              21
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

            

            

              
              

              22
              
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

            

            


              23
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

            

            


              24
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

            

            


              25
              
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

            

        

          14
          
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

          26
          
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

        

          
            

              15
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16


              27
              
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert

            

            

              16
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16


              28
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

            

            

              17
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16


              29
              
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

            

            

              18
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16


              30
              
org.eclipse.jdt.core.formatter.blank_lines_before_method=1

            

            

              19
              
org.eclipse.jdt.core.formatter.alignment_for_assignment=0


              31
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

            

            

              20
              
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16


              32
              
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

            

            

              21
              
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16


              33
              
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

            

            

              22
              
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80


              34
              
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled

            

            

              
              

              35
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

            

            


              36
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

            

            


              37
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

            

            


              38
              
org.eclipse.jdt.core.formatter.comment.format_html=true

            

            


              39
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

            

            


              40
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

            

            


              41
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

            

            


              42
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

            

            


              43
              
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1

            

            


              44
              
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

            

            


              45
              
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

            

            


              46
              
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

            

            


              47
              
org.eclipse.jdt.core.compiler.debug.localVariable=generate

            

            


              48
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

            

            


              49
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

            

            


              50
              
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

            

            


              51
              
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

            

            


              52
              
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

            

        

          23
          
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

          53
          
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

        

          
            

              24
              
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16


              54
              
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

            

            

              25
              
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16


              55
              
org.eclipse.jdt.core.formatter.tabulation.size=4

            

            

              26
              
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16


              56
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

            

            

              
              

              57
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

            

            


              58
              
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false

            

            


              59
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

            

            


              60
              
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert

            

            


              61
              
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

            

            


              62
              
org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

            

            


              63
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

            

            


              64
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

            

            


              65
              
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

            

            


              66
              
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

            

            


              67
              
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false

            

            


              68
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

            

            


              69
              
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

            

            


              70
              
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled

            

            


              71
              
org.eclipse.jdt.core.formatter.tabulation.char=tab

            

            


              72
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

            

            


              73
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

            

            


              74
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

            

            


              75
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

            

            


              76
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

            

            


              77
              
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled

            

            


              78
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

            

            


              79
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

            

            


              80
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

            

            


              81
              
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert

            

            


              82
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

            

            


              83
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

            

        

          27
          
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

          84
          
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

        

          
            

              28
              
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16


              85
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

            

            

              29
              
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16


              86
              
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

            

            

              30
              
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16


              87
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

            

        

          31
          
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

          88
          
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

        

          
            

              32
              
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16


              89
              
org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

            

            

              33
              
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16


              90
              
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

            

            

              34
              
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1


              91
              
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

            

            

              35
              
org.eclipse.jdt.core.formatter.blank_lines_after_package=1


              92
              
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

            

            

              36
              
org.eclipse.jdt.core.formatter.blank_lines_before_field=0


              93
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

            

            

              37
              
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0


              94
              
org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

            

            

              
              

              95
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

            

            


              96
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

            

            


              97
              
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

            

            


              98
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

            

            


              99
              
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

            

            


              100
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

            

            


              101
              
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

            

            


              102
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

            

        

          38
          
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

          103
          
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

        

            

              
              
              104
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert

            

            

              105
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

            

            

              106
              
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

            

            

              107
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

            

            

              108
              
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

            

            

              109
              
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled

            

            

              110
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

            

            

              111
              
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

            

            

              112
              
org.eclipse.jdt.core.formatter.join_wrapped_lines=true

            

            

              113
              
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

            

            

              114
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

            

        

          39
          
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

          115
          
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

        

          
            

              40
              
org.eclipse.jdt.core.formatter.blank_lines_before_method=1


              116
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

            

            

              41
              
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1


              117
              
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

            

            

              42
              
org.eclipse.jdt.core.formatter.blank_lines_before_package=0


              118
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

            

            

              43
              
org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1


              119
              
org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

            

            

              44
              
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1


              120
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

            

            

              45
              
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line


              121
              
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false

            

            

              46
              
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line


              122
              
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

            

            

              
              

              123
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

            

        

          47
          
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

          124
          
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

        

            

              48
              
org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

              
              
            

            

              49
              
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

            

            

              50
              
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

            

            

              51
              
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

            

            

              52
              
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

            

            

              53
              
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

            

            

              54
              
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

            

            

              55
              
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

            

            

              56
              
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

            

            

              57
              
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

            

            

              58
              
org.eclipse.jdt.core.formatter.comment.format_block_comments=false

            

            

              59
              
org.eclipse.jdt.core.formatter.comment.format_header=false

            

            

              60
              
org.eclipse.jdt.core.formatter.comment.format_html=true

            

            

              61
              
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false

            

            

              62
              
org.eclipse.jdt.core.formatter.comment.format_line_comments=false

            

            

              63
              
org.eclipse.jdt.core.formatter.comment.format_source_code=true

            

            

              64
              
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false

            

            

              65
              
org.eclipse.jdt.core.formatter.comment.indent_root_tags=false

            

            

              66
              
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

            

            

              67
              
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert

            

            

              68
              
org.eclipse.jdt.core.formatter.comment.line_length=80

            

            

              69
              
org.eclipse.jdt.core.formatter.compact_else_if=true

            

            

              70
              
org.eclipse.jdt.core.formatter.continuation_indentation=2

            

            

              71
              
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

            

            

              72
              
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

            

            

              73
              
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

            

        

          74
          
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

          125
          
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

        

            

              75
              
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

              
              
            

        

          76
          
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

          126
          
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

        

          
            

              77
              
org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true


              127
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

            

            

              78
              
org.eclipse.jdt.core.formatter.indent_empty_lines=false


              128
              
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public

            

            

              79
              
org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true


              129
              
org.eclipse.jdt.core.formatter.blank_lines_before_field=0

            

            

              80
              
org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true


              130
              
org.eclipse.jdt.core.compiler.debug.sourceFile=generate

            

            

              81
              
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true


              
              
            

            

              82
              
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true


            

            

              83
              
org.eclipse.jdt.core.formatter.indentation.size=4


            

            

              84
              
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert


            

            

              85
              
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert


            

            

              86
              
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert


            

            

              87
              
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert


            

            

              88
              
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert


            

            

              89
              
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert


            

            

              90
              
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert


            

            

              91
              
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert


            

            

              92
              
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert


            

            

              93
              
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert


            

            

              94
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert


            

            

              95
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert


            

            

              96
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert


            

            

              97
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert


            

            

              98
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert


            

            

              99
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert


            

        

          100
          
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

          131
          
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

        

          
            

              101
              
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert


              132
              
org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

            

            

              102
              
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert


              133
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

            

            

              103
              
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert


              
              
            

            

              104
              
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert


            

            

              105
              
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert


            

            

              106
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert


            

            

              107
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert


            

            

              108
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert


            

            

              109
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert


            

            

              110
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert


            

        

          111
          
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

          134
          
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

        

          
            

              112
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert


              135
              
org.eclipse.jdt.core.formatter.comment.format_block_comments=false

            

            

              113
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert


              136
              
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

            

            

              114
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert


              137
              
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

            

            

              115
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert


              138
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

            

        

          116
          
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

          139
          
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

        

          
            

              117
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert


              140
              
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

            

            

              118
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert


              141
              
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false

            

            

              119
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert


              142
              
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

            

            

              
              

              143
              
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

            

            


              144
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

            

        

          120
          
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

          145
          
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

        

            

              121
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

              
              
            

            

              122
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

            

            

              123
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

            

            

              124
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

            

            

              125
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

            

            

              126
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

            

            

              127
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

            

            

              128
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

            

            

              129
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

            

            

              130
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

            

            

              131
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

            

            

              132
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

            

            

              133
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

            

            

              134
              
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

            

            

              135
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

            

            

              136
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

            

            

              137
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

            

            

              138
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert

            

            

              139
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

            

            

              140
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

            

            

              141
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

            

            

              142
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

            

            

              143
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

            

            

              144
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

            

            

              145
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

            

            

              146
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

            

            

              147
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

            

            

              148
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

            

            

              149
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

            

        

          150
          
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

          146
          
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

        

          
            

              151
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert


              147
              
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

            

            

              152
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert


              148
              
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

            

            

              153
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert


              149
              
org.eclipse.jdt.core.formatter.lineSplit=800

            

            

              154
              
org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert


              150
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

            

            

              155
              
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert


              
              
            

        

          156
          
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

          151
          
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

        

            

              
              
              152
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

            

        

          157
          
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

          153
          
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

        

          
            

              158
              
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert


              154
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

            

            

              159
              
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert


              155
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

            

            

              160
              
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert


              156
              
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

            

            

              161
              
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert


              157
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

            

            

              162
              
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert


              158
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

            

            

              163
              
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert


              159
              
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

            

            

              164
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert


              160
              
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

            

            

              165
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert


              161
              
org.eclipse.jdt.core.compiler.debug.lineNumber=generate

            

            

              166
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert


              
              
            

            

              167
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert


            

            

              168
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert


            

            

              169
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert


            

            

              170
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert


            

        

          171
          
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

          162
          
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

        

          
            

              172
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert


              163
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

            

            

              173
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert


              
              
            

            

              174
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert


            

            

              175
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert


            

            

              176
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert


            

            

              177
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert


            

        

          178
          
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

          164
          
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

        

            

              179
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

              
              
            

            

              180
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

            

            

              181
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

            

            

              182
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

            

            

              183
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

            

            

              184
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert

            

            

              185
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

            

            

              186
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert

            

            

              187
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

            

            

              188
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

            

            

              189
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

            

            

              190
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

            

            

              191
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

            

            

              192
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

            

        

          193
          
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

          165
          
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

        

            

              194
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

              
              
            

            

              195
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

            

            

              196
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

            

            

              197
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

            

            

              198
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

            

            

              199
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

            

            

              200
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

            

            

              201
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

            

            

              202
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

            

            

              203
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

            

            

              204
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

            

            

              205
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

            

            

              206
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

            

            

              207
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

            

            

              208
              
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

            

            

              209
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

            

            

              210
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

            

            

              211
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

            

            

              212
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

            

            

              213
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

            

            

              214
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

            

            

              215
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

            

            

              216
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

            

            

              217
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

            

        

          218
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

          166
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

        

          
            

              219
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert


              167
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert

            

            

              220
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert


              168
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

            

            

              221
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert


              169
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

            

            

              
              

              170
              
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

            

        

          222
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

          171
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

        

          
            

              223
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert


              172
              
org.eclipse.jdt.core.formatter.blank_lines_before_package=0

            

            

              
              

              173
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

            

            


              174
              
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

            

            


              175
              
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore

            

            


              176
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

            

            


              177
              
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

            

            


              178
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

            

            


              179
              
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

            

            


              180
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

            

            


              181
              
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

            

            


              182
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

            

            


              183
              
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

            

            


              184
              
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

            

            


              185
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

            

            


              186
              
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

            

            


              187
              
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

            

            


              188
              
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

            

            


              189
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

            

            


              190
              
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

            

            


              191
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

            

            


              192
              
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public

            

            


              193
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

            

            


              194
              
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

            

            


              195
              
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

            

            


              196
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

            

            


              197
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

            

            


              198
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

            

            


              199
              
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true

            

            


              200
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

            

            


              201
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

            

            


              202
              
org.eclipse.jdt.core.formatter.comment.format_header=false

            

        

          224
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

          203
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

        

            

              
              
              204
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

            

            

              205
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

            

            

              206
              
eclipse.preferences.version=1

            

            

              207
              
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

            

            

              208
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

            

            

              209
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

            

            

              210
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

            

            

              211
              
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

            

            

              212
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

            

            

              213
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert

            

            

              214
              
org.eclipse.jdt.core.compiler.doc.comment.support=enabled

            

            

              215
              
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled

            

            

              216
              
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

            

            

              217
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

            

            

              218
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

            

            

              219
              
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

            

            

              220
              
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning

            

            

              221
              
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

            

            

              222
              
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

            

            

              223
              
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert

            

            

              224
              
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

            

            

              225
              
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error

            

        

          225
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

          226
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

        

          
            

              226
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert


              227
              
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

            

            

              227
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert


              228
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

            

            

              228
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert


              229
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

            

            

              229
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert


              230
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

            

            

              230
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert


              231
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

            

            

              231
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert


              232
              
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

            

            

              232
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert


              233
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

            

            

              233
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert


              234
              
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

            

            

              234
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert


              235
              
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false

            

            

              235
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert


              
              
            

            

              236
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert


            

            

              237
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert


            

        

          238
          
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

          236
          
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

        

          
            

              239
              
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert


              237
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

            

            

              240
              
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert


              238
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

            

            

              241
              
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert


              239
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

            

            

              242
              
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert


              240
              
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag

            

            

              243
              
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert


              241
              
org.eclipse.jdt.core.formatter.blank_lines_after_package=1

            

            

              
              

              242
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

            

            


              243
              
org.eclipse.jdt.core.formatter.indentation.size=4

            

            


              244
              
org.eclipse.jdt.core.formatter.alignment_for_assignment=0

            

            


              245
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

            

            


              246
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert

            

            


              247
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

            

            


              248
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

            

            


              249
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

            

            


              250
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

            

            


              251
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

            

            


              252
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

            

            


              253
              
org.eclipse.jdt.core.formatter.indent_empty_lines=false

            

            


              254
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

            

            


              255
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

            

            


              256
              
org.eclipse.jdt.core.formatter.comment.format_line_comments=false

            

        

          244
          
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

          257
          
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

        

          
            

              245
              
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert


              258
              
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

            

            

              246
              
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert


              259
              
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

            

            

              247
              
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert


              260
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

            

            

              248
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert


              261
              
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

            

            

              249
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert


              262
              
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

            

            

              250
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert


              263
              
org.eclipse.jdt.core.formatter.compact_else_if=true

            

            

              251
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert


              264
              
org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

            

            

              252
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert


              265
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

            

            

              253
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert


              266
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

            

            

              254
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert


              267
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

            

            

              255
              
org.eclipse.jdt.core.formatter.join_lines_in_comments=true


              268
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

            

            

              256
              
org.eclipse.jdt.core.formatter.join_wrapped_lines=true


              269
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

            

            

              257
              
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false


              270
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

            

            

              258
              
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false


              271
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

            

            

              259
              
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false


              272
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

            

            

              260
              
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false


              273
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

            

            

              261
              
org.eclipse.jdt.core.formatter.lineSplit=800


              274
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

            

            

              262
              
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false


              275
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

            

            

              263
              
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false


              276
              
org.eclipse.jdt.core.compiler.source=1.3

            

            

              264
              
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0


              277
              
org.eclipse.jdt.core.formatter.comment.format_source_code=true

            

            

              265
              
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1


              278
              
org.eclipse.jdt.core.formatter.comment.line_length=80

            

            

              266
              
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false


              279
              
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

            

            

              267
              
org.eclipse.jdt.core.formatter.tabulation.char=tab


              280
              
org.eclipse.jdt.core.formatter.continuation_indentation=2

            

            

              268
              
org.eclipse.jdt.core.formatter.tabulation.size=4


              281
              
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

            

            

              269
              
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false


              282
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

            

            

              270
              
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true


              283
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

            



(-)META-INF/MANIFEST.MF
      (-1 / +1 lines)




  

    
      
            Lines 20-26
          
      
      
        Link Here
      
    
  

        

          20
          
   org.eclipse.equinox.p2.operations,

          20
          
   org.eclipse.equinox.p2.operations,

        

        

          21
          
   org.eclipse.equinox.p2.ui,

          21
          
   org.eclipse.equinox.p2.ui,

        

        

          22
          
   org.eclipse.equinox.p2.director",

          22
          
   org.eclipse.equinox.p2.director",

        

          
            

              23
              
 org.eclipse.equinox.internal.simpleconfigurator;x-internal:=true,


              23
              
 org.eclipse.equinox.internal.simpleconfigurator;x-friends:="org.eclipse.equinox.simpleconfigurator.manipulator",

            

        

          24
          
 org.eclipse.equinox.internal.simpleconfigurator.console;x-internal:=true,

          24
          
 org.eclipse.equinox.internal.simpleconfigurator.console;x-internal:=true,

        

        

          25
          
 org.eclipse.equinox.internal.simpleconfigurator.utils;x-friends:="org.eclipse.equinox.simpleconfigurator.manipulator"

          25
          
 org.eclipse.equinox.internal.simpleconfigurator.utils;x-friends:="org.eclipse.equinox.simpleconfigurator.manipulator"

        

        

          26
          
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,

          26
          
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,

        



(-)src/org/eclipse/equinox/internal/provisional/configurator/Configurator.java
      (-2 / +2 lines)




  

    
      
            Lines 36-42
          
      
      
        Link Here
      
    
  

        

          36
          
 * 

          36
          
 * 

        

        

          37
          
 * At its stopping, the service registered will be unregistered.

          37
          
 * At its stopping, the service registered will be unregistered.

        

        

          38
          
 * 

          38
          
 * 

        

          
            

              39
              
 * @see ConfiguratorManipulator


              39
              
 * see org.eclipse.equinox.internal.provisional.configuratormanipulato.ConfiguratorManipulator

            

        

          40
          
 *

          40
          
 *

        

        

          41
          
 */

          41
          
 */

        

        

          42
          
public interface Configurator {

          42
          
public interface Configurator {

        

  

    
      
            Lines 62-68
          
      
      
        Link Here
      
    
  

        

          62
          
	 * Return the url in use.

          62
          
	 * Return the url in use.

        

        

          63
          
	 * If it is never used, return null.

          63
          
	 * If it is never used, return null.

        

        

          64
          
	 * 

          64
          
	 * 

        

          
            

              65
              
	 * @return


              65
              
	 * @return URL

            

        

          66
          
	 */

          66
          
	 */

        

        

          67
          
	URL getUrlInUse();

          67
          
	URL getUrlInUse();

        

        

          68
          
}

          68
          
}

        



(-)src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
      (-1 / +1 lines)




  

    
      
            Lines 47-53
          
      
      
        Link Here
      
    
  

        

          47
          
		this.bundle = bundle;

          47
          
		this.bundle = bundle;

        

        

          48
          
	}

          48
          
	}

        

        

          49
          

          49
          

        

          
            

              50
              
	private URL getConfigurationURL() throws IOException {


              50
              
	public URL getConfigurationURL() throws IOException {

            

        

          51
          
		String specifiedURL = context.getProperty(SimpleConfiguratorConstants.PROP_KEY_CONFIGURL);

          51
          
		String specifiedURL = context.getProperty(SimpleConfiguratorConstants.PROP_KEY_CONFIGURL);

        

        

          52
          
		if (specifiedURL == null)

          52
          
		if (specifiedURL == null)

        

        

          53
          
			specifiedURL = "file:" + SimpleConfiguratorConstants.CONFIGURATOR_FOLDER + "/" + SimpleConfiguratorConstants.CONFIG_LIST;

          53
          
			specifiedURL = "file:" + SimpleConfiguratorConstants.CONFIGURATOR_FOLDER + "/" + SimpleConfiguratorConstants.CONFIG_LIST;

        



(-)src/org/eclipse/equinox/internal/simpleconfigurator/console/ConfiguratorCommandProvider.java
      (-1 / +1 lines)




  

    
      
            Lines 41-47
          
      
      
        Link Here
      
    
  

        

          41
          

          41
          

        

        

          42
          
	/**

          42
          
	/**

        

        

          43
          
	 * Apply the current configuration

          43
          
	 * Apply the current configuration

        

          
            

              44
              
	 * @param configuration URL (optional)


              44
              
	 * @param interpreter 

            

        

          45
          
	 */

          45
          
	 */

        

        

          46
          
	public void _confapply(CommandInterpreter interpreter) {

          46
          
	public void _confapply(CommandInterpreter interpreter) {

        

        

          47
          
		String parameter = interpreter.nextArgument();

          47
          
		String parameter = interpreter.nextArgument();

        



(-)src/org/eclipse/equinox/internal/simpleconfigurator/utils/EquinoxUtils.java
      (-16 / +20 lines)




  

    
      
            Lines 1-5
          
      
      
        Link Here
      
    
  

        

          1
          
/*******************************************************************************

          1
          
/*******************************************************************************

        

          
            

              2
              
 * Copyright (c) 2007, 2008 IBM Corporation and others. All rights reserved.


              2
              
 * Copyright (c) 2007, 2010 IBM Corporation and others. All rights reserved.

            

        

          3
          
 * This program and the accompanying materials are made available under the

          3
          
 * This program and the accompanying materials are made available under the

        

        

          4
          
 * terms of the Eclipse Public License v1.0 which accompanies this distribution,

          4
          
 * terms of the Eclipse Public License v1.0 which accompanies this distribution,

        

        

          5
          
 * and is available at http://www.eclipse.org/legal/epl-v10.html

          5
          
 * and is available at http://www.eclipse.org/legal/epl-v10.html

        

  

    
      
            Lines 18-23
          
      
      
        Link Here
      
    
  

        

          18
          
public class EquinoxUtils {

          18
          
public class EquinoxUtils {

        

        

          19
          

          19
          

        

        

          20
          
	public static URL[] getConfigAreaURL(BundleContext context) {

          20
          
	public static URL[] getConfigAreaURL(BundleContext context) {

        

            

              
              
              21
              
		Location configLocation = getConfigLocation(context);

            

            

              22
              
		if (configLocation == null)

            

            

              23
              
			return null;

            

            

              24
              

            

            

              25
              
		URL baseURL = configLocation.getURL();

            

            

              26
              
		if (configLocation.getParentLocation() != null && configLocation.getURL() != null) {

            

            

              27
              
			if (baseURL == null)

            

            

              28
              
				return new URL[] {configLocation.getParentLocation().getURL()};

            

            

              29
              
			else

            

            

              30
              
				return new URL[] {baseURL, configLocation.getParentLocation().getURL()};

            

            

              31
              
		}

            

            

              32
              
		if (baseURL != null)

            

            

              33
              
			return new URL[] {baseURL};

            

            

              34
              

            

            

              35
              
		return null;

            

            

              36
              
	}

            

            

              37
              

            

            

              38
              
	public static Location getConfigLocation(BundleContext context) {

            

        

          21
          
		Filter filter = null;

          39
          
		Filter filter = null;

        

        

          22
          
		try {

          40
          
		try {

        

        

          23
          
			filter = context.createFilter(Location.CONFIGURATION_FILTER);

          41
          
			filter = context.createFilter(Location.CONFIGURATION_FILTER);

        

  

    
      
            Lines 27-47
          
      
      
        Link Here
      
    
  

        

          27
          
		ServiceTracker configLocationTracker = new ServiceTracker(context, filter, null);

          45
          
		ServiceTracker configLocationTracker = new ServiceTracker(context, filter, null);

        

        

          28
          
		configLocationTracker.open();

          46
          
		configLocationTracker.open();

        

        

          29
          
		try {

          47
          
		try {

        

          
            

              30
              
			Location configLocation = (Location) configLocationTracker.getService();


              48
              
			return (Location) configLocationTracker.getService();

            

            

              31
              
			if (configLocation == null)


              
              
            

            

              32
              
				return null;


            

            

              33
              


            

            

              34
              
			URL baseURL = configLocation.getURL();


            

            

              35
              
			if (configLocation.getParentLocation() != null && configLocation.getURL() != null) {


            

            

              36
              
				if (baseURL == null)


            

            

              37
              
					return new URL[] {configLocation.getParentLocation().getURL()};


            

            

              38
              
				else


            

            

              39
              
					return new URL[] {baseURL, configLocation.getParentLocation().getURL()};


            

            

              40
              
			}


            

            

              41
              
			if (baseURL != null)


            

            

              42
              
				return new URL[] {baseURL};


            

            

              43
              


            

            

              44
              
			return null;


            

        

          45
          
		} finally {

          49
          
		} finally {

        

        

          46
          
			configLocationTracker.close();

          50
          
			configLocationTracker.close();

        

        

          47
          
		}

          51
          
		}

        



(-)src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
      (-7 / +25 lines)




  

    
      
            Lines 1-5
          
      
      
        Link Here
      
    
  

        

          1
          
/*******************************************************************************

          1
          
/*******************************************************************************

        

          
            

              2
              
 * Copyright (c) 2007, 2009 IBM Corporation and others. All rights reserved.


              2
              
 * Copyright (c) 2007, 2010 IBM Corporation and others. All rights reserved.

            

        

          3
          
 * This program and the accompanying materials are made available under the

          3
          
 * This program and the accompanying materials are made available under the

        

        

          4
          
 * terms of the Eclipse Public License v1.0 which accompanies this distribution,

          4
          
 * terms of the Eclipse Public License v1.0 which accompanies this distribution,

        

        

          5
          
 * and is available at http://www.eclipse.org/legal/epl-v10.html

          5
          
 * and is available at http://www.eclipse.org/legal/epl-v10.html

        

  

    
      
            Lines 28-46
          
      
      
        Link Here
      
    
  

        

          28
          
	private static final String ENCODED_COMMA = "%2C";

          28
          
	private static final String ENCODED_COMMA = "%2C";

        

        

          29
          

          29
          

        

        

          30
          
	public static List readConfiguration(URL url, URI base) throws IOException {

          30
          
	public static List readConfiguration(URL url, URI base) throws IOException {

        

          
            

              31
              
		List bundles = new ArrayList();


              31
              
		InputStream stream = null;

            

            

              32
              


              
              
            

            

              33
              
		BufferedReader r = null;


            

        

          34
          
		try {

          32
          
		try {

        

          
            

              35
              
			r = new BufferedReader(new InputStreamReader(url.openStream()));


              33
              
			stream = url.openStream();

            

        

          36
          
		} catch (IOException e) {

          34
          
		} catch (IOException e) {

        

        

          37
          
			// if the exception is a FNF we return an empty bundle list

          35
          
			// if the exception is a FNF we return an empty bundle list

        

        

          38
          
			if (e instanceof FileNotFoundException)

          36
          
			if (e instanceof FileNotFoundException)

        

          
            

              39
              
				return bundles;


              37
              
				return Collections.EMPTY_LIST;

            

        

          40
          
			throw e;

          38
          
			throw e;

        

        

          41
          
		}

          39
          
		}

        

            

              
              
              40
              

            

            

              41
              
		try {

            

            

              42
              
			return readConfiguration(stream, base);

            

            

              43
              
		} finally {

            

            

              44
              
			stream.close();

            

            

              45
              
		}

            

            

              46
              
	}

            

            

              47
              

            

            

              48
              
	/**

            

            

              49
              
	 * Read the configuration from the given InputStream

            

            

              50
              
	 * 

            

            

              51
              
	 * @param stream - the stream is always closed 

            

            

              52
              
	 * @param base

            

            

              53
              
	 * @return List of {@link BundleInfo}

            

            

              54
              
	 * @throws IOException

            

            

              55
              
	 */

            

            

              56
              
	public static List readConfiguration(InputStream stream, URI base) throws IOException {

            

            

              57
              
		List bundles = new ArrayList();

            

            

              58
              

            

            

              59
              
		BufferedReader r = new BufferedReader(new InputStreamReader(stream));

            

            

              60
              
		String line;

            

        

          42
          
		try {

          61
          
		try {

        

            

              43
              
			String line;

              
              
            

        

          44
          
			while ((line = r.readLine()) != null) {

          62
          
			while ((line = r.readLine()) != null) {

        

        

          45
          
				line = line.trim();

          63
          
				line = line.trim();

        

        

          46
          
				//ignore any comment or empty lines

          64
          
				//ignore any comment or empty lines

        



(-).settings/org.eclipse.jdt.core.prefs
      (-236 / +314 lines)




  

    
      
            Lines 1-265
          
      
      
        Link Here
      
    
  

          
            

              1
              
#Fri Nov 14 17:13:48 EST 2008


              1
              
#Thu Mar 04 09:59:51 EST 2010

            

            

              2
              
eclipse.preferences.version=1


              2
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert

            

            

              3
              
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled


              3
              
org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line

            

            

              4
              
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2


              4
              
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert

            

            

              5
              
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve


              5
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert

            

            

              6
              
org.eclipse.jdt.core.compiler.compliance=1.4


              6
              
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line

            

            

              7
              
org.eclipse.jdt.core.compiler.debug.lineNumber=generate


              7
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert

            

            

              8
              
org.eclipse.jdt.core.compiler.debug.localVariable=generate


              8
              
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning

            

            

              9
              
org.eclipse.jdt.core.compiler.debug.sourceFile=generate


              
              
            

            

              10
              
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning


            

            

              11
              
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning


            

            

              12
              
org.eclipse.jdt.core.compiler.source=1.3


            

            

              13
              
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false


            

            

              14
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16


            

            

              15
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16


            

            

              16
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16


            

            

              17
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16


            

            

              18
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16


            

        

          19
          
org.eclipse.jdt.core.formatter.alignment_for_assignment=0

          9
          
org.eclipse.jdt.core.formatter.alignment_for_assignment=0

        

          
            

              20
              
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16


              10
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

            

            

              21
              
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16


              11
              
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning

            

            

              22
              
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80


              12
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert

            

            

              23
              
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0


              13
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert

            

            

              24
              
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16


              14
              
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

            

            

              25
              
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16


              15
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert

            

            

              26
              
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16


              16
              
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning

            

            

              27
              
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16


              17
              
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false

            

            

              28
              
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16


              18
              
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true

            

            

              29
              
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16


              19
              
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert

            

            

              30
              
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16


              20
              
org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true

            

            

              31
              
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16


              21
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert

            

            

              32
              
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16


              22
              
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

            

            

              33
              
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16


              23
              
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public

            

            

              
              

              24
              
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert

            

            


              25
              
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning

            

            


              26
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert

            

            


              27
              
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert

            

            


              28
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert

            

            


              29
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

            

            


              30
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert

            

            


              31
              
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning

            

            


              32
              
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning

            

            


              33
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert

            

            


              34
              
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning

            

            


              35
              
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert

            

        

          34
          
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

          36
          
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1

        

          
            

              35
              
org.eclipse.jdt.core.formatter.blank_lines_after_package=1


              37
              
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

            

            

              36
              
org.eclipse.jdt.core.formatter.blank_lines_before_field=0


              38
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert

            

            

              37
              
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0


              39
              
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning

            

            

              38
              
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1


              40
              
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

            

            

              
              

              41
              
org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore

            

            


              42
              
org.eclipse.jdt.core.formatter.comment.format_source_code=true

            

            


              43
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert

            

            


              44
              
org.eclipse.jdt.core.compiler.debug.localVariable=generate

            

            


              45
              
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true

            

            


              46
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert

            

            


              47
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert

            

        

          39
          
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

          48
          
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1

        

          
            

              40
              
org.eclipse.jdt.core.formatter.blank_lines_before_method=1


              49
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert

            

            

              
              

              50
              
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

            

            


              51
              
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false

            

            


              52
              
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning

            

            


              53
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert

            

            


              54
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert

            

        

          41
          
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

          55
          
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1

        

          
            

              42
              
org.eclipse.jdt.core.formatter.blank_lines_before_package=0


              56
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

            

            

              43
              
org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1


              57
              
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1

            

            

              44
              
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1


              58
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert

            

            

              45
              
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line


              
              
            

            

              46
              
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line


            

            

              47
              
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line


            

            

              48
              
org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line


            

            

              49
              
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line


            

            

              50
              
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line


            

            

              51
              
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line


            

            

              52
              
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line


            

            

              53
              
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line


            

        

          54
          
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

          59
          
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line

        

          
            

              55
              
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line


              60
              
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

            

            

              56
              
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false


              
              
            

            

              57
              
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false


            

            

              58
              
org.eclipse.jdt.core.formatter.comment.format_block_comments=false


            

        

          59
          
org.eclipse.jdt.core.formatter.comment.format_header=true

          61
          
org.eclipse.jdt.core.formatter.comment.format_header=true

        

          
            

              60
              
org.eclipse.jdt.core.formatter.comment.format_html=true


              62
              
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert

            

            

              61
              
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false


              63
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert

            

            

              62
              
org.eclipse.jdt.core.formatter.comment.format_line_comments=false


              64
              
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert

            

            

              63
              
org.eclipse.jdt.core.formatter.comment.format_source_code=true


              65
              
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

            

            

              64
              
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false


              66
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert

            

            

              65
              
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true


              67
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert

            

            

              66
              
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert


              68
              
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert

            

            

              67
              
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert


              69
              
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning

            

            

              
              

              70
              
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

            

            


              71
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert

            

        

          68
          
org.eclipse.jdt.core.formatter.comment.line_length=80

          72
          
org.eclipse.jdt.core.formatter.comment.line_length=80

        

          
            

              69
              
org.eclipse.jdt.core.formatter.compact_else_if=true


              73
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

            

            

              70
              
org.eclipse.jdt.core.formatter.continuation_indentation=2


              
              
            

            

              71
              
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2


            

            

              72
              
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false


            

            

              73
              
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true


            

            

              74
              
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true


            

            

              75
              
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true


            

            

              76
              
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true


            

            

              77
              
org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true


            

            

              78
              
org.eclipse.jdt.core.formatter.indent_empty_lines=false


            

            

              79
              
org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true


            

            

              80
              
org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true


            

        

          81
          
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

          74
          
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true

        

          
            

              82
              
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true


              75
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert

            

            

              83
              
org.eclipse.jdt.core.formatter.indentation.size=4


              76
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert

            

            

              84
              
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert


              77
              
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled

            

            

              85
              
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert


              78
              
org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled

            

            

              86
              
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert


              79
              
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert

            

            

              87
              
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert


              
              
            

            

              88
              
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert


            

            

              89
              
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert


            

            

              90
              
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert


            

            

              91
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert


            

            

              92
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert


            

        

          93
          
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

          80
          
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert

        

          
            

              94
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert


              81
              
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert

            

            

              95
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert


              82
              
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

            

            

              96
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert


              83
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert

            

            

              
              

              84
              
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

            

            


              85
              
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert

            

            


              86
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert

            

            


              87
              
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

            

            


              88
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert

            

        

          97
          
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

          89
          
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert

        

          
            

              98
              
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert


              90
              
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning

            

            

              99
              
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert


              91
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert

            

            

              100
              
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert


              
              
            

            

              101
              
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert


            

            

              102
              
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert


            

            

              103
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert


            

            

              104
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert


            

            

              105
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert


            

            

              106
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert


            

            

              107
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert


            

            

              108
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert


            

            

              109
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert


            

            

              110
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert


            

            

              111
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert


            

            

              112
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert


            

            

              113
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert


            

            

              114
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert


            

        

          115
          
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

          92
          
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert

        

          
            

              116
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert


              93
              
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=false

            

            

              117
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert


              94
              
org.eclipse.jdt.core.formatter.continuation_indentation=2

            

            

              118
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert


              95
              
org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error

            

            

              119
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert


              96
              
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert

            

            

              120
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert


              97
              
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

            

            

              121
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert


              
              
            

            

              122
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert


            

            

              123
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert


            

            

              124
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert


            

            

              125
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert


            

            

              126
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert


            

        

          127
          
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

          98
          
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert

        

          
            

              128
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert


              99
              
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled

            

            

              129
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert


              100
              
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert

            

            

              130
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert


              101
              
org.eclipse.jdt.core.formatter.blank_lines_before_method=1

            

            

              131
              
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert


              102
              
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled

            

            

              132
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert


              103
              
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false

            

            

              133
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert


              104
              
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16

            

            

              134
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert


              105
              
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1

            

            

              
              

              106
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert

            

            


              107
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert

            

            


              108
              
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

            

            


              109
              
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert

            

            


              110
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert

            

            


              111
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

            

            


              112
              
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true

            

            


              113
              
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled

            

            


              114
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert

            

            


              115
              
org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error

            

            


              116
              
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

            

            


              117
              
org.eclipse.jdt.core.formatter.comment.format_block_comments=false

            

            


              118
              
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert

            

            


              119
              
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

            

            


              120
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert

            

            


              121
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert

            

            


              122
              
org.eclipse.jdt.core.formatter.comment.format_html=true

            

            


              123
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert

            

            


              124
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert

            

            


              125
              
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert

            

            


              126
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert

            

            


              127
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert

            

            


              128
              
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag

            

            


              129
              
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

            

            


              130
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert

            

            


              131
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert

            

            


              132
              
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore

            

            


              133
              
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore

            

            


              134
              
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning

            

            


              135
              
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore

            

        

          135
          
org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert

          136
          
org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do not insert

        

          
            

              136
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert


              137
              
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

            

            

              137
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert


              138
              
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled

            

            

              138
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert


              139
              
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled

            

            

              139
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert


              140
              
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert

            

            

              140
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert


              141
              
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert

            

            

              
              

              142
              
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning

            

            


              143
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert

            

            


              144
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert

            

            


              145
              
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line

            

            


              146
              
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning

            

            


              147
              
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert

            

            


              148
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert

            

            


              149
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

            

            


              150
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

            

            


              151
              
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning

            

            


              152
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert

            

            


              153
              
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning

            

            


              154
              
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning

            

            


              155
              
org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

            

            


              156
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert

            

            


              157
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert

            

            


              158
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert

            

            


              159
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert

            

            


              160
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert

            

            


              161
              
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

            

        

          141
          
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

          162
          
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert

        

          
            

              142
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert


              163
              
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true

            

            

              143
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert


              164
              
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert

            

            

              144
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert


              165
              
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

            

            

              145
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert


              166
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert

            

            

              146
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert


              167
              
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert

            

            

              147
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert


              168
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert

            

            

              
              

              169
              
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert

            

            


              170
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

            

            


              171
              
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled

            

            


              172
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert

            

        

          148
          
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

          173
          
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert

        

          
            

              149
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert


              174
              
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert

            

            

              150
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert


              175
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

            

            

              151
              
org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert


              176
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert

            

            

              152
              
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert


              177
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert

            

            

              153
              
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert


              178
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert

            

            

              
              

              179
              
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

            

            


              180
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert

            

            


              181
              
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

            

            


              182
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert

            

            


              183
              
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert

            

            


              184
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert

            

            


              185
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert

            

            


              186
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert

            

            


              187
              
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

            

            


              188
              
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning

            

            


              189
              
org.eclipse.jdt.core.formatter.tabulation.char=tab

            

            


              190
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert

            

            


              191
              
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false

            

            


              192
              
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled

            

        

          154
          
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

          193
          
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert

        

          
            

              155
              
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert


              194
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

            

            

              156
              
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert


              195
              
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false

            

            

              157
              
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert


              196
              
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false

            

            

              158
              
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert


              197
              
org.eclipse.jdt.core.formatter.compact_else_if=true

            

            

              159
              
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert


              198
              
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert

            

            

              160
              
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert


              199
              
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert

            

            

              161
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert


              200
              
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line

            

            

              162
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert


              201
              
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false

            

            

              163
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert


              202
              
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning

            

            

              164
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert


              203
              
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled

            

            

              165
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert


              204
              
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

            

            

              166
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert


              205
              
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

            

            

              
              

              206
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert

            

            


              207
              
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert

            

        

          167
          
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

          208
          
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert

        

          
            

              168
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert


              209
              
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning

            

            

              169
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert


              210
              
org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert

            

            

              170
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert


              
              
            

            

              171
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert


            

            

              172
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert


            

            

              173
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert


            

            

              174
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert


            

            

              175
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert


            

            

              176
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert


            

            

              177
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert


            

            

              178
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert


            

            

              179
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert


            

            

              180
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert


            

            

              181
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert


            

        

          182
          
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

          211
          
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert

        

            

              183
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert

              
              
            

            

              184
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

            

            

              185
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert

            

            

              186
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert

            

            

              187
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert

            

            

              188
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert

            

            

              189
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

            

            

              190
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

            

            

              191
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert

            

        

          192
          
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

          212
          
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert

        

          
            

              193
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert


              213
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert

            

            

              194
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert


              214
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert

            

            

              195
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert


              215
              
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true

            

            

              196
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert


              216
              
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

            

            

              197
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert


              217
              
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

            

            

              198
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert


              218
              
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true

            

            

              199
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert


              219
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert

            

            

              200
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert


              220
              
org.eclipse.jdt.core.formatter.comment.format_line_comments=false

            

            

              201
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert


              221
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert

            

            

              202
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert


              222
              
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false

            

            

              203
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert


              223
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert

            

            

              204
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert


              224
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert

            

            

              205
              
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert


              225
              
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false

            

            

              206
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert


              
              
            

        

          207
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

          226
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert

        

          
            

              208
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert


              227
              
org.eclipse.jdt.core.formatter.indentation.size=4

            

            

              209
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert


              228
              
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

            

            

              210
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert


              229
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert

            

            

              
              

              230
              
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled

            

            


              231
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert

            

            


              232
              
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert

            

            


              233
              
org.eclipse.jdt.core.compiler.debug.sourceFile=generate

            

            


              234
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert

            

            


              235
              
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

            

            


              236
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert

            

        

          211
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

          237
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert

        

          
            

              212
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert


              238
              
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true

            

            

              213
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert


              239
              
org.eclipse.jdt.core.compiler.problem.deprecation=warning

            

            

              
              

              240
              
org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning

            

        

          214
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

          241
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert

        

            

              
              
              242
              
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public

            

            

              243
              
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore

            

            

              244
              
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

            

            

              245
              
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line

            

            

              246
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert

            

            

              247
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert

            

            

              248
              
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

            

            

              249
              
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert

            

            

              250
              
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false

            

            

              251
              
org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true

            

            

              252
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert

            

            

              253
              
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert

            

            

              254
              
org.eclipse.jdt.core.formatter.blank_lines_before_package=0

            

        

          215
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

          255
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert

        

          
            

              216
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert


              256
              
org.eclipse.jdt.core.formatter.indent_empty_lines=false

            

            

              217
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert


              257
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert

            

            

              218
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert


              258
              
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

            

            

              219
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert


              259
              
org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore

            

            

              220
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert


              260
              
org.eclipse.jdt.core.compiler.problem.deadCode=warning

            

            

              221
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert


              
              
            

        

          222
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

          261
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert

        

          
            

              223
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert


              262
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert

            

            

              224
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert


              263
              
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning

            

            

              225
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert


              264
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert

            

            

              226
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert


              265
              
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore

            

            

              227
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert


              266
              
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line

            

            

              228
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert


              267
              
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0

            

            

              229
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert


              268
              
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

            

            

              230
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert


              269
              
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert

            

            

              231
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert


              270
              
org.eclipse.jdt.core.compiler.problem.unusedImport=warning

            

            

              232
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert


              271
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert

            

            

              
              

              272
              
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false

            

            


              273
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert

            

            


              274
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert

            

            


              275
              
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true

            

            


              276
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert

            

        

          233
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

          277
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert

        

            

              
              
              278
              
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning

            

            

              279
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert

            

            

              280
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert

            

            

              281
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert

            

            

              282
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert

            

            

              283
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert

            

            

              284
              
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

            

            

              285
              
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert

            

            

              286
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert

            

            

              287
              
org.eclipse.jdt.core.compiler.problem.nullReference=warning

            

        

          234
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

          288
          
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert

        

          
            

              235
              
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert


              289
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert

            

            

              236
              
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert


              290
              
org.eclipse.jdt.core.compiler.debug.lineNumber=generate

            

            

              237
              
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert


              291
              
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

            

            

              238
              
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert


              292
              
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1

            

            

              239
              
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert


              293
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert

            

            

              240
              
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert


              294
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert

            

            

              241
              
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert


              295
              
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

            

            

              242
              
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert


              296
              
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning

            

            

              
              

              297
              
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

            

            


              298
              
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning

            

            


              299
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert

            

            


              300
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert

            

        

          243
          
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

          301
          
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert

        

          
            

              244
              
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert


              302
              
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert

            

            

              245
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert


              303
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert

            

            

              246
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert


              304
              
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled

            

            

              247
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert


              305
              
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

            

            

              248
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert


              
              
            

            

              249
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert


            

            

              250
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert


            

            

              251
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert


            

            

              252
              
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false


            

            

              253
              
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false


            

            

              254
              
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false


            

            

              255
              
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false


            

        

          256
          
org.eclipse.jdt.core.formatter.lineSplit=800

          306
          
org.eclipse.jdt.core.formatter.lineSplit=800

        

          
            

              257
              
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true


              307
              
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled

            

            

              258
              
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true


              308
              
org.eclipse.jdt.core.compiler.source=1.3

            

            

              259
              
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0


              309
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=do not insert

            

            

              260
              
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1


              310
              
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert

            

            

              261
              
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false


              
              
            

            

              262
              
org.eclipse.jdt.core.formatter.tabulation.char=tab


            

        

          263
          
org.eclipse.jdt.core.formatter.tabulation.size=4

          311
          
org.eclipse.jdt.core.formatter.tabulation.size=4

        

          
            

              264
              
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false


              312
              
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

            

            

              265
              
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false


              313
              
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line

            

            

              
              

              314
              
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

            

            


              315
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert

            

            


              316
              
org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1

            

            


              317
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert

            

            


              318
              
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning

            

            


              319
              
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert

            

            


              320
              
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert

            

            


              321
              
org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning

            

            


              322
              
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert

            

            


              323
              
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert

            

            


              324
              
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

            

            


              325
              
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert

            

            


              326
              
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

            

            


              327
              
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning

            

            


              328
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert

            

            


              329
              
org.eclipse.jdt.core.compiler.doc.comment.support=enabled

            

            


              330
              
org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true

            

            


              331
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert

            

            


              332
              
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert

            

            


              333
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert

            

            


              334
              
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert

            

            


              335
              
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning

            

            


              336
              
eclipse.preferences.version=1

            

            


              337
              
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore

            

            


              338
              
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert

            

            


              339
              
org.eclipse.jdt.core.compiler.compliance=1.4

            

            


              340
              
org.eclipse.jdt.core.formatter.blank_lines_after_package=1

            

            


              341
              
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

            

            


              342
              
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert

            

            


              343
              
org.eclipse.jdt.core.formatter.blank_lines_before_field=0

            



(-)META-INF/MANIFEST.MF
      (-4 / +7 lines)




  

    
      
            Lines 2-19
          
      
      
        Link Here
      
    
  

        

          2
          
Bundle-ManifestVersion: 2

          2
          
Bundle-ManifestVersion: 2

        

        

          3
          
Bundle-Name: %bundleName

          3
          
Bundle-Name: %bundleName

        

        

          4
          
Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator.manipulator;singleton:=true

          4
          
Bundle-SymbolicName: org.eclipse.equinox.simpleconfigurator.manipulator;singleton:=true

        

          
            

              5
              
Bundle-Version: 1.0.200.qualifier


              5
              
Bundle-Version: 2.0.0.qualifier

            

        

          6
          
Bundle-Localization: plugin

          6
          
Bundle-Localization: plugin

        

        

          7
          
Bundle-ActivationPolicy: lazy

          7
          
Bundle-ActivationPolicy: lazy

        

          
            

              8
              
Import-Package: org.eclipse.equinox.internal.frameworkadmin.equinox,


              8
              
Import-Package: org.eclipse.equinox.frameworkadmin;version="[2.0.0,3.0.0)",

            

            

              
              

              9
              
 org.eclipse.equinox.internal.frameworkadmin.equinox,

            

        

          9
          
 org.eclipse.equinox.internal.frameworkadmin.utils,

          10
          
 org.eclipse.equinox.internal.frameworkadmin.utils,

        

        

          10
          
 org.eclipse.equinox.internal.provisional.configuratormanipulator,

          11
          
 org.eclipse.equinox.internal.provisional.configuratormanipulator,

        

        

          11
          
 org.eclipse.equinox.internal.provisional.frameworkadmin,

          12
          
 org.eclipse.equinox.internal.provisional.frameworkadmin,

        

            

              
              
              13
              
 org.eclipse.equinox.internal.simpleconfigurator,

            

        

          12
          
 org.eclipse.equinox.internal.simpleconfigurator.utils,

          14
          
 org.eclipse.equinox.internal.simpleconfigurator.utils,

        

            

              
              
              15
              
 org.eclipse.osgi.service.datalocation,

            

        

          13
          
 org.osgi.framework;version="1.3.0"

          16
          
 org.osgi.framework;version="1.3.0"

        

        

          14
          
Bundle-Vendor: %providerName

          17
          
Bundle-Vendor: %providerName

        

          
            

              15
              
Export-Package: org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator;x-friends:="org.eclipse.pde.core,org.eclipse.equinox.p2.metadata.generator,org.eclipse.equinox.p2.publisher",


              18
              
Export-Package: org.eclipse.equinox.internal.simpleconfigurator.manipulator;x-friends:="org.eclipse.equinox.p2.touchpoint.eclipse",

            

            

              16
              
 org.eclipse.equinox.internal.simpleconfigurator.manipulator;x-friends:="org.eclipse.equinox.p2.touchpoint.eclipse"


              19
              
 org.eclipse.equinox.simpleconfigurator.manipulator;version="2.0.0"

            

        

          17
          
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,

          20
          
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,

        

        

          18
          
 J2SE-1.4

          21
          
 J2SE-1.4

        

        

          19
          
Require-Bundle: org.eclipse.equinox.common;bundle-version="3.5.0"

          22
          
Require-Bundle: org.eclipse.equinox.common;bundle-version="3.5.0"

        



(-)OSGI-INF/configurator.xml
      (-1 / +1 lines)




  

    
      
            Lines 5-10
          
      
      
        Link Here
      
    
  

        

          5
          
   <property name="service.vendor" type="String" value="Eclipse.org"/>

          5
          
   <property name="service.vendor" type="String" value="Eclipse.org"/>

        

        

          6
          
   <service>

          6
          
   <service>

        

        

          7
          
      <provide interface="org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator"/>

          7
          
      <provide interface="org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator"/>

        

          
            

              8
              
      <provide interface="org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator"/>


              8
              
      <provide interface="org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator"/>

            

        

          9
          
   </service>

          9
          
   </service>

        

        

          10
          
</scr:component>

          10
          
</scr:component>

        



(-)src/org/eclipse/equinox/internal/provisional/simpleconfigurator/manipulator/SimpleConfiguratorManipulator.java
      (-43 lines)




  

    
      
          Removed
      
      
        Link Here
      
    
  

            

              1
              
/*******************************************************************************

            

            

              2
              
 * Copyright (c) 2008, 2009 IBM Corporation and others. All rights reserved.

            

            

              3
              
 * This program and the accompanying materials are made available under the

            

            

              4
              
 * terms of the Eclipse Public License v1.0 which accompanies this distribution,

            

            

              5
              
 * and is available at http://www.eclipse.org/legal/epl-v10.html

            

            

              6
              
 * 

            

            

              7
              
 * Contributors: IBM Corporation - initial API and implementation

            

            

              8
              
 *******************************************************************************/

            

            

              9
              

            

            

              10
              
package org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator;

            

            

              11
              

            

            

              12
              
import java.io.File;

            

            

              13
              
import java.io.IOException;

            

            

              14
              
import java.net.URL;

            

            

              15
              
import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;

            

            

              16
              
import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;

            

            

              17
              

            

            

              18
              
public interface SimpleConfiguratorManipulator extends ConfiguratorManipulator {

            

            

              19
              
	/**

            

            

              20
              
	 * An instance of an ISimpleConfiguratorManipulator is registered as a ConfiguratorManipulator 

            

            

              21
              
	 * service with ConfiguratorManipulator.SERVICE_PROP_KEY_CONFIGURATOR_BUNDLESYMBOLICNAME =

            

            

              22
              
	 * SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME.

            

            

              23
              
	 */

            

            

              24
              
	public static final String SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME = "org.eclipse.equinox.simpleconfigurator"; //$NON-NLS-1$

            

            

              25
              

            

            

              26
              
	/**

            

            

              27
              
	 * 

            

            

              28
              
	 * @param url

            

            

              29
              
	 * @param launcherLocation

            

            

              30
              
	 * @return The loaded configuration

            

            

              31
              
	 * @throws IOException

            

            

              32
              
	 */

            

            

              33
              
	public BundleInfo[] loadConfiguration(URL url, File launcherLocation) throws IOException;

            

            

              34
              

            

            

              35
              
	/**

            

            

              36
              
	 * 

            

            

              37
              
	 * @param configuration

            

            

              38
              
	 * @param outputFile

            

            

              39
              
	 * @param base

            

            

              40
              
	 * @throws IOException

            

            

              41
              
	 */

            

            

              42
              
	public void saveConfiguration(BundleInfo[] configuration, File outputFile, File base) throws IOException;

            

            

              43
              
}

            



(-)src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java
      (-20 / +76 lines)




  

    
      
            Lines 8-30
          
      
      
        Link Here
      
    
  

        

          8
          
 *******************************************************************************/

          8
          
 *******************************************************************************/

        

        

          9
          
package org.eclipse.equinox.internal.simpleconfigurator.manipulator;

          9
          
package org.eclipse.equinox.internal.simpleconfigurator.manipulator;

        

        

          10
          

          10
          

        

          
            

              11
              
import java.io.File;


              11
              
import java.io.*;

            

            

              12
              
import java.io.IOException;


              
              
            

        

          13
          
import java.net.URI;

          12
          
import java.net.URI;

        

        

          14
          
import java.net.URL;

          13
          
import java.net.URL;

        

        

          15
          
import java.util.*;

          14
          
import java.util.*;

        

        

          16
          
import org.eclipse.core.runtime.URIUtil;

          15
          
import org.eclipse.core.runtime.URIUtil;

        

            

              
              
              16
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

        

          17
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.ParserUtils;

          17
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.ParserUtils;

        

        

          18
          
import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;

          18
          
import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;

        

            

              
              
              19
              
import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;

            

        

          19
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

          20
          
import org.eclipse.equinox.internal.provisional.frameworkadmin.*;

        

          
            

              20
              
import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;


              21
              
import org.eclipse.equinox.internal.simpleconfigurator.SimpleConfiguratorImpl;

            

            

              
              

              22
              
import org.eclipse.equinox.internal.simpleconfigurator.utils.EquinoxUtils;

            

        

          21
          
import org.eclipse.equinox.internal.simpleconfigurator.utils.SimpleConfiguratorUtils;

          23
          
import org.eclipse.equinox.internal.simpleconfigurator.utils.SimpleConfiguratorUtils;

        

            

              
              
              24
              
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;

            

            

              25
              
import org.eclipse.osgi.service.datalocation.Location;

            

            

              26
              
import org.osgi.framework.BundleContext;

            

        

          22
          
import org.osgi.framework.Constants;

          27
          
import org.osgi.framework.Constants;

        

        

          23
          

          28
          

        

        

          24
          
/**

          29
          
/**

        

        

          25
          
 * 

          30
          
 * 

        

        

          26
          
 */

          31
          
 */

        

          
            

              27
              
public class SimpleConfiguratorManipulatorImpl implements SimpleConfiguratorManipulator {


              32
              
public class SimpleConfiguratorManipulatorImpl implements SimpleConfiguratorManipulator, ConfiguratorManipulator {

            

        

          28
          
	class LocationInfo {

          33
          
	class LocationInfo {

        

        

          29
          
		URI[] prerequisiteLocations = null;

          34
          
		URI[] prerequisiteLocations = null;

        

        

          30
          
		URI systemBundleLocation = null;

          35
          
		URI systemBundleLocation = null;

        

  

    
      
            Lines 202-208
          
      
      
        Link Here
      
    
  

        

          202
          
		return true;

          207
          
		return true;

        

        

          203
          
	}

          208
          
	}

        

        

          204
          

          209
          

        

          
            

              205
              
	private boolean divideBundleInfos(Manipulator manipulator, List setToInitialConfig, List setToSimpleConfig, final int initialBSL) throws IOException {


              210
              
	private boolean divideBundleInfos(Manipulator manipulator, List setToInitialConfig, List setToSimpleConfig, final int initialBSL) {

            

        

          206
          
		BundlesState state = manipulator.getBundlesState();

          211
          
		BundlesState state = manipulator.getBundlesState();

        

        

          207
          
		BundleInfo[] targetBundleInfos = null;

          212
          
		BundleInfo[] targetBundleInfos = null;

        

        

          208
          
		if (state.isFullySupported()) {

          213
          
		if (state.isFullySupported()) {

        

  

    
      
            Lines 281-287
          
      
      
        Link Here
      
    
  

        

          281
          
	private void printoutUnsatisfiedConstraints(BundleInfo bInfo, BundlesState state) {

          286
          
	private void printoutUnsatisfiedConstraints(BundleInfo bInfo, BundlesState state) {

        

        

          282
          
		if (DEBUG) {

          287
          
		if (DEBUG) {

        

        

          283
          
			StringBuffer sb = new StringBuffer();

          288
          
			StringBuffer sb = new StringBuffer();

        

          
            

              284
              
			sb.append("Missing constraints:\n");


              289
              
			sb.append("Missing constraints:\n"); //$NON-NLS-1$

            

        

          285
          
			String[] missings = state.getUnsatisfiedConstraints(bInfo);

          290
          
			String[] missings = state.getUnsatisfiedConstraints(bInfo);

        

        

          286
          
			for (int i = 0; i < missings.length; i++)

          291
          
			for (int i = 0; i < missings.length; i++)

        

        

          287
          
				sb.append(" " + missings[i] + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

          292
          
				sb.append(" " + missings[i] + "\n"); //$NON-NLS-1$ //$NON-NLS-2$

        

  

    
      
            Lines 289-299
          
      
      
        Link Here
      
    
  

        

          289
          
		}

          294
          
		}

        

        

          290
          
	}

          295
          
	}

        

        

          291
          

          296
          

        

          
            

              292
              
	public BundleInfo[] loadConfiguration(URL url, File base) throws IOException {


              297
              
	public BundleInfo[] loadConfiguration(BundleContext context, String infoPath) throws IOException {

            

            

              293
              
		if (url == null)


              298
              
		URI installArea = EquinoxUtils.getInstallLocationURI(context);

            

            

              
              

              299
              

            

            


              300
              
		URL configURL = null;

            

            


              301
              
		if (infoPath == null) {

            

            


              302
              
			SimpleConfiguratorImpl simpleImpl = new SimpleConfiguratorImpl(context, null);

            

            


              303
              
			configURL = simpleImpl.getConfigurationURL();

            

            


              304
              
		} else {

            

            


              305
              
			//if == SOURCE_INFO (not .equals) use the default source info, currently SOURCE_INFO_PATH

            

            


              306
              
			if (infoPath == SOURCE_INFO)

            

            


              307
              
				infoPath = SOURCE_INFO_PATH;

            

            


              308
              
			Location configLocation = EquinoxUtils.getConfigLocation(context);

            

            


              309
              
			configURL = configLocation.getDataArea(infoPath);

            

            


              310
              
		}

            

            


              311
              

            

            


              312
              
		return loadConfiguration(configURL.openStream(), installArea);

            

            


              313
              
	}

            

            


              314
              

            

            


              315
              
	/*

            

            


              316
              
	 * InputStream must be closed

            

            


              317
              
	 * (non-Javadoc)

            

            


              318
              
	 * @see org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator#loadConfiguration(java.io.InputStream, java.net.URI)

            

            


              319
              
	 */

            

            


              320
              
	public BundleInfo[] loadConfiguration(InputStream stream, URI installArea) throws IOException {

            

            


              321
              
		if (stream == null)

            

        

          294
          
			return NULL_BUNDLEINFOS;

          322
          
			return NULL_BUNDLEINFOS;

        

        

          295
          

          323
          

        

          
            

              296
              
		List simpleBundles = SimpleConfiguratorUtils.readConfiguration(url, base != null ? base.toURI() : null);


              324
              
		List simpleBundles = SimpleConfiguratorUtils.readConfiguration(stream, installArea);

            

        

          297
          

          325
          

        

        

          298
          
		// convert to FrameworkAdmin BundleInfo Type

          326
          
		// convert to FrameworkAdmin BundleInfo Type

        

        

          299
          
		BundleInfo[] result = new BundleInfo[simpleBundles.size()];

          327
          
		BundleInfo[] result = new BundleInfo[simpleBundles.size()];

        

  

    
      
            Lines 305-320
          
      
      
        Link Here
      
    
  

        

          305
          
				location = URIUtil.makeAbsolute(location, simpleInfo.getBaseLocation());

          333
          
				location = URIUtil.makeAbsolute(location, simpleInfo.getBaseLocation());

        

        

          306
          

          334
          

        

        

          307
          
			BundleInfo bundleInfo = new BundleInfo(simpleInfo.getSymbolicName(), simpleInfo.getVersion(), location, simpleInfo.getStartLevel(), simpleInfo.isMarkedAsStarted());

          335
          
			BundleInfo bundleInfo = new BundleInfo(simpleInfo.getSymbolicName(), simpleInfo.getVersion(), location, simpleInfo.getStartLevel(), simpleInfo.isMarkedAsStarted());

        

            

              
              
              336
              
			bundleInfo.setBaseLocation(simpleInfo.getBaseLocation());

            

        

          308
          
			result[i++] = bundleInfo;

          337
          
			result[i++] = bundleInfo;

        

        

          309
          
		}

          338
          
		}

        

        

          310
          
		return result;

          339
          
		return result;

        

        

          311
          
	}

          340
          
	}

        

        

          312
          

          341
          

        

          
            

              313
              
	public void saveConfiguration(BundleInfo[] configuration, File outputFile, File base) throws IOException {


              342
              
	public void saveConfiguration(BundleInfo[] configuration, OutputStream stream, URI installArea) throws IOException {

            

            

              314
              
		saveConfiguration(configuration, outputFile, base, false);


              343
              
		org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[] simpleInfos = convertBundleInfos(configuration, installArea);

            

            

              
              

              344
              
		SimpleConfiguratorManipulatorUtils.writeConfiguration(simpleInfos, stream);

            

            


              345
              
	}

            

            


              346
              

            

            


              347
              
	public void saveConfiguration(BundleInfo[] configuration, File outputFile, URI installArea) throws IOException {

            

            


              348
              
		saveConfiguration(configuration, outputFile, installArea, false);

            

        

          315
          
	}

          349
          
	}

        

        

          316
          

          350
          

        

          
            

              317
              
	private void saveConfiguration(BundleInfo[] configuration, File outputFile, File base, boolean backup) throws IOException {


              351
              
	private void saveConfiguration(BundleInfo[] configuration, File outputFile, URI installArea, boolean backup) throws IOException {

            

        

          318
          
		if (backup && outputFile.exists()) {

          352
          
		if (backup && outputFile.exists()) {

        

        

          319
          
			File backupFile = Utils.getSimpleDataFormattedFile(outputFile);

          353
          
			File backupFile = Utils.getSimpleDataFormattedFile(outputFile);

        

        

          320
          
			if (!outputFile.renameTo(backupFile)) {

          354
          
			if (!outputFile.renameTo(backupFile)) {

        

  

    
      
            Lines 322-339
          
      
      
        Link Here
      
    
  

        

          322
          
			}

          356
          
			}

        

        

          323
          
		}

          357
          
		}

        

        

          324
          

          358
          

        

            

              
              
              359
              
		org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[] simpleInfos = convertBundleInfos(configuration, installArea);

            

            

              360
              

            

            

              361
              
		// if empty remove the configuration file

            

            

              362
              
		if (simpleInfos == null || simpleInfos.length == 0) {

            

            

              363
              
			if (outputFile.exists()) {

            

            

              364
              
				outputFile.delete();

            

            

              365
              
			}

            

            

              366
              
			File parentDir = outputFile.getParentFile();

            

            

              367
              
			if (parentDir.exists()) {

            

            

              368
              
				parentDir.delete();

            

            

              369
              
			}

            

            

              370
              
			return;

            

            

              371
              
		}

            

            

              372
              
		SimpleConfiguratorManipulatorUtils.writeConfiguration(simpleInfos, outputFile);

            

            

              373
              
	}

            

            

              374
              

            

            

              375
              
	private org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[] convertBundleInfos(BundleInfo[] configuration, URI installArea) {

            

        

          325
          
		// convert to SimpleConfigurator BundleInfo Type

          376
          
		// convert to SimpleConfigurator BundleInfo Type

        

        

          326
          
		org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[] simpleInfos = new org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[configuration.length];

          377
          
		org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[] simpleInfos = new org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo[configuration.length];

        

        

          327
          
		for (int i = 0; i < configuration.length; i++) {

          378
          
		for (int i = 0; i < configuration.length; i++) {

        

        

          328
          
			BundleInfo bundleInfo = configuration[i];

          379
          
			BundleInfo bundleInfo = configuration[i];

        

          
            

              329
              
			String symbolicName = bundleInfo.getSymbolicName();


              380
              
			URI location = bundleInfo.getLocation();

            

            

              330
              
			String bundleVersion = bundleInfo.getVersion();


              381
              
			if (bundleInfo.getSymbolicName() == null || bundleInfo.getVersion() == null || location == null)

            

            

              331
              
			URI location = base != null ? URIUtil.makeRelative(bundleInfo.getLocation(), base.toURI()) : bundleInfo.getLocation();


              
              
            

            

              332
              
			if (symbolicName == null || bundleVersion == null || location == null)


            

        

          333
          
				throw new IllegalArgumentException("Cannot persist bundleinfo: " + bundleInfo.toString());

          382
          
				throw new IllegalArgumentException("Cannot persist bundleinfo: " + bundleInfo.toString());

        

          
            

              334
              
			simpleInfos[i] = new org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo(symbolicName, bundleVersion, location, bundleInfo.getStartLevel(), bundleInfo.isMarkedAsStarted());


              383
              
			//only need to make a new BundleInfo if we are changing it.

            

            

              
              

              384
              
			if (installArea != null)

            

            


              385
              
				location = URIUtil.makeRelative(location, installArea);

            

            


              386
              
			simpleInfos[i] = new org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo(bundleInfo.getSymbolicName(), bundleInfo.getVersion(), location, bundleInfo.getStartLevel(), bundleInfo.isMarkedAsStarted());

            

            


              387
              
			simpleInfos[i].setBaseLocation(bundleInfo.getBaseLocation());

            

        

          335
          
		}

          388
          
		}

        

          
            

              336
              
		SimpleConfiguratorManipulatorUtils.writeConfiguration(simpleInfos, outputFile);


              389
              
		return simpleInfos;

            

        

          337
          
	}

          390
          
	}

        

        

          338
          

          391
          

        

        

          339
          
	public BundleInfo[] save(Manipulator manipulator, boolean backup) throws IOException {

          392
          
	public BundleInfo[] save(Manipulator manipulator, boolean backup) throws IOException {

        

  

    
      
            Lines 345-351
          
      
      
        Link Here
      
    
  

        

          345
          
			return configData.getBundles();

          398
          
			return configData.getBundles();

        

        

          346
          

          399
          

        

        

          347
          
		File outputFile = getConfigFile(manipulator);

          400
          
		File outputFile = getConfigFile(manipulator);

        

          
            

              348
              
		saveConfiguration((BundleInfo[]) setToSimpleConfig.toArray(new BundleInfo[setToSimpleConfig.size()]), outputFile, ParserUtils.getOSGiInstallArea(Arrays.asList(manipulator.getLauncherData().getProgramArgs()), manipulator.getConfigData().getProperties(), manipulator.getLauncherData()), backup);


              401
              
		URI installArea = ParserUtils.getOSGiInstallArea(Arrays.asList(manipulator.getLauncherData().getProgramArgs()), manipulator.getConfigData().getProperties(), manipulator.getLauncherData()).toURI();

            

            

              
              

              402
              
		saveConfiguration((BundleInfo[]) setToSimpleConfig.toArray(new BundleInfo[setToSimpleConfig.size()]), outputFile, installArea, backup);

            

        

          349
          
		configData.setProperty(SimpleConfiguratorManipulatorImpl.PROP_KEY_CONFIGURL, outputFile.toURL().toExternalForm());

          403
          
		configData.setProperty(SimpleConfiguratorManipulatorImpl.PROP_KEY_CONFIGURL, outputFile.toURL().toExternalForm());

        

        

          350
          
		return orderingInitialConfig(setToInitialConfig);

          404
          
		return orderingInitialConfig(setToInitialConfig);

        

        

          351
          
	}

          405
          
	}

        

  

    
      
            Lines 414-420
          
      
      
        Link Here
      
    
  

        

          414
          
		boolean exclusiveInstallation = Boolean.valueOf(properties.getProperty(SimpleConfiguratorManipulatorImpl.PROP_KEY_EXCLUSIVE_INSTALLATION)).booleanValue();

          468
          
		boolean exclusiveInstallation = Boolean.valueOf(properties.getProperty(SimpleConfiguratorManipulatorImpl.PROP_KEY_EXCLUSIVE_INSTALLATION)).booleanValue();

        

        

          415
          
		File configFile = getConfigFile(manipulator);

          469
          
		File configFile = getConfigFile(manipulator);

        

        

          416
          

          470
          

        

          
            

              417
              
		BundleInfo[] toInstall = loadConfiguration(configFile.toURL(), ParserUtils.getOSGiInstallArea(Arrays.asList(manipulator.getLauncherData().getProgramArgs()), manipulator.getConfigData().getProperties(), manipulator.getLauncherData()));


              471
              
		File installArea = ParserUtils.getOSGiInstallArea(Arrays.asList(manipulator.getLauncherData().getProgramArgs()), manipulator.getConfigData().getProperties(), manipulator.getLauncherData());

            

            

              
              

              472
              
		//input stream will be closed for us

            

            


              473
              
		BundleInfo[] toInstall = loadConfiguration(new FileInputStream(configFile), installArea.toURI());

            

        

          418
          

          474
          

        

        

          419
          
		List toUninstall = new LinkedList();

          475
          
		List toUninstall = new LinkedList();

        

        

          420
          
		if (exclusiveInstallation)

          476
          
		if (exclusiveInstallation)

        



(-)src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java
      (-38 / +38 lines)




  

    
      
            Lines 14-21
          
      
      
        Link Here
      
    
  

        

          14
          
import java.util.Comparator;

          14
          
import java.util.Comparator;

        

        

          15
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.Messages;

          15
          
import org.eclipse.equinox.internal.frameworkadmin.equinox.Messages;

        

        

          16
          
import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;

          16
          
import org.eclipse.equinox.internal.frameworkadmin.utils.Utils;

        

            

              17
              
import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;

              
              
            

        

          18
          
import org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo;

          17
          
import org.eclipse.equinox.internal.simpleconfigurator.utils.BundleInfo;

        

            

              
              
              18
              
import org.eclipse.equinox.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;

            

        

          19
          
import org.osgi.framework.Version;

          19
          
import org.osgi.framework.Version;

        

        

          20
          

          20
          

        

        

          21
          
public class SimpleConfiguratorManipulatorUtils {

          21
          
public class SimpleConfiguratorManipulatorUtils {

        

  

    
      
            Lines 25-43
          
      
      
        Link Here
      
    
  

        

          25
          
	private static final Version OLD_STYLE_SIMPLE_CONFIGURATOR_VERSION = new Version("1.0.100.v20081206"); //$NON-NLS-1$

          25
          
	private static final Version OLD_STYLE_SIMPLE_CONFIGURATOR_VERSION = new Version("1.0.100.v20081206"); //$NON-NLS-1$

        

        

          26
          

          26
          

        

        

          27
          
	public static void writeConfiguration(BundleInfo[] simpleInfos, File outputFile) throws IOException {

          27
          
	public static void writeConfiguration(BundleInfo[] simpleInfos, File outputFile) throws IOException {

        

            

              
              
              28
              
		if (!Utils.createParentDir(outputFile)) {

            

            

              29
              
			throw new IllegalStateException(Messages.exception_failedToCreateDir);

            

            

              30
              
		}

            

        

          28
          

          31
          

        

          
            

              29
              
		// if empty remove the configuration file


              32
              
		IOException caughtException = null;

            

            

              30
              
		if (simpleInfos == null || simpleInfos.length == 0) {


              33
              
		OutputStream stream = null;

            

            

              31
              
			if (outputFile.exists()) {


              34
              
		try {

            

            

              32
              
				outputFile.delete();


              35
              
			stream = new FileOutputStream(outputFile);

            

            

              33
              
			}


              36
              
			writeConfiguration(simpleInfos, stream);

            

            

              34
              
			File parentDir = outputFile.getParentFile();


              37
              
		} catch (IOException e) {

            

            

              35
              
			if (parentDir.exists()) {


              38
              
			caughtException = e;

            

            

              36
              
				parentDir.delete();


              39
              
		} finally {

            

            

              
              

              40
              
			try {

            

            


              41
              
				if (stream != null)

            

            


              42
              
					stream.close();

            

            


              43
              
			} catch (IOException e) {

            

            


              44
              
				// we want to avoid over-writing the original exception

            

            


              45
              
				if (caughtException != null)

            

            


              46
              
					caughtException = e;

            

        

          37
          
			}

          47
          
			}

        

            

              38
              
			return;

              
              
            

        

          39
          
		}

          48
          
		}

        

            

              
              
              49
              
		if (caughtException != null)

            

            

              50
              
			throw caughtException;

            

            

              51
              
	}

            

        

          40
          

          52
          

        

            

              
              
              53
              
	/**

            

            

              54
              
	 * The output stream is left open

            

            

              55
              
	 * @param simpleInfos

            

            

              56
              
	 * @param stream

            

            

              57
              
	 * @throws IOException

            

            

              58
              
	 */

            

            

              59
              
	public static void writeConfiguration(BundleInfo[] simpleInfos, OutputStream stream) throws IOException {

            

        

          41
          
		// sort by symbolic name

          60
          
		// sort by symbolic name

        

        

          42
          
		Arrays.sort(simpleInfos, new Comparator() {

          61
          
		Arrays.sort(simpleInfos, new Comparator() {

        

        

          43
          
			public int compare(Object o1, Object o2) {

          62
          
			public int compare(Object o1, Object o2) {

        

  

    
      
            Lines 48-58
          
      
      
        Link Here
      
    
  

        

          48
          
			}

          67
          
			}

        

        

          49
          
		});

          68
          
		});

        

        

          50
          

          69
          

        

            

              51
              
		if (!Utils.createParentDir(outputFile)) {

              
              
            

            

              52
              
			throw new IllegalStateException(Messages.exception_failedToCreateDir);

            

            

              53
              
		}

            

        

          54
          
		BufferedWriter writer = null;

          70
          
		BufferedWriter writer = null;

        

            

              55
              
		IOException caughtException = null;

              
              
            

        

          56
          
		boolean oldStyle = false;

          71
          
		boolean oldStyle = false;

        

        

          57
          
		for (int i = 0; i < simpleInfos.length; i++) {

          72
          
		for (int i = 0; i < simpleInfos.length; i++) {

        

        

          58
          
			if (SimpleConfiguratorManipulator.SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME.equals(simpleInfos[i].getSymbolicName())) {

          73
          
			if (SimpleConfiguratorManipulator.SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME.equals(simpleInfos[i].getSymbolicName())) {

        

  

    
      
            Lines 63-94
          
      
      
        Link Here
      
    
  

        

          63
          
			}

          78
          
			}

        

        

          64
          
		}

          79
          
		}

        

        

          65
          

          80
          

        

          
            

              66
              
		try {


              81
              
		writer = new BufferedWriter(new OutputStreamWriter(stream));

            

            

              67
              
			writer = new BufferedWriter(new FileWriter(outputFile));


              82
              
		// version line

            

            

              68
              
			// version line


              83
              
		writer.write(createVersionLine());

            

            

              69
              
			writer.write(createVersionLine());


              84
              
		writer.newLine();

            

            

              70
              
			writer.newLine();


              
              
            

        

          71
          

          85
          

        

          
            

              72
              
			// bundle info lines


              86
              
		// bundle info lines

            

            

              73
              
			for (int i = 0; i < simpleInfos.length; i++) {


              87
              
		for (int i = 0; i < simpleInfos.length; i++) {

            

            

              74
              
				writer.write(createBundleInfoLine(simpleInfos[i], oldStyle));


              88
              
			writer.write(createBundleInfoLine(simpleInfos[i], oldStyle));

            

            

              75
              
				writer.newLine();


              89
              
			writer.newLine();

            

            

              76
              
			}


              
              
            

            

              77
              
		} catch (IOException e) {


            

            

              78
              
			caughtException = e;


            

            

              79
              
		} finally {


            

            

              80
              
			if (writer != null) {


            

            

              81
              
				try {


            

            

              82
              
					writer.close();


            

            

              83
              
				} catch (IOException e) {


            

            

              84
              
					// we want to avoid over-writing the original exception


            

            

              85
              
					if (caughtException != null)


            

            

              86
              
						caughtException = e;


            

            

              87
              
				}


            

            

              88
              
			}


            

        

          89
          
		}

          90
          
		}

        

          
            

              90
              
		if (caughtException != null)


              91
              
		writer.flush();

            

            

              91
              
			throw caughtException;


              
              
            

        

          92
          
	}

          92
          
	}

        

        

          93
          

          93
          

        

        

          94
          
	public static String createVersionLine() {

          94
          
	public static String createVersionLine() {

        



(-)src/org/eclipse/equinox/simpleconfigurator/manipulator/SimpleConfiguratorManipulator.java
      (+96 lines)




  

    
      
          Added
      
      
        Link Here
      
    
  

            

              1
              
/*******************************************************************************

            

            

              2
              
 * Copyright (c) 2008, 2010 IBM Corporation and others. All rights reserved.

            

            

              3
              
 * This program and the accompanying materials are made available under the

            

            

              4
              
 * terms of the Eclipse Public License v1.0 which accompanies this distribution,

            

            

              5
              
 * and is available at http://www.eclipse.org/legal/epl-v10.html

            

            

              6
              
 * 

            

            

              7
              
 * Contributors: IBM Corporation - initial API and implementation

            

            

              8
              
 *******************************************************************************/

            

            

              9
              

            

            

              10
              
package org.eclipse.equinox.simpleconfigurator.manipulator;

            

            

              11
              

            

            

              12
              
import java.io.*;

            

            

              13
              
import java.net.URI;

            

            

              14
              
import org.eclipse.equinox.frameworkadmin.BundleInfo;

            

            

              15
              
import org.osgi.framework.BundleContext;

            

            

              16
              

            

            

              17
              
/**

            

            

              18
              
 * A ConfiguratorManipulator Service used to read and write bundles.info configuration files

            

            

              19
              
 * @since 2.0

            

            

              20
              
 * @noimplement This interface is not intended to be implemented by clients.

            

            

              21
              
 */

            

            

              22
              
public interface SimpleConfiguratorManipulator {

            

            

              23
              
	/**

            

            

              24
              
	 * A common location to find the bundle configuration file

            

            

              25
              
	 */

            

            

              26
              
	public static final String BUNDLES_INFO_PATH = "org.eclipse.equinox.simpleconfigurator/bundles.info"; //$NON-NLS-1$

            

            

              27
              

            

            

              28
              
	/**

            

            

              29
              
	 * A common location to find the source configuration file

            

            

              30
              
	 */

            

            

              31
              
	public static final String SOURCE_INFO_PATH = "org.eclipse.equinox.source/source.info"; //$NON-NLS-1$

            

            

              32
              

            

            

              33
              
	/**

            

            

              34
              
	 * Pass this to {@link #loadConfiguration(BundleContext, String)} to read the default source configuration file

            

            

              35
              
	 */

            

            

              36
              
	public static final String SOURCE_INFO = new String("source.info"); //$NON-NLS-1$

            

            

              37
              

            

            

              38
              
	/**

            

            

              39
              
	 * An instance of an ISimpleConfiguratorManipulator is registered as a ConfiguratorManipulator 

            

            

              40
              
	 * service with ConfiguratorManipulator.SERVICE_PROP_KEY_CONFIGURATOR_BUNDLESYMBOLICNAME =

            

            

              41
              
	 * SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME.

            

            

              42
              
	 */

            

            

              43
              
	public static final String SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME = "org.eclipse.equinox.simpleconfigurator"; //$NON-NLS-1$

            

            

              44
              

            

            

              45
              
	/**

            

            

              46
              
	 * Load the configuration file for the currently running system.

            

            

              47
              
	 * <p>

            

            

              48
              
	 * Pass null for bundleInfoPath to read the bundle configuration file for the running system as 

            

            

              49
              
	 * specified by the "org.eclipse.equinox.simpleconfigurator.configUrl" system property.

            

            

              50
              
	 * </p>

            

            

              51
              
	 * <p>If bundleInfoPath == {@link #SOURCE_INFO} the default source configuration file for the running

            

            

              52
              
	 * system will be loaded.

            

            

              53
              
	 * </p>

            

            

              54
              
	 * @param context - the BundleContext for the running system

            

            

              55
              
	 * @param bundleInfoPath - pass null or a path to the bundle info file to read, relative to the configuration location.  Pass {@link #SOURCE_INFO}

            

            

              56
              
	 * to load the default source configuration.  Common locations are {@link #BUNDLES_INFO_PATH} and {@link #SOURCE_INFO_PATH}.

            

            

              57
              
	 * @return The loaded configuration.  Bundles will have at least symbolic name, version and location information.

            

            

              58
              
	 * @throws IOException

            

            

              59
              
	 */

            

            

              60
              
	public BundleInfo[] loadConfiguration(BundleContext context, String bundleInfoPath) throws IOException;

            

            

              61
              

            

            

              62
              
	/**

            

            

              63
              
	 *	Load the configuration from the given input stream

            

            

              64
              
	 *  The supplied input stream is consumed by this method and will be closed.

            

            

              65
              
	 *  

            

            

              66
              
	 * @param configuration - the input stream to read the configuration from.  The stream will be closed even if an exception is thrown

            

            

              67
              
	 * @param installArea - Relative URIs from the configuration file will be resolved relative to here

            

            

              68
              
	 * @return The loaded configuration.   Bundles will have at least symbolic name, version and location information.

            

            

              69
              
	 * @throws IOException

            

            

              70
              
	 */

            

            

              71
              
	public BundleInfo[] loadConfiguration(InputStream configuration, URI installArea) throws IOException;

            

            

              72
              

            

            

              73
              
	/**

            

            

              74
              
	 * Save the configuration to the given output stream

            

            

              75
              
	 * The output stream is flushed and left open.

            

            

              76
              
	 * To be persisted, bundles are required to have at least a symbolic name, version and location.

            

            

              77
              
	 * 

            

            

              78
              
	 * @param configuration - bundle information to save

            

            

              79
              
	 * @param outputStream - the output stream to write to.  Stream is not closed

            

            

              80
              
	 * @param installArea - bundle locations are written as relative to this URI

            

            

              81
              
	 * @throws IOException

            

            

              82
              
	 */

            

            

              83
              
	public void saveConfiguration(BundleInfo[] configuration, OutputStream outputStream, URI installArea) throws IOException;

            

            

              84
              

            

            

              85
              
	/**

            

            

              86
              
	 * Save the configuration to the specified file

            

            

              87
              
	 * To be persisted, bundles are required to have at least a symbolic name, version and location.

            

            

              88
              
	 * 

            

            

              89
              
	 * @param configuration - bundle information to save

            

            

              90
              
	 * @param configurationFile - file to save the configuration in

            

            

              91
              
	 * @param installArea - bundle locations are written as relative to this URI

            

            

              92
              
	 * 

            

            

              93
              
	 * @throws IOException

            

            

              94
              
	 */

            

            

              95
              
	public void saveConfiguration(BundleInfo[] configuration, File configurationFile, URI installArea) throws IOException;

            

            

              96
              
}

            






  

  Return to bug 269496