commit db828bd5156b97ba9f6d5ef947a04bbdee9163c5
author Gaurav Agrawal <gaurav.agrawal@huawei.com> Sat Feb 27 03:57:50 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Tue Mar 01 21:59:14 2016 +0000
tree d3a282b9a28375ae1c9159c832dcc027175e819c
parent 480a47de2e6f95dd167801220f043e81037b9e94

YANG construct collision detection framework added

Change-Id: I1458f9e3192641f3f90c444798c31a64536ffa5d

src/main/java/org/onosproject/yangutils/parser/impl/parserutils/ListenerErrorMessageConstruction.java

diff --git a/src/main/java/org/onosproject/yangutils/parser/impl/parserutils/ListenerErrorMessageConstruction.java b/src/main/java/org/onosproject/yangutils/parser/impl/parserutils/ListenerErrorMessageConstruction.java
index 1ef25e3..538cb0e 100644
--- a/src/main/java/org/onosproject/yangutils/parser/impl/parserutils/ListenerErrorMessageConstruction.java
+++ b/src/main/java/org/onosproject/yangutils/parser/impl/parserutils/ListenerErrorMessageConstruction.java
@@ -16,9 +16,9 @@
 
 package org.onosproject.yangutils.parser.impl.parserutils;
 
-import org.onosproject.yangutils.parser.ParsableDataType;
+import org.onosproject.yangutils.utils.YangConstructType;
 
-import static org.onosproject.yangutils.parser.ParsableDataType.getParsableDataType;
+import static org.onosproject.yangutils.utils.YangConstructType.getYangConstructType;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorLocation.getErrorLocationMessage;
 import static org.onosproject.yangutils.parser.impl.parserutils.ListenerErrorType.getErrorType;
 
@@ -37,21 +37,21 @@
      * Constructs message for error with extended information and returns the
      * same.
      *
-     * @param errorType error type needs to be set in error message.
-     * @param parsableDataType type of parsable data in which error occurred.
+     * @param errorType error type needs to be set in error message
+     * @param yangConstructType type of parsable data in which error occurred
      * @param parsableDataTypeName identifier/string of parsable data type in
-     *            which error occurred.
-     * @param errorLocation location where error occurred.
-     * @param extendedErrorInformation extended error information.
-     * @return constructed error message.
+     *            which error occurred
+     * @param errorLocation location where error occurred
+     * @param extendedErrorInformation extended error information
+     * @return constructed error message
      */
     public static String constructExtendedListenerErrorMessage(ListenerErrorType errorType,
-                                                               ParsableDataType parsableDataType,
+                                                               YangConstructType yangConstructType,
                                                                String parsableDataTypeName,
                                                                ListenerErrorLocation errorLocation,
                                                                String extendedErrorInformation) {
         String newErrorMessage;
-        newErrorMessage = constructListenerErrorMessage(errorType, parsableDataType, parsableDataTypeName,
+        newErrorMessage = constructListenerErrorMessage(errorType, yangConstructType, parsableDataTypeName,
                                                         errorLocation)
                 + "\n"
                 + "Error Information: "
@@ -63,22 +63,22 @@
      * Constructs message for error during listener based tree walk and returns
      * the same.
      *
-     * @param errorType error type needs to be set in error message.
-     * @param parsableDataType type of parsable data in which error occurred.
+     * @param errorType error type needs to be set in error message
+     * @param yangConstructType type of parsable data in which error occurred
      * @param parsableDataTypeName identifier/string of parsable data type in
-     *            which error occurred.
-     * @param errorLocation location where error occurred.
-     * @return constructed error message.
+     *            which error occurred
+     * @param errorLocation location where error occurred
+     * @return constructed error message
      */
     public static String constructListenerErrorMessage(ListenerErrorType errorType,
-                                                       ParsableDataType parsableDataType,
+                                                       YangConstructType yangConstructType,
                                                        String parsableDataTypeName,
                                                        ListenerErrorLocation errorLocation) {
 
         String errorMessage;
 
         errorMessage = "Internal parser error detected: " + getErrorType(errorType) + " "
-                + getParsableDataType(parsableDataType);
+                + getYangConstructType(yangConstructType);
 
         if (!parsableDataTypeName.isEmpty()) {
             errorMessage = errorMessage + " \"" + parsableDataTypeName + "\" ";