commit c421600f812c5a884c2eaf2929cb551664f3446a
author Vinod Kumar S <vinods.kumar@huawei.com> Thu Mar 03 19:55:30 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Thu Mar 03 17:05:18 2016 +0000
tree ff2ee68497aef5545591bc7146c1b10f5a5041dc
parent 5ccbe3f2e6a1d1025972d8f4798234fe8fe70e38

removed code duplication in translator, and addressed review comments

Change-Id: I27767a81c4bf279c80d2b98192f75f8f507b4457

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

diff --git a/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BitsListener.java b/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BitsListener.java
index c0c302f..9e5d583 100644
--- a/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BitsListener.java
+++ b/utils/yangutils/src/main/java/org/onosproject/yangutils/parser/impl/listeners/BitsListener.java
@@ -46,11 +46,10 @@
 import org.onosproject.yangutils.datamodel.YangLeafList;
 import org.onosproject.yangutils.datamodel.YangType;
 import org.onosproject.yangutils.parser.Parsable;
-import static org.onosproject.yangutils.utils.YangConstructType.BITS_DATA;
-import static org.onosproject.yangutils.utils.YangConstructType.TYPE_DATA;
 import org.onosproject.yangutils.parser.antlrgencode.GeneratedYangParser;
 import org.onosproject.yangutils.parser.exceptions.ParserException;
 import org.onosproject.yangutils.parser.impl.TreeWalkListener;
+
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorLocation.ENTRY;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorLocation.EXIT;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorMessageConstruction.constructListenerErrorMessage;
@@ -58,10 +57,12 @@
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorType.MISSING_CURRENT_HOLDER;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorType.MISSING_HOLDER;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerValidation.checkStackIsNotEmpty;
+import static org.onosproject.yangutils.utils.YangConstructType.BITS_DATA;
+import static org.onosproject.yangutils.utils.YangConstructType.TYPE_DATA;
 
 /**
- * Implements listener based call back function corresponding to the "bits"
- * rule defined in ANTLR grammar file for corresponding ABNF rule in RFC 6020.
+ * Implements listener based call back function corresponding to the "bits" rule
+ * defined in ANTLR grammar file for corresponding ABNF rule in RFC 6020.
  */
 public final class BitsListener {
 
@@ -79,7 +80,7 @@
      * @param ctx context object of the grammar rule
      */
     public static void processBitsEntry(TreeWalkListener listener,
-                                               GeneratedYangParser.BitsSpecificationContext ctx) {
+            GeneratedYangParser.BitsSpecificationContext ctx) {
 
         // Check for stack to be non empty.
         checkStackIsNotEmpty(listener, MISSING_HOLDER, BITS_DATA, "", ENTRY);
@@ -103,7 +104,7 @@
                 // TODO typedef, union, deviate.
                 default:
                     throw new ParserException(constructListenerErrorMessage(INVALID_HOLDER, TYPE_DATA,
-                            ((YangType) typeData).getDataTypeName(), ENTRY));
+                            ((YangType<?>) typeData).getDataTypeName(), ENTRY));
             }
             listener.getParsedDataStack().push(typeData);
             listener.getParsedDataStack().push(bitsNode);
@@ -120,13 +121,14 @@
      * @param ctx context object of the grammar rule
      */
     public static void processBitsExit(TreeWalkListener listener,
-                                              GeneratedYangParser.BitsSpecificationContext ctx) {
+            GeneratedYangParser.BitsSpecificationContext ctx) {
 
         // Check for stack to be non empty.
         checkStackIsNotEmpty(listener, MISSING_HOLDER, BITS_DATA, "", EXIT);
 
         Parsable tmpBitsNode = listener.getParsedDataStack().peek();
         if (tmpBitsNode instanceof YangBits) {
+            YangBits bitsNode = (YangBits) tmpBitsNode;
             listener.getParsedDataStack().pop();
 
             // Check for stack to be non empty.
@@ -135,8 +137,8 @@
             Parsable tmpNode = listener.getParsedDataStack().peek();
             switch (tmpNode.getYangConstructType()) {
                 case TYPE_DATA: {
-                    YangType typeNode = (YangType) tmpNode;
-                    typeNode.setDataTypeExtendedInfo((YangBits) tmpBitsNode);
+                    YangType<YangBits> typeNode = (YangType<YangBits>) tmpNode;
+                    typeNode.setDataTypeExtendedInfo(bitsNode);
                     break;
                 }
                 default: