From 329a1e8295faa12259fb306165a0fffa4b8c07a4 Mon Sep 17 00:00:00 2001
From: "aurimas@google.com"
 <aurimas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 3 Dec 2013 23:55:26 +0000
Subject: Enable PRESUMIT checks for ModifierOrder, ImportOrder and Trailing
 Whitespace.

R=newt@chromium.org

Review URL: https://codereview.chromium.org/102603002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238488 0039d316-1c4b-4281-b951-d872f2087c98
---
 tools/android/checkstyle/chromium-style-5.0.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/android/checkstyle/chromium-style-5.0.xml b/tools/android/checkstyle/chromium-style-5.0.xml
index 8e18747..63c869e 100644
--- a/tools/android/checkstyle/chromium-style-5.0.xml
+++ b/tools/android/checkstyle/chromium-style-5.0.xml
@@ -24,8 +24,10 @@
       <message key="import.unused" value="Unused import: {0}. Use :JavaImportOrganize (ECLIM) or Ctrl+Shift+O (Eclipse) to sort imports"/>
     </module>
     <module name="JavadocType">
-      <property name="severity" value="warning"/>
-      <property name="scope" value="protected"/>
+      <property name="severity" value="error"/>
+      <property name="tokens" value="INTERFACE_DEF, CLASS_DEF"/>
+      <property name="scope" value="public"/>
+      <message key="javadoc.missing" value="Public classes and interfaces require JavaDoc comments."/>
     </module>
     <module name="JavadocMethod">
       <property name="severity" value="warning"/>
@@ -95,7 +97,9 @@
       <property name="severity" value="error"/>
       <property name="reliefPattern" value=".*"/>
     </module>
-    <module name="ModifierOrder"/>
+    <module name="ModifierOrder">
+      <property name="severity" value="error"/>
+    </module>
     <module name="WhitespaceAround">
       <property name="severity" value="error"/>
       <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND" />
@@ -121,9 +125,9 @@
       <property name="severity" value="warning"/>
     </module>
     <module name="ImportOrder">
-      <property name="severity" value="warning"/>
+      <property name="severity" value="error"/>
       <message key="import.ordering" value="Wrong order for {0} import. Use :JavaImportOrganize (ECLIM) or Ctrl+Shift+O (Eclipse) to sort imports"/>
-      <property name="groups" value="android, com, org, java"/>
+      <property name="groups" value="android, com, dalvik, gov, junit, libcore, net, org, java, javax"/>
       <property name="ordered" value="true"/>
       <property name="option" value="top"/>
       <property name="separated" value="true"/>
@@ -142,6 +146,7 @@
     <property name="message" value="All TODOs should be named.  e.g. &quot;TODO(johndoe):"/>
   </module>
   <module name="RegexpSingleline">
+    <property name="severity" value="error"/>
     <property name="format" value="[ \t]+$"/>
     <property name="message" value="Trailing whitespace"/>
     </module>
-- 
cgit v1.1