Formatting updates
- wrap comments at 120
- no formatting for block and line comments
diff --git a/eclipse-format.xml b/eclipse-format.xml
index b925a9f..0479894 100644
--- a/eclipse-format.xml
+++ b/eclipse-format.xml
@@ -1,9 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- eclipse-formatter configuration for Samoa. Mostly same as eclipse built-in "java conventions" with the following differences:
- 1/ line wrap at 120 chars, 2/ spaces-only indentation (no tabs) 3/ do not join lines (i.e. do not break line breaks added
- intentionally) The eclipse formatter can be invoked standalone (from the eclipse installation directory) with the following
- command: eclipse -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter -config eclipse-format.xml <samoa-dir> There
- is also a plugin for intellij -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- eclipse-formatter configuration for Samoa. Mostly same as eclipse built-in "java conventions" with the following differences:
+ 1/ line wrap at 120 chars,
+ 2/ spaces-only indentation (no tabs)
+ 3/ do not join lines (i.e. do not break line breaks added intentionally)
+
+ Formatting is applied to javadoc but not for block comments or line comments.
+ The eclipse formatter can be invoked standalone (from the eclipse installation directory) with the following
+ command:
+ eclipse -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter -config eclipse-format.xml <samoa-dir>
+ There is also a plugin for intellij -->
<profiles version="1">
<profile kind="CodeFormatterProfile" name="samoa" version="1">
@@ -62,7 +81,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert" />
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration"
value="do not insert" />
- <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true" />
+ <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false" />
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments"
value="insert" />
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert" />
@@ -241,7 +260,7 @@
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert" />
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16" />
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true" />
- <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80" />
+ <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120" />
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert" />
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1" />
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert" />
@@ -296,7 +315,7 @@
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="true" />
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0" />
<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false" />
- <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true" />
+ <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false" />
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert" />
<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0" />
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert" />
