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/javamodel/YangJavaTypeTranslator.java

diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/javamodel/YangJavaTypeTranslator.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/javamodel/YangJavaTypeTranslator.java
index cb8d3ba..911e0c4 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/javamodel/YangJavaTypeTranslator.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/javamodel/YangJavaTypeTranslator.java
@@ -15,7 +15,7 @@
  */
 package org.onosproject.yangutils.translator.tojava.javamodel;
 
-import org.onosproject.yangutils.datamodel.YangType;
+import org.onosproject.yangutils.datamodel.javadatamodel.YangJavaType;
 import org.onosproject.yangutils.translator.exception.TranslatorException;
 import org.onosproject.yangutils.translator.tojava.JavaQualifiedTypeInfoTranslator;
 import org.onosproject.yangutils.utils.io.YangToJavaNamingConflictUtil;
@@ -26,15 +26,11 @@
 
 /**
  * Represents java information corresponding to the YANG type.
- *
- * @param <T> generic parameter for YANG java type
  */
-public class YangJavaTypeTranslator<T>
-        extends YangType<T>
+public class YangJavaTypeTranslator
+        extends YangJavaType
         implements JavaQualifiedTypeResolver {
 
-    private JavaQualifiedTypeInfoTranslator javaQualifiedAccess;
-
     /**
      * Create a YANG leaf object with java qualified access details.
      */
@@ -45,7 +41,7 @@
 
     @Override
     public void updateJavaQualifiedInfo(YangToJavaNamingConflictUtil conflictResolver) {
-        JavaQualifiedTypeInfoTranslator importInfo = getJavaQualifiedInfo();
+        JavaQualifiedTypeInfoTranslator importInfo = (JavaQualifiedTypeInfoTranslator) getJavaQualifiedInfo();
 
         /*
          * Type is added as an attribute in the class.
@@ -58,7 +54,7 @@
              */
             importInfo.setClassInfo(className);
             String classPkg = getJavaImportPackage(this,
-                    false,  conflictResolver);
+                    false, conflictResolver);
             if (classPkg == null) {
                 throw new TranslatorException("import package cannot be null when the class is used");
             }
@@ -77,13 +73,4 @@
         setJavaQualifiedInfo(importInfo);
     }
 
-    @Override
-    public JavaQualifiedTypeInfoTranslator getJavaQualifiedInfo() {
-        return javaQualifiedAccess;
-    }
-
-    @Override
-    public void setJavaQualifiedInfo(JavaQualifiedTypeInfoTranslator typeInfo) {
-        javaQualifiedAccess = typeInfo;
-    }
 }