From ab76631a7fa4cf3c4f05a65ff59657fb94fe0c38 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Sun, 26 Aug 2018 21:12:20 -0700
Subject: [PATCH] Update code style file, remove old style .jar

---
 Source/Android/code-style-java.jar | Bin 1808 -> 0 bytes
 Source/Android/code-style-java.xml |  92 ++++++++++++++++++++---------
 2 files changed, 64 insertions(+), 28 deletions(-)
 delete mode 100644 Source/Android/code-style-java.jar

diff --git a/Source/Android/code-style-java.jar b/Source/Android/code-style-java.jar
deleted file mode 100644
index 17f9d2afc03d7b16d31a72d75a882f21ba1c71a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1808
zcmWIWW@Zs#00F^0%iTaU40AIuFeK-vq!yP{=A;(u!xVBbyzp4#cHG6_)C(pCh7IBj
z4AQ6yUGj4ZGBWdYy%Nh3^(u06-bTdc&o&ULy}#Ze!+)Y!`Q<pNiynGAIA!GpC#=1B
zSf{_DacV!uoNYh98((2IZQOd%#rx`>qtAcMtA4-nz3PG=FDE^^!=K@^wB^VbpKF&g
zWLr+QdlxxB`DpDKbjg(avdawpl9Y@aO=^dX*<)XXZz^$K#Jl~-CYEpCSF@GGuDMlw
z`tZEo=X!^BS#Fl)zb$rc0;lfUBn#WzB^phC)sOP5ihsbebM3!Y?sBb27RDXvH`ImC
zvBlgdo+oHyeu4S_qw<|m!vANj`N!owDRo+#cjPYK$On0KT-kMMn{%8~HPc&K|IPf<
z?P3|<)YWz@dz<N@7WHdRZ<iN}Z`p6|d19A>UxxaY%x$k+*zR%0e!N%e_(y3@&DVS{
z){wgw??w07&8)i7a?WM@s%8Hwij-!ER@`?9FI@8J<kL;LF0rQ~W~}*iXrFiZmt9un
zwzrSyeX_YbYe&;p$3t8dE#W(jde!Rql9_!M>{{{TXpUo4v4Z20AG;Hmbf~Q6jVx^U
z{vmqG_u)C&6-sZaxS2!W%x5Y6{J{3eVV8SXuJIK)wsm)DW-ZLWaY1)WaB*?ch2Z7>
z1zeL=eP_h(>N=cj6=zq!(W=!ZliyM|Bw>2Db2a;i7aKn;&bFD#efwdPC5IK?7B!C9
z+uC03t`2ZqmHW}#q<!AGuNQTBBjw7zzBj%5eA^-xk4-(#y_54+D5cEqm{zv&+{*YJ
z982y6GntAAKVxTF9hi|R8n*bTa#fAEyQiH{za^_k#Nlg;Qn@BuH)}~n?|Cz)U&Jct
z0Q2d%gaFrd3$>0)3AKh~2fo=n)n3M?{wb5sX4SLDo_A03Vtl$u{}B)SV)gr-4I965
zG<=HJJlX!piTAGwTS_gj(Jbc1y}zsvr)o<5*EqAzfPKZM$A4F^H%q_$f_JL5jLpt#
z=0?)Wn|#fA?zef1$+SD}c3|WUXSCM3vhG5`1^?1t_nU3=_WkR={`}aRy;bfvt)}$m
zzv-3XT5<pA&!p$6dq2)*VSnxa<*_{|gK&W}PlQmY_irCzA6^Cq1{luFD=taQ$w^Jo
zE2$_+&d=4$%qvOF$;r&(Lg-`kT!WGWWf>S4JR!=w6g*vA9TnVj@{<yC6oOMrN;31(
zi$Pi;nb$`s)EjI!l;B`sV8|~h$;{6~&bhjiR=L%>USX_cU|^Wez`!7fqzaVP^}u;u
zuQ)j)H8-^wlzDyo9Jvk|2)KT?bv+SR)EF^AN?>8E$u2!-nH+_gk_9>y)zOZHfA2rH
z<yTTwzi{S?*|8r-LT604A`o)tc3-~4*HD9HlG<(|XG`jD@WvHRd;2qW{bPx?(;~Zr
zUmP}(`IT^%>FLfqcRi!@TXPc`v+o>#TDNK2$9Mam@CJA@GTAdgJcn5_sX)Cc0Hr~W
z2fMvkpNl~OEXc?p!NA~~YHQwkfpK->GG-mG%WxWDIJVLZW_SYw1A`|1vJJ(uPp|dY
z^x(1#SIU4{26D6)GXn!kIzcwRDQJce$PX#AmV^BQqal8Q7>}8NV8(;|(!@+4IU!re
z@HfmG<eOFeE5O#lXoz)?c)?6`FzZ0^vX>c=1d&bV4Oj{`5uHYu%)x+}P+=y6Jn|UH
oWKhgwCR=3t7`9K_mezfN5z{_aHc(1oV_;)QVq##J!2;p|09lr8vH$=8

diff --git a/Source/Android/code-style-java.xml b/Source/Android/code-style-java.xml
index f51bcf3281..35c0b133fe 100644
--- a/Source/Android/code-style-java.xml
+++ b/Source/Android/code-style-java.xml
@@ -1,36 +1,47 @@
-<code_scheme name="Dolphin-Java">
-  <option name="FIELD_NAME_PREFIX" value="m" />
-  <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-  <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-  <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-    <value />
-  </option>
-  <option name="IMPORT_LAYOUT_TABLE">
+<code_scheme name="Dolphin-Java" version="173">
+  <option name="OTHER_INDENT_OPTIONS">
     <value>
-      <package name="android" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="com" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="junit" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="net" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="org" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="java" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="javax" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="" withSubpackages="true" static="false" />
-      <emptyLine />
-      <package name="" withSubpackages="true" static="true" />
-      <emptyLine />
+      <option name="INDENT_SIZE" value="2" />
+      <option name="TAB_SIZE" value="2" />
     </value>
   </option>
   <option name="RIGHT_MARGIN" value="100" />
   <AndroidXmlCodeStyleSettings>
     <option name="USE_CUSTOM_SETTINGS" value="true" />
   </AndroidXmlCodeStyleSettings>
+  <JavaCodeStyleSettings>
+    <option name="FIELD_NAME_PREFIX" value="m_" />
+    <option name="STATIC_FIELD_NAME_PREFIX" value="s_" />
+    <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+      <value />
+    </option>
+    <option name="IMPORT_LAYOUT_TABLE">
+      <value>
+        <package name="android" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="com" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="junit" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="net" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="org" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="java" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="javax" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="true" />
+        <emptyLine />
+      </value>
+    </option>
+    <option name="JD_P_AT_EMPTY_LINES" value="false" />
+  </JavaCodeStyleSettings>
   <XML>
     <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
   </XML>
@@ -38,10 +49,35 @@
     <option name="BRACE_STYLE" value="2" />
     <option name="CLASS_BRACE_STYLE" value="2" />
     <option name="METHOD_BRACE_STYLE" value="2" />
+    <option name="LAMBDA_BRACE_STYLE" value="2" />
     <option name="ELSE_ON_NEW_LINE" value="true" />
+    <option name="WHILE_ON_NEW_LINE" value="true" />
     <option name="CATCH_ON_NEW_LINE" value="true" />
+    <option name="FINALLY_ON_NEW_LINE" value="true" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <option name="RESOURCE_LIST_WRAP" value="1" />
+    <option name="EXTENDS_LIST_WRAP" value="1" />
+    <option name="THROWS_LIST_WRAP" value="1" />
+    <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+    <option name="THROWS_KEYWORD_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="BINARY_OPERATION_WRAP" value="1" />
+    <option name="TERNARY_OPERATION_WRAP" value="1" />
+    <option name="FOR_STATEMENT_WRAP" value="1" />
+    <option name="ASSIGNMENT_WRAP" value="1" />
+    <option name="ASSERT_STATEMENT_WRAP" value="1" />
+    <option name="DOWHILE_BRACE_FORCE" value="3" />
+    <option name="METHOD_ANNOTATION_WRAP" value="1" />
+    <option name="CLASS_ANNOTATION_WRAP" value="1" />
+    <option name="FIELD_ANNOTATION_WRAP" value="1" />
+    <option name="PARAMETER_ANNOTATION_WRAP" value="1" />
+    <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
+    <option name="ENUM_CONSTANTS_WRAP" value="1" />
     <indentOptions>
-      <option name="USE_TAB_CHARACTER" value="true" />
+      <option name="INDENT_SIZE" value="2" />
+      <option name="TAB_SIZE" value="2" />
     </indentOptions>
   </codeStyleSettings>
   <codeStyleSettings language="XML">
@@ -201,4 +237,4 @@
       </rules>
     </arrangement>
   </codeStyleSettings>
-</code_scheme>
\ No newline at end of file
+</code_scheme>