Skip to content

Commit a896d97

Browse files
NosNos
Nos
authored and
Nos
committed
BETA: Updated formatters for JavaEngine project.
1 parent 80f3589 commit a896d97

4 files changed

Lines changed: 21 additions & 20 deletions

File tree

‎JavaEngine/.classpath‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src" />
4-
<classpathentry kind="con"
5-
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8" />
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8" />
65
<classpathentry kind="lib" path="lib/ecj-4.4.jar" />
76
<classpathentry kind="output" path="bin" />
87
</classpath>

‎JavaEngine/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=48
124124
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
125125
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
126126
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
127-
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
127+
org.eclipse.jdt.core.formatter.alignment_for_assignment=4
128128
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
129129
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
130130
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
@@ -134,7 +134,7 @@ org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
134134
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
135135
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
136136
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
137-
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=53
137+
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=85
138138
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
139139
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
140140
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=48
@@ -161,6 +161,7 @@ org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
161161
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
162162
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
163163
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
164+
org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line
164165
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
165166
org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
166167
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
@@ -204,8 +205,9 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
204205
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
205206
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
206207
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
207-
org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert
208+
org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
208209
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
210+
org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
209211
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
210212
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
211213
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
@@ -253,6 +255,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
253255
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
254256
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
255257
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
258+
org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
256259
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
257260
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
258261
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -330,6 +333,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
330333
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
331334
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
332335
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
336+
org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
333337
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
334338
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
335339
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert

‎JavaEngine/.settings/org.eclipse.jdt.ui.prefs‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
cleanup.add_default_serial_version_id=true
2-
cleanup.add_generated_serial_version_id=false
1+
cleanup.add_default_serial_version_id=false
2+
cleanup.add_generated_serial_version_id=true
33
cleanup.add_missing_annotations=true
44
cleanup.add_missing_deprecated_annotations=true
55
cleanup.add_missing_methods=true
@@ -11,10 +11,12 @@ cleanup.always_use_blocks=true
1111
cleanup.always_use_parentheses_in_expressions=true
1212
cleanup.always_use_this_for_non_static_field_access=false
1313
cleanup.always_use_this_for_non_static_method_access=false
14+
cleanup.convert_functional_interfaces=true
1415
cleanup.convert_to_enhanced_for_loop=true
15-
cleanup.correct_indentation=true
16+
cleanup.correct_indentation=false
1617
cleanup.format_source_code=true
1718
cleanup.format_source_code_changes_only=false
19+
cleanup.insert_inferred_type_arguments=false
1820
cleanup.make_local_variable_final=false
1921
cleanup.make_parameters_final=false
2022
cleanup.make_private_fields_final=true
@@ -29,9 +31,10 @@ cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=tru
2931
cleanup.qualify_static_member_accesses_with_declaring_class=true
3032
cleanup.qualify_static_method_accesses_with_declaring_class=false
3133
cleanup.remove_private_constructors=true
32-
cleanup.remove_trailing_whitespaces=true
34+
cleanup.remove_redundant_type_arguments=true
35+
cleanup.remove_trailing_whitespaces=false
3336
cleanup.remove_trailing_whitespaces_all=true
34-
cleanup.remove_trailing_whitespaces_ignore_empty=false
37+
cleanup.remove_trailing_whitespaces_ignore_empty=true
3538
cleanup.remove_unnecessary_casts=true
3639
cleanup.remove_unnecessary_nls_tags=true
3740
cleanup.remove_unused_imports=true
@@ -42,17 +45,20 @@ cleanup.remove_unused_private_methods=true
4245
cleanup.remove_unused_private_types=true
4346
cleanup.sort_members=false
4447
cleanup.sort_members_all=false
48+
cleanup.use_anonymous_class_creation=false
4549
cleanup.use_blocks=true
4650
cleanup.use_blocks_only_for_return_and_throw=false
51+
cleanup.use_lambda=true
4752
cleanup.use_parentheses_in_expressions=true
4853
cleanup.use_this_for_non_static_field_access=true
4954
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
5055
cleanup.use_this_for_non_static_method_access=true
5156
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
52-
cleanup_profile=_L2J Clean Up v0.2
57+
cleanup.use_type_arguments=false
58+
cleanup_profile=_L2J Clean Up v0.3
5359
cleanup_settings_version=2
5460
eclipse.preferences.version=1
55-
formatter_profile=_L2J Formatter v0.1
61+
formatter_profile=_L2J Formatter v0.4
5662
formatter_settings_version=12
5763
org.eclipse.jdt.ui.exception.name=e
5864
org.eclipse.jdt.ui.gettersetter.use.is=true

‎JavaEngine/src/com/l2jserver/script/java/MemoryJavaFileManager.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
import java.io.FilterOutputStream;
2929
import java.io.IOException;
3030
import java.io.OutputStream;
31-
import java.io.Reader;
32-
import java.io.StringReader;
3331
import java.net.URI;
3432
import java.nio.CharBuffer;
3533
import java.util.HashMap;
@@ -92,12 +90,6 @@ public CharBuffer getCharContent(boolean ignoreEncodingErrors)
9290
{
9391
return CharBuffer.wrap(code);
9492
}
95-
96-
@SuppressWarnings("unused")
97-
public Reader openReader()
98-
{
99-
return new StringReader(code);
100-
}
10193
}
10294

10395
/**

0 commit comments

Comments
 (0)