Fixes errors in JavaFileTypeFactoryProvider

Author: emmanue1

services/src/main/java/jd/gui/service/type/JavaFileTypeFactoryProvider.java

@@ -210,7 +210,12 @@ protected void enterTypeDeclaration(ParserRuleContext ctx, int access) {
                 superQualifiedTypeName = resolveInternalTypeName(superType.classOrInterfaceType().Identifier());
             }
 
-            access += getTypeDeclarationContextAccessFlag(ctx.getParent());
+            ParserRuleContext parent = ctx.getParent();
+
+            if (parent instanceof JavaParser.TypeDeclarationContext)
+                access += getTypeDeclarationContextAccessFlag(parent);
+            else if (parent instanceof JavaParser.MemberDeclarationContext)
+                access += getMemberDeclarationContextAccessFlag(parent.getParent());
 
             if (currentType == null) {
                 String internalTypeName = packageName.isEmpty() ? name : packageName + "/" + name;
@@ -317,8 +322,6 @@ public void enterMethodDeclaration(
 
         public void enterConstructorDeclaration(JavaParser.ConstructorDeclarationContext ctx) {
             int access = getClassBodyDeclarationAccessFlag(ctx.getParent().getParent());
-            TerminalNode identifier = ctx.Identifier();
-            String name = identifier.getText();
             String paramDescriptors = createParamDescriptors(ctx.formalParameters().formalParameterList());
             String descriptor = paramDescriptors + "V";
 
@@ -344,27 +347,44 @@ protected String createParamDescriptors(JavaParser.FormalParameterListContext fo
         protected int getTypeDeclarationContextAccessFlag(ParserRuleContext ctx) {
             int access = 0;
 
-            for (JavaParser.ClassOrInterfaceModifierContext modifierContext : ctx.getRuleContexts(JavaParser.ClassOrInterfaceModifierContext.class)) {
-                access += getAccessFlag(modifierContext);
+            for (JavaParser.ClassOrInterfaceModifierContext coiModifierContext : ctx.getRuleContexts(JavaParser.ClassOrInterfaceModifierContext.class)) {
+                access += getAccessFlag(coiModifierContext);
             }
 
             return access;
         }
 
-        protected int getClassBodyDeclarationAccessFlag(ParserRuleContext ctx) {
+        protected int getMemberDeclarationContextAccessFlag(ParserRuleContext ctx) {
             int access = 0;
 
             for (JavaParser.ModifierContext modifierContext : ctx.getRuleContexts(JavaParser.ModifierContext.class)) {
-                JavaParser.ClassOrInterfaceModifierContext coimc = modifierContext.classOrInterfaceModifier();
-
-                if (coimc != null) {
-                    access += getAccessFlag(coimc);
+                JavaParser.ClassOrInterfaceModifierContext coiModifierContext = modifierContext.classOrInterfaceModifier();
+                if (coiModifierContext != null) {
+                    access += getAccessFlag(coiModifierContext);
                 }
             }
 
             return access;
         }
 
+        protected int getClassBodyDeclarationAccessFlag(ParserRuleContext ctx) {
+            if ((currentType.access & JavaType.FLAG_INTERFACE) == 0) {
+                int access = 0;
+
+                for (JavaParser.ModifierContext modifierContext : ctx.getRuleContexts(JavaParser.ModifierContext.class)) {
+                    JavaParser.ClassOrInterfaceModifierContext coimc = modifierContext.classOrInterfaceModifier();
+
+                    if (coimc != null) {
+                        access += getAccessFlag(coimc);
+                    }
+                }
+
+                return access;
+            } else {
+                return JavaType.FLAG_PUBLIC;
+            }
+        }
+
         protected int getAccessFlag(JavaParser.ClassOrInterfaceModifierContext ctx) {
             if (ctx.getChildCount() == 1) {
                 ParseTree first = ctx.getChild(0);