From fa7199ddac1e95ccc5e0a5ebbe512bda4f4ed651 Mon Sep 17 00:00:00 2001
From: "sopov.ivan" <sopov.ivan@otr.ru>
Date: Wed, 1 Jul 2015 17:22:27 +0300
Subject: [PATCH] Fix Eclipse 4.5 formatter settings

Fixes gh-3384
---
 eclipse/eclipse-code-formatter.xml | 2 +-
 eclipse/org.eclipse.jdt.core.prefs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclipse/eclipse-code-formatter.xml b/eclipse/eclipse-code-formatter.xml
index ea51ccce7b..303449503e 100644
--- a/eclipse/eclipse-code-formatter.xml
+++ b/eclipse/eclipse-code-formatter.xml
@@ -17,7 +17,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
diff --git a/eclipse/org.eclipse.jdt.core.prefs b/eclipse/org.eclipse.jdt.core.prefs
index b25b4acfb0..24bf63fd73 100644
--- a/eclipse/org.eclipse.jdt.core.prefs
+++ b/eclipse/org.eclipse.jdt.core.prefs
@@ -184,7 +184,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
 org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=8
+org.eclipse.jdt.core.formatter.indentation.size=4
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert