Changeset 32578 in osm

Timestamp:

2016-07-05T14:48:59+02:00 (8 years ago)

Author:

floscher

Message:

[mapillary] Update formatter settings for Eclipse and IntelliJ

Location:

applications/editors/josm/plugins/mapillary

Files:

• .idea/codeStyleSettings.xml (modified) (3 diffs)
• .settings/org.eclipse.jdt.core.prefs (modified) (3 diffs)
• .settings/org.eclipse.jdt.ui.prefs (modified) (1 diff)

applications/editors/josm/plugins/mapillary/.idea/codeStyleSettings.xml

@@ -11 +11 @@
         <option name="IMPORT_LAYOUT_TABLE">
           <value>
+            <package name="" withSubpackages="true" static="true" />
+            <emptyLine />
             <package name="java" withSubpackages="true" static="false" />
             <emptyLine />
@@ -16 +18 @@
             <emptyLine />
             <package name="" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="" withSubpackages="true" static="true" />
           </value>
         </option>
@@ -40 +40 @@
           <indentOptions>
             <option name="INDENT_SIZE" value="2" />
-            <option name="CONTINUATION_INDENT_SIZE" value="4" />
+            <option name="CONTINUATION_INDENT_SIZE" value="2" />
             <option name="TAB_SIZE" value="2" />
           </indentOptions>

applications/editors/josm/plugins/mapillary/.settings/org.eclipse.jdt.core.prefs

@@ -40 +40 @@
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=info
 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
@@ -165 +165 @@
 org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
 org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation=1
 org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
 org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
@@ -383 +383 @@
 org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=separate_lines_if_wrapped
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=separate_lines_if_wrapped
 org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
 org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines

applications/editors/josm/plugins/mapillary/.settings/org.eclipse.jdt.ui.prefs

@@ -3 +3 @@
 formatter_settings_version=12
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;;\#;
+org.eclipse.jdt.ui.importorder=\#;java;javax;;
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.ondemandthreshold=9999