From 84c72ec3202ed9c2dff66ba3f5136a38af4ce95c Mon Sep 17 00:00:00 2001
From: rnveach <rveach02@gmail.com>
Date: Tue, 10 Nov 2015 12:42:30 -0500
Subject: [PATCH] Issue #2451: removed excess hierarchy from ImportOrderCheck

---
 config/suppressions.xml                       |  2 +-
 .../checks/imports/ImportOrderCheck.java      | 33 ++++++++++++++++---
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/config/suppressions.xml b/config/suppressions.xml
index 668a78347..3e57c3205 100644
--- a/config/suppressions.xml
+++ b/config/suppressions.xml
@@ -109,7 +109,7 @@
     <!-- equals() - a lot of fields to check -->
     <suppress checks="CyclomaticComplexity" files="LocalizedMessage\.java" lines="210"/>
     <!-- SWITCH was transformed into IF-ELSE -->
-    <suppress checks="CyclomaticComplexity" files="ImportOrderCheck\.java" lines="331"/>
+    <suppress checks="CyclomaticComplexity" files="ImportOrderCheck\.java" lines="354"/>
 
     <!-- LocalizedMessage class is immutable, we need that amount of arguments. -->
     <suppress checks="ParameterNumber"
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java
index c2ffd8b49..373143110 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportOrderCheck.java
@@ -19,13 +19,16 @@
 
 package com.puppycrawl.tools.checkstyle.checks.imports;
 
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.beanutils.ConversionException;
+
+import com.puppycrawl.tools.checkstyle.api.Check;
 import com.puppycrawl.tools.checkstyle.api.DetailAST;
 import com.puppycrawl.tools.checkstyle.api.FullIdent;
 import com.puppycrawl.tools.checkstyle.api.TokenTypes;
-import com.puppycrawl.tools.checkstyle.checks.AbstractOptionCheck;
 import com.puppycrawl.tools.checkstyle.utils.CommonUtils;
 
 /**
@@ -175,7 +178,7 @@ import com.puppycrawl.tools.checkstyle.utils.CommonUtils;
  * @author <a href="mailto:nesterenko-aleksey@list.ru">Aleksey Nesterenko</a>
  */
 public class ImportOrderCheck
-    extends AbstractOptionCheck<ImportOrderOption> {
+    extends Check {
 
     /**
      * A key is pointing to the warning message text in "messages.properties"
@@ -217,11 +220,31 @@ public class ImportOrderCheck
     /** Whether static imports should be sorted alphabetically or not. */
     private boolean sortStaticImportsAlphabetically;
 
+    /** The policy to enforce. */
+    private ImportOrderOption option = ImportOrderOption.UNDER;
+
     /**
-     * Groups static imports under each group.
+     * Set the option to enforce.
+     * @param optionStr string to decode option from
+     * @throws ConversionException if unable to decode
      */
-    public ImportOrderCheck() {
-        super(ImportOrderOption.UNDER, ImportOrderOption.class);
+    public void setOption(String optionStr) {
+        try {
+            option = ImportOrderOption.valueOf(optionStr.trim().toUpperCase(Locale.ENGLISH));
+        }
+        catch (IllegalArgumentException iae) {
+            throw new ConversionException("unable to parse " + optionStr, iae);
+        }
+    }
+
+    /**
+     * Gets option set.
+     * @return the {@code option} set
+     */
+    public ImportOrderOption getAbstractOption() {
+        // WARNING!! Do not rename this method to getOption(). It breaks
+        // BeanUtils, which will silently not call setOption. Very annoying!
+        return option;
     }
 
     /**