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%iX{XD8UV+lk-zji%TkVQj7Hipb9w{UU;l=JMLm|>ID-6!v=8%
z25D4<F8MhH8JT&yUWsLidKI}jZzE#!XB&vr-e2#K;XhHV{BoSsMGw6loU-zQ6V~25
ztkYl7IJKW+&bFW5jju49Hg3J>;(c|`(dWPBRlnc(UUk8bmy;gd;m`0{+H&NJ&$UY#
zvMnduy^EZme6;oqx@5|I*=2@)NlM0zCbdJx?6EJxH<dUq;@y5^6U(>ntJz9o*W4;T
zeRy8)bG<{mEH}&Y-xj+zfm3&Fl7(&V5{;(6>PLB2#Xn%#x%OWxcez$13*(OT8|uR6
z*kW!J&l9vUzrg(eQTfg&;s3MN{NwVTlsc`=J8~Cq<b%9AuIxIs%{k7gn&~aA|7QN_
zcCn0a>S{Zdz0LGci~2REx62E~x9m6fJh4l`FGGDx=C)TZZ1*^0Ki(^K{G&9d=4-we
zYslS;_oDmkW>(#3Ip?x{)v|vTMM^V7EAG357cTj9^692rm)KJgGuC`Mw9h;I%Py;O
z+uKL<KH1!zwWH~);~}n!mhhcMy=rxQ$;`eBcCGkvG{-TjSiy10kKKt&I#gEkMi#bv
z{}4Up`|zCX3Z*wy+{~eG=ChQ3eqej#u*<zG*Z7JY+q%0nvliyxxS+cwxVSj!Lhy3`
z0<OubzB6KXbsf&NinFWVXw_<y$#1C}k}$p7xtjgMi;W)^XWLBWzWuPtlEaE`iyFu5
zZEdf1R|hz*%KhkV(mwCp*NeKmk#c2U-<#fjzHJeU$EKd=-pP3@lu~AQOe@=XZe{!q
zjwSbknM_55pRqHo4$R0D4O@IvxvECo-P2B}-;z}%;_$Uasa%t-o3*5(_q>_YFJcvR
zfcbP>LV)YKg<40Ygjz$g1K(_(YA<6`|CGsRv+CJn&$}miF+Sa-|A>cuvHJbahK*l2
z8a~Bqo@{^Q#QWETEv1&%Xclwh-e1;-Q#GajYn)kUz`o+s<G-udo2B1=!8_Gj#%AX=
zb0cZxO}^$l_uIV1WZE5fJ23KwGg@n1S$Cn}f`93+`^~m_`~G!be}3%E-YWN-R#STO
z-}K6Gt+;>mXVUZ3y&q?@u)p^I^4K1fLAbzqCqgLH`?rs<4=<1h!<l)-C5bsXsVRCT
z6(z~}xq6v-C8;?%nOR&2eT<%KP;#IwP`@WcnU{j6i>sr8drp2*Vva&^YDr0EUV1Ss
zPckt00IdYu4J9~$bbdieW_})W&eff?%B|M*3S%Wub~+HtA*ljobv<xi*DFrWNX<<x
z24!B~K1Z%Y1_G|%ZCy{q6*WdokP=uJYqCqvStdtereuLmMRl}e;otkuZTXc{)i0d6
zVs`Auk<b|vt_XzOx!sp9@io+7nWVN`$k~$m8@zFa)876}UH@33?X<}5;1`EYWPT-_
zWqP_Z&t1<b{np$>#_T)CpVn>K_VL~RC%ggPj7;_nxJo7!pu<5x074;`Q(O!RU_nL(
z2?hq=R9o}T3yiB1moe*jU53*L!?BfSFvA;w=4b*jQXz<5wxL+|>9ziv9$c2;N*OTA
z6o3|aF*7irq!VQ0n}TKtf&7p%YdP32FdE_)i1C;S2xfc((D){x@pzLHvULo9!@NPh
zS;fBsY#oe71Rb_S2eS?oFMEO3!IB`d$-Dte!6u^92$MM&FcT`wWROQ5Bbkgn*&^G=
euzlLLwC)RxnD()<0S#kd1HvR=RW^eK!~+0XmTj^C

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>