From 2e5da267098a93eb6b23d3b219a6d64a69af0188 Mon Sep 17 00:00:00 2001
From: Tim Swast <swast@google.com>
Date: Tue, 29 Mar 2016 10:58:41 -0700
Subject: [PATCH] Checkstyle fixes.

I modify the checkstyle config to have SAME_PACKAGE imports appear
before third-party imports. I think this better matches the intent of
the import ordering rules in the style guide.
https://google.github.io/styleguide/javaguide.html#s3.3.3-import-ordering-and-spacing
Expecially since it says the `com.google` imports only appear after
static imports if the source file is in the `com.google` package space.

(cherry picked from commit 7ca0e7564d4d1a39714d8c90e71d5e408f30f4da)
---
 google-checks.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/google-checks.xml b/google-checks.xml
index aa1e5335b6b..5f1d75b1e7e 100644
--- a/google-checks.xml
+++ b/google-checks.xml
@@ -167,9 +167,9 @@
         </module>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="CustomImportOrder">
-            <property name="specialImportsRegExp" value="com.google"/>
+            <property name="specialImportsRegExp" value="^javax\."/>
             <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
+            <property name="customImportOrderRules" value="STATIC###SAME_PACKAGE(2)###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS"/>
         </module>
         <module name="MethodParamPad"/>
         <module name="OperatorWrap">