Merge branch 'master' into e423

eclipse-aspectj · Sep 8, 2023 · 39bdd1c · 39bdd1c
2 parents 3a0e84c + c52bcbd
commit 39bdd1c
Show file tree

Hide file tree

Showing 80 changed files with 427 additions and 618 deletions.
diff --git a/ajc.prefs b/ajc.prefs
@@ -0,0 +1,8 @@
+# Make sure that AJC can compile the project from an IDE like IntelliJ IDEA.
+# Caveat: ECJ property must be prefixed by "org.aspectj" for AJC.
+# Use "ajc -properties .../org.eclipse.ajdt/ajc.prefs" to activate this config file.
+#
+# See also:
+# https://github.com/eclipse-jdt/eclipse.jdt.core/blob/e53f36cf836b620a316c9c2e321cf7ba6cc78e52/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java#L2649-L2666
+# https://github.com/eclipse-aspectj/eclipse.jdt.core/blob/aeeae36048d1615da8e2bf86f6ce4ab1c0011743/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaCore.java#L2650-L2667
+org.aspectj.org.eclipse.jdt.core.compiler.ignoreUnnamedModuleForSplitPackage=enabled
diff --git a/org.aspectj.ajde/.classpath b/org.aspectj.ajde/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="classes" sourcepath="source"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.aspectj.runtime/.classpath b/org.aspectj.runtime/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="classes" sourcepath="source"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.aspectj.runtime/META-INF/MANIFEST.MF b/org.aspectj.runtime/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Export-Package: org.aspectj.internal.lang.annotation;version="1.9.20",
  org.aspectj.runtime.internal.cflowstack;version="1.9.20",
  org.aspectj.runtime.reflect;version="1.9.20"
 Eclipse-BundleShape: jar
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ClassPath: .
 Implementation-Version: 1.9.20
 Implementation-Vendor: aspectj.org
diff --git a/org.aspectj.weaver/.classpath b/org.aspectj.weaver/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="classes" sourcepath="source"/>
 </classpath>
diff --git a/org.aspectj.weaver/META-INF/MANIFEST.MF b/org.aspectj.weaver/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@ Export-Package: org.aspectj.apache.bcel;version="1.9.20",
  org.aspectj.weaver.reflect;version="1.9.20",
  org.aspectj.weaver.tools;version="1.9.20"
 Eclipse-BundleShape: jar
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ClassPath: .
 Implementation-Version: 1.9.20
 Implementation-Vendor: aspectj.org
diff --git a/...c/org/eclipse/ajdt/core/tests/builder/CoreOutputLocationManagerRefreshTestsBug270335.java b/...c/org/eclipse/ajdt/core/tests/builder/CoreOutputLocationManagerRefreshTestsBug270335.java
@@ -54,7 +54,7 @@ boolean zapped() {
     }
 
 
-    private class MockCoreCompilerConfiguration extends CoreCompilerConfiguration {
+    private static class MockCoreCompilerConfiguration extends CoreCompilerConfiguration {
 
         boolean iGotFlushed = false;
 

diff --git a/...ipse.ajdt.core.tests/src/org/eclipse/ajdt/core/tests/model/MultipleProjectModelTests.java b/...ipse.ajdt.core.tests/src/org/eclipse/ajdt/core/tests/model/MultipleProjectModelTests.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2010 SprinSource and others.
- * All rights reserved. This program and the accompanying materials 
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     Andrew Eisenberg  - initial version
  *******************************************************************************/
@@ -29,25 +29,25 @@
 
 /**
  * Tests for mapping between IProgramElement and IJavaElements
- * 
+ *
  * This class tests that aj references across projects are working
  */
 public class MultipleProjectModelTests extends AJDTCoreTestCase {
 
     private IJavaProject commons;
     private IJavaProject dependent;
     private AJProjectModelFacade model;
-    
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         commons = JavaCore.create(createPredefinedProject("DefaultEmptyProject"));
         dependent = JavaCore.create(createPredefinedProject("DefaultEmptyProjectDependent"));
         model = AJProjectModelFactory.getInstance().getModelForJavaElement(dependent);
     }
-    
+
     public void testITDFieldInOtherProject() throws Exception {
-        ICompilationUnit other = createCompilationUnitAndPackage("common", "Aspect.aj", 
+        ICompilationUnit other = createCompilationUnitAndPackage("common", "Aspect.aj",
                 "package common;\n" +
                 "public aspect Aspect {\n" +
                 "  public int ITD.x;\n" +
@@ -57,7 +57,7 @@ public void testITDFieldInOtherProject() throws Exception {
                 "  interface ITD { }\n" +
                 "  public @interface Foo{ }" +
                 "}", commons);
-        ICompilationUnit unit = createCompilationUnitAndPackage("dependent", "Java.java", 
+        ICompilationUnit unit = createCompilationUnitAndPackage("dependent", "Java.java",
                 "package dependent;\n" +
                 "public class Java {\n" +
                 "}", dependent);
@@ -66,7 +66,7 @@ public void testITDFieldInOtherProject() throws Exception {
         assertNoProblems(dependent.getProject());
         IType type = unit.getType("Java");
         IType otherType = other.getType("Aspect");
-        
+
         List<IJavaElement> elts = model.getRelationshipsForElement(type,  AJRelationshipManager.ASPECT_DECLARATIONS);
 
         // the ITDs + the declare statement
@@ -88,17 +88,17 @@ public void testITDFieldInOtherProject() throws Exception {
     private void roundTripCheck(IType otherType, IJavaElement orig) throws JavaModelException {
         assertTrue("Should exist: " + orig.getHandleIdentifier(), orig.exists());
         assertEquals(otherType, orig.getParent());
-        assertTrue("" + orig + " should be a child of " + otherType, isAChildOf(otherType, orig));
-        
+        assertTrue(orig + " should be a child of " + otherType, isAChildOf(otherType, orig));
+
         IProgramElement ipe = model.javaElementToProgramElement(orig);
         assertNotSame(IHierarchy.NO_STRUCTURE, ipe);
-        
+
         orig = model.programElementToJavaElement(ipe);
         assertTrue("Should exist: " + orig.getHandleIdentifier(), orig.exists());
         assertEquals(otherType, orig.getParent());
-        assertTrue("" + orig + " should be a child of " + otherType, isAChildOf(otherType, orig));
+        assertTrue(orig + " should be a child of " + otherType, isAChildOf(otherType, orig));
     }
-    
+
     private boolean isAChildOf(IParent parent, IJavaElement maybeChild) throws JavaModelException {
         IJavaElement[] children = parent.getChildren();
         for (IJavaElement child : children) {
@@ -108,4 +108,4 @@ private boolean isAChildOf(IParent parent, IJavaElement maybeChild) throws JavaM
         }
         return false;
     }
-}
+}
diff --git a/org.eclipse.ajdt.core.tests/workspace/Bug280385NoArgConstructors/.classpath b/org.eclipse.ajdt.core.tests/workspace/Bug280385NoArgConstructors/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ajdt.core.tests/workspace/Bug280508AspectOf/.classpath b/org.eclipse.ajdt.core.tests/workspace/Bug280508AspectOf/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ajdt.core.tests/workspace/Bug282948/.classpath b/org.eclipse.ajdt.core.tests/workspace/Bug282948/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ajdt.core.tests/workspace/Bug283468/.classpath b/org.eclipse.ajdt.core.tests/workspace/Bug283468/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ajdt.core.tests/workspace/Bug284358/.classpath b/org.eclipse.ajdt.core.tests/workspace/Bug284358/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ajdt.core.tests/workspace/Bug295249/.classpath b/org.eclipse.ajdt.core.tests/workspace/Bug295249/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ajdt.core.tests/workspace/Bug298683/.classpath b/org.eclipse.ajdt.core.tests/workspace/Bug298683/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ajdt.core.tests/workspace/DifferentProjectNameBug275903/.classpath b/org.eclipse.ajdt.core.tests/workspace/DifferentProjectNameBug275903/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" output="bin3" path="src3"/>
 	<classpathentry kind="src" output="bin2" path="src2"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.ajdt.core.ASPECTJRT_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ajdt.core.tests/workspace/OtherProjectBug275903/.classpath b/org.eclipse.ajdt.core.tests/workspace/OtherProjectBug275903/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/builder/AJBuilder.java b/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/builder/AJBuilder.java
@@ -110,7 +110,7 @@ public AJBuilder() {
     /* (non-Javadoc)
      * @see org.eclipse.core.resources.IncrementalProjectBuilder#build(int, java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
      */
-    protected IProject[] build(int kind, Map args, IProgressMonitor progressMonitor) throws CoreException {
+    protected IProject[] build(int kind, Map<String, String> args, IProgressMonitor progressMonitor) throws CoreException {
         IProject project = getProject();
         AjCompiler compiler = AspectJPlugin.getDefault().getCompilerFactory().getCompilerForProject(project);
 
@@ -457,10 +457,10 @@ public void run() {
         return participants;
     }
 
-    private void augmentAspectPath(IProject project, Map args) {
+    private void augmentAspectPath(IProject project, Map<String, String> args) {
         if (args.containsKey("aspectPath")) {
             AJLog.logStart("Augmenting aspect path with args from builder");
-            String toAugment = (String) args.get("aspectPath");
+            String toAugment = args.get("aspectPath");
             String[] toAugmentArr = toAugment.split(",");
             for (int i = 0; i < toAugmentArr.length; i++) {
                 toAugmentArr[i] = toAugmentArr[i].trim();

diff --git a/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/buildpath/BuildConfigurationUtils.java b/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/buildpath/BuildConfigurationUtils.java
@@ -196,7 +196,7 @@ else if (name.equals("src.excludes")) { //$NON-NLS-1$
 					}
 					IPath[] exclusionPatterns = new IPath[exclusions.size()];
 					for (int j = 0; j < exclusionPatterns.length; j++) {
-						String exclusionPathStr = (String) exclusions.get(j);
+						String exclusionPathStr = exclusions.get(j);
 						if (exclusionPathStr.startsWith(srcFolder)) {
 							exclusionPathStr = exclusionPathStr.substring(srcFolder.length());
 						}
@@ -206,7 +206,7 @@ else if (name.equals("src.excludes")) { //$NON-NLS-1$
 					}
 					IPath[] inclusionPatterns = new IPath[inclusions.size()];
 					for (int j = 0; j < inclusionPatterns.length; j++) {
-						String inclusionPathStr = (String) inclusions.get(j);
+						String inclusionPathStr = inclusions.get(j);
 						if (inclusionPathStr.startsWith(srcFolder)) {
 							inclusionPathStr = inclusionPathStr.substring(srcFolder.length());
 						}

diff --git a/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/dom/rewrite/AjASTRewriteAnalyzer.java b/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/dom/rewrite/AjASTRewriteAnalyzer.java
@@ -875,9 +875,7 @@ protected String getSeparatorString(int nodeIndex) {
 
 			String lineDelim= getLineDelimiter();
 			StringBuilder buf= new StringBuilder(lineDelim);
-			for (int i= 0; i < newLines; i++) {
-				buf.append(lineDelim);
-			}
+			buf.append(lineDelim.repeat(Math.max(0, newLines)));
 			buf.append(createIndentString(getNodeIndent(nodeIndex + 1)));
 			return buf.toString();
 		}
@@ -955,9 +953,7 @@ private int rewriteParagraphList(ASTNode parent, StructuralPropertyDescriptor pr
 		ParagraphListRewriter listRewriter= new ParagraphListRewriter(insertIndent, separator);
 		StringBuilder leadString= new StringBuilder();
 		if (isAllOfKind(events, RewriteEvent.INSERTED)) {
-			for (int i= 0; i < lead; i++) {
-				leadString.append(getLineDelimiter());
-			}
+			leadString.append(String.valueOf(getLineDelimiter()).repeat(Math.max(0, lead)));
 			leadString.append(createIndentString(insertIndent));
 		}
 		return listRewriter.rewriteList(parent, property, insertPos, leadString.toString());

diff --git a/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/javaelements/AspectJMemberElement.java b/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/javaelements/AspectJMemberElement.java
@@ -13,6 +13,7 @@
 
 
 import java.util.List;
+import java.util.Objects;
 
 import org.aspectj.asm.IProgramElement.Accessibility;
 import org.aspectj.asm.IProgramElement.ExtraInformation;
@@ -46,11 +47,7 @@ public class AspectJMemberElement extends NamedMember implements IMethod, IAspec
 
 	public AspectJMemberElement(JavaElement parent, String name, String[] parameterTypes) {
 		super(parent, name);
-		if (parameterTypes == null) {
-			fParameterTypes= fgEmptyList;
-		} else {
-			fParameterTypes= parameterTypes;
-		}
+    fParameterTypes = Objects.requireNonNullElse(parameterTypes, fgEmptyList);
 	}
 
 	/* (non-Javadoc)

diff --git a/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/javaelements/AspectJMemberElementInfo.java b/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/javaelements/AspectJMemberElementInfo.java
@@ -11,6 +11,7 @@
 package org.eclipse.ajdt.core.javaelements;
 
 import java.util.List;
+import java.util.Objects;
 
 import org.aspectj.asm.IProgramElement.Modifiers;
 import org.aspectj.asm.IProgramElement.Accessibility;
@@ -178,11 +179,7 @@ public char[] getReturnTypeName() {
 	}
 
 	public void setAnnotations(IAnnotation[] annotations) {
-	    if (annotations == null) {
-	        this.annotations = Annotation.NO_ANNOTATIONS;
-	    } else {
-	        this.annotations = annotations;
-	    }
+    this.annotations = Objects.requireNonNullElse(annotations, Annotation.NO_ANNOTATIONS);
 	}
 
 	public void setArguments(ILocalVariable[] arguments) {

diff --git a/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/javaelements/DeclareElement.java b/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/javaelements/DeclareElement.java
@@ -54,7 +54,7 @@ protected Object createElementInfo() {
                     List<String> typesConverted = new ArrayList<>(types.size());
                     for (String parentTypeName : types) {
 
-                        parentTypeName = parentTypeName.replaceAll("\\$", "\\.");
+                        parentTypeName = parentTypeName.replaceAll("\\$", ".");
                         typesConverted.add(parentTypeName);
                     }
                     elementInfo.setTypes(typesConverted.toArray(new String[0]));

diff --git a/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/javaelements/ITDAwareSourceTypeInfo.java b/org.eclipse.ajdt.core/src/org/eclipse/ajdt/core/javaelements/ITDAwareSourceTypeInfo.java
@@ -73,7 +73,7 @@ public Object getElementInfo() throws JavaModelException {
             return info;
         }
     }
-    private final class ITIT extends SourceType {
+    private static final class ITIT extends SourceType {
         final Object info;
         private ITIT(JavaElement parent, IType actualType, IProgramElement ajElement) throws JavaModelException {
             super(parent, actualType.getElementName());
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ boolean zapped() { @@
         }
-        private class MockCoreCompilerConfiguration extends CoreCompilerConfiguration {
+        private static class MockCoreCompilerConfiguration extends CoreCompilerConfiguration {
             boolean iGotFlushed = false;
@@ Expand Down @@