Try to fix build error after merge: set AccStatic *after* checking role
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
index 87144dd..53626d4 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
@@ -931,6 +931,9 @@
// checks for member types before local types to catch local members
if (enclosingType.isInterface())
modifiers |= ClassFileConstants.AccPublic;
+//{ObjectTeams: check for role / team modifiers
+ modifiers = Protections.checkRoleModifiers(modifiers, this.referenceContext, this);
+// SH}
if (sourceType.isEnum()) {
if (!enclosingType.isStatic())
problemReporter().nonStaticContextForEnumMemberType(sourceType);
@@ -939,9 +942,6 @@
} else if (sourceType.isInterface()) {
modifiers |= ClassFileConstants.AccStatic; // 8.5.1
}
-//{ObjectTeams: check for role / team modifiers
- modifiers = Protections.checkRoleModifiers(modifiers, this.referenceContext, this);
-// SH}
} else if (sourceType.isLocalType()) {
if (sourceType.isEnum()) {
problemReporter().illegalLocalTypeDeclaration(this.referenceContext);
