commit 2da23bff0728639add6ccd1b8715a6deeca993bb
author Bharat saraswal <bharat.saraswal@huawei.com> Thu Aug 25 15:28:39 2016 +0530
committer bharat saraswal-huawei <bharat.saraswal@huawei.com> Sat Aug 27 05:21:20 2016 +0000
tree 6208b0c8752672387620968d4e0d64c540312a65
parent cd06d36f8b8515c66820230ef454301e3599efc3

[ONOS-5142] [ONOS-5137] defect fixes

Change-Id: I2856a7a41b242b16c981915dd97986aa9c6ab676

plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java

diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java
index 1988e5a..37ce7ee 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java
@@ -30,6 +30,7 @@
 import org.onosproject.yangutils.datamodel.YangModule;
 import org.onosproject.yangutils.datamodel.YangNode;
 import org.onosproject.yangutils.datamodel.YangSubModule;
+import org.onosproject.yangutils.datamodel.javadatamodel.JavaQualifiedTypeInfo;
 import org.onosproject.yangutils.translator.exception.TranslatorException;
 import org.onosproject.yangutils.translator.tojava.javamodel.JavaLeafInfoContainer;
 import org.onosproject.yangutils.translator.tojava.javamodel.YangJavaGroupingTranslator;
@@ -1584,7 +1585,7 @@
             addLeafIdAttributes(newAttrInfo, leafCount, pluginConfig);
         }
         if (!newAttrInfo.isIntConflict() &&
-                !newAttrInfo.isLongConflict()) {
+                !newAttrInfo.isLongConflict() && !newAttrInfo.isShortConflict()) {
             if ((getGeneratedTempFiles() & GETTER_FOR_CLASS_MASK) != 0) {
                 addGetterImpl(newAttrInfo, pluginConfig);
             }
@@ -1863,8 +1864,9 @@
      * @return status of the qualified access to the attribute
      */
     boolean getIsQualifiedAccessOrAddToImportList(
-            JavaQualifiedTypeInfoTranslator importInfo) {
-        return getJavaImportData().addImportInfo(importInfo, getGeneratedJavaClassName(),
+            JavaQualifiedTypeInfo importInfo) {
+        return getJavaImportData().addImportInfo((JavaQualifiedTypeInfoTranslator) importInfo,
+                getGeneratedJavaClassName(),
                 getJavaFileInfo().getPackage());
     }