commit 79a374bc3bc6594cde19f9dc618b537d790f1a05
author Vinod Kumar S <vinods.kumar@gmail.com> Sat Apr 30 21:09:15 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Mon May 02 17:40:22 2016 +0000
tree bb4da1ea9506e0a5dde1ff85936962243c0b8423
parent 06eca9b86074779a017b5c6bf881b25e6ebfece9

multiFileYangTranslator

Change-Id: I2adfef3acaec4bd74ba2c487404d2c655b800988

src/main/java/org/onosproject/yangutils/translator/tojava/JavaImportData.java

diff --git a/src/main/java/org/onosproject/yangutils/translator/tojava/JavaImportData.java b/src/main/java/org/onosproject/yangutils/translator/tojava/JavaImportData.java
index 723b937..13eaf5f 100644
--- a/src/main/java/org/onosproject/yangutils/translator/tojava/JavaImportData.java
+++ b/src/main/java/org/onosproject/yangutils/translator/tojava/JavaImportData.java
@@ -19,10 +19,6 @@
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import static java.util.Collections.sort;
-
-import org.onosproject.yangutils.datamodel.YangNode;
-import org.onosproject.yangutils.translator.exception.TranslatorException;
 
 import static org.onosproject.yangutils.utils.UtilConstants.ARRAY_LIST;
 import static org.onosproject.yangutils.utils.UtilConstants.AUGMENTED_INFO_CLASS_IMPORT_CLASS;
@@ -42,6 +38,8 @@
 import static org.onosproject.yangutils.utils.UtilConstants.PERIOD;
 import static org.onosproject.yangutils.utils.UtilConstants.SEMI_COLAN;
 
+import static java.util.Collections.sort;
+
 /**
  * Represents that generated Java file can contain imports.
  */
@@ -112,61 +110,30 @@
      * denote, it is not added to import collection and needs to be accessed in
      * a qualified manner.
      *
-     * @param curNode current data model node
      * @param newImportInfo class/interface info being imported
      * @return status of new addition of class/interface to the import set
      */
-    public boolean addImportInfo(YangNode curNode, JavaQualifiedTypeInfo newImportInfo) {
+    public boolean addImportInfo(JavaQualifiedTypeInfo newImportInfo) {
 
-        if (!(curNode instanceof HasJavaImportData)) {
-            throw new TranslatorException("missing import info in data model node");
-        }
-        for (JavaQualifiedTypeInfo curImportInfo : ((HasJavaImportData) curNode).getJavaImportData().getImportSet()) {
+        for (JavaQualifiedTypeInfo curImportInfo : getImportSet()) {
             if (curImportInfo.getClassInfo()
                     .contentEquals(newImportInfo.getClassInfo())) {
                 return curImportInfo.getPkgInfo()
                         .contentEquals(newImportInfo.getPkgInfo());
             }
         }
-        ((HasJavaImportData) curNode).getJavaImportData().getImportSet().add(newImportInfo);
+
+        getImportSet().add(newImportInfo);
         return true;
     }
 
     /**
      * Returns import for class.
      *
-     * @param attr java attribute info
-     * @return imports for class
-     */
-    public List<String> getImports(JavaAttributeInfo attr) {
-
-        String importString;
-        List<String> imports = new ArrayList<>();
-
-        for (JavaQualifiedTypeInfo importInfo : getImportSet()) {
-            if (!importInfo.getPkgInfo().equals(EMPTY_STRING) && importInfo.getClassInfo() != null
-                    && !importInfo.getPkgInfo().equals(JAVA_LANG)) {
-                importString = IMPORT + importInfo.getPkgInfo() + PERIOD + importInfo.getClassInfo() + SEMI_COLAN
-                        + NEW_LINE;
-
-                imports.add(importString);
-            }
-        }
-
-        if (attr.isListAttr()) {
-            imports.add(getImportForList());
-        }
-
-        sort(imports);
-        return imports;
-    }
-
-    /**
-     * Returns import for class.
-     *
      * @return imports for class
      */
     public List<String> getImports() {
+
         String importString;
         List<String> imports = new ArrayList<>();
 
@@ -180,6 +147,10 @@
             }
         }
 
+        if (isListToImport) {
+            imports.add(getImportForList());
+        }
+
         sort(imports);
         return imports;
     }