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/utils/StringGenerator.java

diff --git a/generator/src/main/java/org/onosproject/yangutils/translator/tojava/utils/StringGenerator.java b/generator/src/main/java/org/onosproject/yangutils/translator/tojava/utils/StringGenerator.java
index 2ab8bc3..f680b50 100644
--- a/generator/src/main/java/org/onosproject/yangutils/translator/tojava/utils/StringGenerator.java
+++ b/generator/src/main/java/org/onosproject/yangutils/translator/tojava/utils/StringGenerator.java
@@ -16,20 +16,13 @@
 
 package org.onosproject.yangutils.translator.tojava.utils;
 
-import org.onosproject.yangutils.datamodel.YangAugment;
-import org.onosproject.yangutils.datamodel.YangChoice;
 import org.onosproject.yangutils.datamodel.YangCompilerAnnotation;
-import org.onosproject.yangutils.datamodel.YangNode;
 import org.onosproject.yangutils.datamodel.YangType;
 import org.onosproject.yangutils.datamodel.utils.builtindatatype.YangDataTypes;
 import org.onosproject.yangutils.translator.exception.TranslatorException;
-import org.onosproject.yangutils.translator.tojava.JavaQualifiedTypeInfoTranslator;
-import org.onosproject.yangutils.utils.io.YangPluginConfig;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -49,7 +42,6 @@
 import static org.onosproject.yangutils.translator.tojava.utils.BracketType.OPEN_CLOSE_BRACKET_WITH_VALUE_AND_RETURN_TYPE;
 import static org.onosproject.yangutils.translator.tojava.utils.MethodClassTypes.CLASS_TYPE;
 import static org.onosproject.yangutils.translator.tojava.utils.MethodsGenerator.getIfConditionForAddToListMethod;
-import static org.onosproject.yangutils.translator.tojava.utils.SubtreeFilteringMethodsGenerator.getQualifiedInfo;
 import static org.onosproject.yangutils.utils.UtilConstants.ADD_STRING;
 import static org.onosproject.yangutils.utils.UtilConstants.AND;
 import static org.onosproject.yangutils.utils.UtilConstants.APPEND;
@@ -887,7 +879,7 @@
      */
     static String getElseIfConditionBegin(String indentation,
                                           String condition) {
-        return indentation + CLOSE_CURLY_BRACKET + SPACE + ELSE + SPACE +
+        return indentation + CLOSE_CURLY_BRACKET + ELSE +
                 getIfConditionBegin(EMPTY_STRING, condition);
     }
 
@@ -1305,48 +1297,4 @@
     static String getQualifiedString(String pkg, String cls) {
         return pkg + PERIOD + cls;
     }
-
-    /**
-     * Returns import list for node list.
-     *
-     * @param nodes  node list
-     * @param config plugin config
-     * @return import list
-     */
-    public static List<JavaQualifiedTypeInfoTranslator> getNodesImports(List<YangNode> nodes,
-                                                                        YangPluginConfig config) {
-        List<JavaQualifiedTypeInfoTranslator> imports = new ArrayList<>();
-        for (YangNode node : nodes) {
-            JavaQualifiedTypeInfoTranslator qInfo = getQualifiedInfo(node,
-                                                                     config);
-            imports.add(qInfo);
-        }
-        return imports;
-    }
-
-    /**
-     * Returns list of child node for choice.
-     *
-     * @param choice choice node
-     * @return list of child nodes
-     */
-    public static List<YangNode> getChoiceChildNodes(YangChoice choice) {
-        List<YangNode> childs = new ArrayList<>();
-        YangNode child = choice.getChild();
-        while (child != null) {
-            childs.add(child);
-            child = child.getNextSibling();
-        }
-
-        List<YangAugment> augments = choice.getAugmentedInfoList();
-        YangNode augmentCase;
-        for (YangAugment augment : augments) {
-            augmentCase = augment.getChild();
-            while (augmentCase != null) {
-                childs.add(augmentCase);
-                augmentCase = augmentCase.getNextSibling();
-            }
-        }
-        return childs;
-    }
 }