commit e3175d3adc6bb5593d6d1fa9344f256923c1ae1b
author Bharat saraswal <bharat.saraswal@huawei.com> Wed Aug 31 17:50:11 2016 +0530
committer Bharat saraswal <bharat.saraswal@huawei.com> Wed Aug 31 17:50:11 2016 +0530
tree ad6d5071ba595cea8c98b7fc7df03934b05a08ec
parent 61edaa049e91b546b8eaa638eaf767edd40a5c5d

[ONOS-5141],[ONOS-5142],[ONOS-5165],[ONOS-4881],[ONOS-4889],[ONOS-5104],[ONOS-5138] defect fixes

Change-Id: I435dc0cf9afae7230fc98b57f33af104e0e38e67

plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java

diff --git a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java
index 089a1b3..724c9cf 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/JavaCodeGeneratorUtil.java
@@ -90,7 +90,9 @@
         while (codeGenNode != null) {
             if (curTraversal != PARENT) {
                 if (!(codeGenNode instanceof JavaCodeGenerator)) {
-                    throw new TranslatorException("Unsupported node to generate code");
+                    throw new TranslatorException("Unsupported node to generate code " +
+                            codeGenNode.getName() + " in " + codeGenNode.getLineNumber() + " at "
+                            + codeGenNode.getCharPosition() + " in " + codeGenNode.getFileName());
                 }
                 setCurNode(codeGenNode);
                 try {
@@ -155,7 +157,9 @@
         } else {
             close(codeGenNode, yangPlugin);
             throw new TranslatorException(
-                    "Generated data model node cannot be translated to target language code");
+                    "Generated data model node cannot be translated to target language code for " +
+                            codeGenNode.getName() + " in " + codeGenNode.getLineNumber()
+                            + " at " + codeGenNode.getCharPosition() + " in " + codeGenNode.getFileName());
         }
     }
 
@@ -175,7 +179,9 @@
         } else {
             close(codeGenNode, pluginConfig);
             throw new TranslatorException(
-                    "Generated data model node cannot be translated to target language code");
+                    "Generated data model node cannot be translated to target language code for " +
+                            codeGenNode.getName() + " in " + codeGenNode.getLineNumber()
+                            + " at " + codeGenNode.getCharPosition() + " in " + codeGenNode.getFileName());
         }
     }
 
@@ -281,18 +287,17 @@
         if (node instanceof JavaCodeGenerator && ((TempJavaCodeFragmentFilesContainer) node)
                 .getTempJavaCodeFragmentFiles() != null) {
             ((TempJavaCodeFragmentFilesContainer) node).getTempJavaCodeFragmentFiles().freeTemporaryResources(true);
-        } else {
-
-            if (getRootNode() != null) {
-                JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) getRootNode()).getJavaFileInfo();
-                if (javaFileInfo != null) {
-                    searchAndDeleteTempDir(javaFileInfo.getBaseCodeGenPath() +
-                            javaFileInfo.getPackageFilePath());
-                } else {
-                    searchAndDeleteTempDir(yangPlugin.getCodeGenDir());
-                }
+        }
+        if (getRootNode() != null) {
+            JavaFileInfoTranslator javaFileInfo = ((JavaFileInfoContainer) getRootNode()).getJavaFileInfo();
+            if (javaFileInfo.getPackage() != null) {
+                searchAndDeleteTempDir(javaFileInfo.getBaseCodeGenPath() +
+                        javaFileInfo.getPackageFilePath());
+            } else {
+                searchAndDeleteTempDir(yangPlugin.getCodeGenDir());
             }
         }
+
     }
 
     /**