Improve recognition of switch-enum statements

Author: emmanue1

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/StatementMaker.java

@@ -375,7 +375,7 @@ protected void parseSwitch(WatchDog watchdog, BasicBlock basicBlock, Statements<
         if ((size > 3) && (conditionClass == ClassFileLocalVariableReferenceExpression.class) && (statements.get(size-2).getClass() == SwitchStatement.class)) {
             // Check pattern & make 'switch-string'
             SwitchStatementMaker.makeSwitchString(localVariableMaker, statements, switchStatement);
-        } else if ((bodyDeclaration.getInnerTypeDeclarations() != null) && (conditionClass == ArrayExpression.class)) {
+        } else if (conditionClass == ArrayExpression.class) {
             // Check pattern & make 'switch-enum'
             SwitchStatementMaker.makeSwitchEnum(bodyDeclaration, switchStatement);
         }

src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/SwitchStatementMaker.java

@@ -187,13 +187,14 @@ public static void makeSwitchEnum(ClassFileBodyDeclaration bodyDeclaration, Swit
             FieldReferenceExpression fre = (FieldReferenceExpression)ae.getExpression();
 
             if (fre.getDescriptor().equals("[I") && fre.getName().startsWith("$SwitchMap$")) {
-                // Javac switch-enum pattern
-                ClassFileClassDeclaration syntheticClass =  (ClassFileClassDeclaration)bodyDeclaration.getInnerTypeDeclaration(fre.getInternalTypeName());
+                ClassFileClassDeclaration syntheticClass = (ClassFileClassDeclaration)bodyDeclaration.getInnerTypeDeclaration(fre.getInternalTypeName());
 
-                bodyDeclaration = (ClassFileBodyDeclaration)syntheticClass.getBodyDeclaration();
-
-                DefaultList<Statement> statements = (DefaultList)bodyDeclaration.getMethodDeclarations().get(0).getStatements();
-                updateSwitchStatement(switchStatement, statements.listIterator(1));
+                if (syntheticClass != null) {
+                    // Javac switch-enum pattern
+                    bodyDeclaration = (ClassFileBodyDeclaration) syntheticClass.getBodyDeclaration();
+                    DefaultList<Statement> statements = (DefaultList) bodyDeclaration.getMethodDeclarations().get(0).getStatements();
+                    updateSwitchStatement(switchStatement, statements.listIterator(1));
+                }
             }
         } else if (expressionClass == ClassFileMethodInvocationExpression.class) {
             MethodInvocationExpression mie = (MethodInvocationExpression)ae.getExpression();