commit 02b05d2b657813d185031f11907aeafe9a436256
author Gaurav Agrawal <gaurav.agrawal@huawei.com> Fri Feb 19 12:57:13 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Fri Feb 19 19:55:50 2016 +0000
tree 6f28a8d72b4abda501ef0d80f5e27495cef8c33d
parent b21d1711372938135d451709fc6730e2f0c2fe30

[ONOS-3880, 3881] Change to static import for lesser indentation.

Change-Id: I93a39f9b0ccd019ace5900bf8ba68f7d60f228a0

utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/VersionListener.java

diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/VersionListener.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/VersionListener.java
index ae9389f..f9d904d 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/VersionListener.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/VersionListener.java
@@ -19,14 +19,16 @@
 import org.onosproject.yangutils.datamodel.YangModule;
 import org.onosproject.yangutils.datamodel.YangSubModule;
 import org.onosproject.yangutils.parser.Parsable;
-import org.onosproject.yangutils.parser.ParsableDataType;
 import org.onosproject.yangutils.parser.antlrgencode.GeneratedYangParser;
 import org.onosproject.yangutils.parser.exceptions.ParserException;
 import org.onosproject.yangutils.parser.impl.TreeWalkListener;
-import org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorLocation;
-import org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorMessageConstruction;
-import org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorType;
-import org.onosproject.yangutils.parser.impl.parserutils.ListenerValidation;
+
+import static org.onosproject.yangutils.parser.ParsableDataType.VERSION_DATA;
+import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorLocation.ENTRY;
+import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorMessageConstruction.constructListenerErrorMessage;
+import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorType.INVALID_HOLDER;
+import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorType.MISSING_HOLDER;
+import static org.onosproject.yangutils.parser.impl.parserutils.ListenerValidation.checkStackIsNotEmpty;
 
 /*
  * Reference: RFC6020 and YANG ANTLR Grammar
@@ -73,9 +75,8 @@
     }
 
     /**
-     * It is called when parser receives an input matching the grammar
-     * rule (version), perform validations and update the data model
-     * tree.
+     * It is called when parser receives an input matching the grammar rule
+     * (version), perform validations and update the data model tree.
      *
      * @param listener Listener's object.
      * @param ctx context object of the grammar rule.
@@ -84,9 +85,7 @@
                                            GeneratedYangParser.YangVersionStatementContext ctx) {
 
         // Check for stack to be non empty.
-        ListenerValidation
-                .checkStackIsNotEmpty(listener, ListenerErrorType.MISSING_HOLDER, ParsableDataType.VERSION_DATA,
-                                      String.valueOf(ctx.INTEGER().getText()), ListenerErrorLocation.ENTRY);
+        checkStackIsNotEmpty(listener, MISSING_HOLDER, VERSION_DATA, String.valueOf(ctx.INTEGER().getText()), ENTRY);
 
         Integer version = Integer.valueOf(ctx.INTEGER().getText());
         if (!isVersionValid(version)) {
@@ -110,10 +109,8 @@
             break;
         }
         default:
-            throw new ParserException(ListenerErrorMessageConstruction.
-                    constructListenerErrorMessage(ListenerErrorType.INVALID_HOLDER,
-                            ParsableDataType.VERSION_DATA, String.valueOf(ctx.INTEGER().getText()),
-                            ListenerErrorLocation.ENTRY));
+            throw new ParserException(constructListenerErrorMessage(INVALID_HOLDER, VERSION_DATA,
+                                                                    String.valueOf(ctx.INTEGER().getText()), ENTRY));
         }
     }
 
@@ -126,4 +123,4 @@
     private static boolean isVersionValid(Integer version) {
         return version == 1;
     }
-}
\ No newline at end of file
+}