commit 02f115f8c05930dc6930b947f0bf75da8b49eef8
author Vidyashree Rama <vidyashree.rama@huawei.com> Mon Apr 18 12:29:39 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Mon Apr 18 17:08:32 2016 +0000
tree 87908c50ab4333ed5b22bedadd3c78d4ac23b38a
parent 1c6acc42b7fa27e510679d0fccc5ae57d8763c88

Whitebox issue fix

Change-Id: I856266e26d2686affb9271c460927ba3e0e07db2

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 469e416..2c2ce05 100644
--- a/src/main/java/org/onosproject/yangutils/translator/tojava/JavaImportData.java
+++ b/src/main/java/org/onosproject/yangutils/translator/tojava/JavaImportData.java
@@ -19,6 +19,7 @@
 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;
@@ -62,7 +63,7 @@
     /**
      * Returns if the list needs to be imported.
      *
-     * @return true if any of the attribute needs to be maintained as a list.
+     * @return true if any of the attribute needs to be maintained as a list
      */
     public boolean getIfListImported() {
         return isListToImport;
@@ -71,7 +72,7 @@
     /**
      * Sets the status of importing list.
      *
-     * @param isList status to mention list is bing imported.
+     * @param isList status to mention list is bing imported
      */
     public void setIfListImported(boolean isList) {
         isListToImport = isList;
@@ -138,10 +139,9 @@
         List<String> imports = new ArrayList<>();
 
         for (JavaQualifiedTypeInfo importInfo : getImportSet()) {
-            importString = IMPORT;
-            if (importInfo.getPkgInfo() != EMPTY_STRING && importInfo.getClassInfo() != null
-                    && importInfo.getPkgInfo() != JAVA_LANG) {
-                importString = importString + importInfo.getPkgInfo() + PERIOD + importInfo.getClassInfo() + SEMI_COLAN
+            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);
@@ -152,7 +152,7 @@
             imports.add(getImportForList());
         }
 
-        java.util.Collections.sort(imports);
+        sort(imports);
         return imports;
     }