commit 250a747288e80966968aea52ba6b9ea61ede7dd1
author Bharat saraswal <bharat.saraswal@huawei.com> Thu May 12 13:16:57 2016 +0530
committer Thomas Vachuska <tom@onlab.us> Tue May 17 18:18:06 2016 +0000
tree 2da428697b040f288626088020c5d13abf04804a
parent 85971c6a33d3a91884ce42dc4f94efff9ee1bdd1

[ONOS-4411,ONOS-4413,ONOS-4526] Yang Enumeration Translator and Defect fixes.

Change-Id: Ie5b6b5d6d6df283a57ae06b1979f0d03022f3baf

src/main/java/org/onosproject/yangutils/translator/tojava/utils/TempJavaCodeFragmentFilesUtils.java

diff --git a/src/main/java/org/onosproject/yangutils/translator/tojava/utils/TempJavaCodeFragmentFilesUtils.java b/src/main/java/org/onosproject/yangutils/translator/tojava/utils/TempJavaCodeFragmentFilesUtils.java
index 741274e..e1db371 100644
--- a/src/main/java/org/onosproject/yangutils/translator/tojava/utils/TempJavaCodeFragmentFilesUtils.java
+++ b/src/main/java/org/onosproject/yangutils/translator/tojava/utils/TempJavaCodeFragmentFilesUtils.java
@@ -21,7 +21,11 @@
 import java.util.List;
 
 import org.onosproject.yangutils.datamodel.YangNode;
+import org.onosproject.yangutils.translator.tojava.JavaFileInfoContainer;
 import org.onosproject.yangutils.translator.tojava.JavaImportDataContainer;
+import org.onosproject.yangutils.translator.tojava.JavaQualifiedTypeInfo;
+
+import static java.util.Collections.sort;
 
 import static org.onosproject.yangutils.translator.tojava.JavaImportData.getAugmentedInfoImport;
 import static org.onosproject.yangutils.translator.tojava.JavaImportData.getHasAugmentationImport;
@@ -31,8 +35,6 @@
 import static org.onosproject.yangutils.utils.UtilConstants.HAS_AUGMENTATION;
 import static org.onosproject.yangutils.utils.io.impl.FileSystemUtil.updateFileHandle;
 
-import static java.util.Collections.sort;
-
 /**
  * Represents utilities for temporary java code fragments.
  */
@@ -52,7 +54,8 @@
      * @param operation add or delete import
      * @return import for HasAugmentation class
      */
-    public static List<String> addHasAugmentationImport(YangNode curNode, List<String> imports, boolean operation) {
+    public static List<String> addHasAugmentationImport(YangNode curNode, List<String> imports,
+            boolean operation) {
         if (curNode instanceof JavaImportDataContainer) {
             String thisImport = getHasAugmentationImport();
             performOperationOnImports(imports, thisImport, operation);
@@ -109,13 +112,14 @@
      * @param operation add or remove
      * @return import list
      */
-    private static List<String> performOperationOnImports(List<String> imports, String curImport, boolean operation) {
+    private static List<String> performOperationOnImports(List<String> imports, String curImport,
+            boolean operation) {
         if (operation) {
             imports.add(curImport);
         } else {
             imports.remove(curImport);
         }
-        sort(imports);
+        sortImports(imports);
         return imports;
     }
 
@@ -142,7 +146,7 @@
      * @return true or false
      */
     public static boolean isHasAugmentationExtended(List<String> extendsList) {
-        return (extendsList != null && extendsList.contains(HAS_AUGMENTATION));
+        return extendsList != null && extendsList.contains(HAS_AUGMENTATION);
     }
 
     /**
@@ -152,7 +156,7 @@
      * @return true or false
      */
     public static boolean isAugmentedInfoExtended(List<String> extendsList) {
-        return (extendsList != null && extendsList.contains(AUGMENTED_INFO));
+        return extendsList != null && extendsList.contains(AUGMENTED_INFO);
     }
 
     /**
@@ -172,4 +176,37 @@
             }
         }
     }
+
+    /**
+     * Detects collision between parent and child node which have same name.
+     * When parent and child node both have the same name in that case child node should be used with
+     * qualified name.
+     *
+     * @param curNode current YANG node
+     * @param qualifiedTypeInfo current node's qualified info
+     * @return true if collision is detected
+     */
+    public static boolean detectCollisionBwParentAndChildForImport(YangNode curNode,
+            JavaQualifiedTypeInfo qualifiedTypeInfo) {
+
+        YangNode parent = curNode.getParent();
+        String parentsClassInfo = ((JavaFileInfoContainer) parent).getJavaFileInfo().getJavaName();
+        String childsClassInfo = qualifiedTypeInfo.getClassInfo();
+        if (childsClassInfo.equals(parentsClassInfo)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Returns sorted import list.
+     *
+     * @param imports import list
+     * @return sorted import list
+     */
+    public static List<String> sortImports(List<String> imports) {
+        sort(imports);
+        return imports;
+    }
+
 }