commit c2fd3227f49e550e78d4599e2e4fbc80320f1d56
author Bharat saraswal <bharat.saraswal@huawei.com> Wed Oct 19 16:10:27 2016 +0530
committer Bharat saraswal <bharat.saraswal@huawei.com> Thu Oct 20 12:32:44 2016 +0530
tree eba96a0f52bdaafe41e511034b42cc8b891e385a
parent 5eb588b50d366c42ac5583d1f706d18476d7a92a

[ONOS-5527,ONOS-5529] process sub tree filtering in generted code changes.

Change-Id: I2b5562ee57d887c25f4a6b55cd25006e288563c0

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

diff --git a/generator/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java b/generator/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java
index 4b8ca9c..00a7baf 100644
--- a/generator/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java
+++ b/generator/src/main/java/org/onosproject/yangutils/translator/tojava/TempJavaFragmentFiles.java
@@ -92,9 +92,7 @@
 import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getSetterString;
 import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getToStringMethod;
 import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.parseBuilderInterfaceBuildMethodString;
-import static org.onosproject.yangutils.translator.tojava.utils.StringGenerator.getChoiceChildNodes;
 import static org.onosproject.yangutils.translator.tojava.utils.StringGenerator.getImportString;
-import static org.onosproject.yangutils.translator.tojava.utils.StringGenerator.getNodesImports;
 import static org.onosproject.yangutils.translator.tojava.utils.StringGenerator.getOverRideString;
 import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator.getSubtreeFilteringForLeaf;
 import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator.getSubtreeFilteringForLeafList;
@@ -607,14 +605,8 @@
             throws IOException {
         TempJavaBeanFragmentFiles tempFiles =
                 getBeanFiles((JavaCodeGeneratorInfo) parent);
-        if (curNode instanceof YangChoice) {
-            tempFiles.setAttrNode(curNode);
-            for (JavaQualifiedTypeInfoTranslator info : getNodesImports(
-                    getChoiceChildNodes((YangChoice) curNode), config))
-                tempFiles.addToSubTreeImports(info);
-        } else {
-            tempFiles.setAttrNode(null);
-        }
+        tempFiles.setAttrNode(curNode);
+
         JavaAttributeInfo attr =
                 getCurNodeAsAttributeInTarget(curNode, parent, isList,
                                               tempFiles);
@@ -1779,9 +1771,6 @@
         if (curNode.isOpTypeReq()) {
             addSubTreeImportStrings(imports);
         }
-        if (curNode instanceof YangCase) {
-            removeCaseParentImport(curNode, imports);
-        }
 
         if ((fileType & BUILDER_CLASS_MASK) != 0 ||
                 (fileType & DEFAULT_CLASS_MASK) != 0) {
@@ -1828,15 +1817,6 @@
         freeTemporaryResources(false);
     }
 
-    //Removes case's parent import.
-    private void removeCaseParentImport(YangNode node, List<String> imports) {
-        YangNode parent = node.getParent();
-        JavaFileInfo info = ((JavaFileInfoContainer) parent).getJavaFileInfo();
-        String impt = getImportString(info.getPackage(),
-                                      getCapitalCase(info.getJavaName()));
-        imports.remove(impt);
-    }
-
     //Adds import for array list.
     private void addArrayListImport(List<String> imports) {
         if (imports.contains(javaImportData.getImportForList())) {
@@ -2143,4 +2123,5 @@
         }
         sortImports(imports);
     }
+
 }