Disambiguate StringTemplate

Fixes maven javadoc error "both class org.eclipse.jdt.internal.compiler.ast.StringTemplate in org.eclipse.jdt.internal.compiler.ast and interface java.lang.StringTemplate in java.lang match" as can be seen at https://ci.eclipse.org/platform/job/eclipse.platform.releng.aggregator/job/master/2149/console
eclipse-jdt · Mar 25, 2024 · 76082af · 76082af
1 parent 815822f
commit 76082af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ASTVisitor.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ASTVisitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2023 IBM Corporation and others.
+ * Copyright (c) 2000, 2024 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -1019,7 +1019,7 @@ public boolean visit(SwitchExpression switchExpression, BlockScope blockScope) {
 	public  boolean visit(RecordComponent recordComponent, BlockScope scope) {
 		return true; // do nothing by default, keep traversing
 	}
-	public boolean visit(StringTemplate expr, BlockScope scope1) {
+	public boolean visit(org.eclipse.jdt.internal.compiler.ast.StringTemplate expr, BlockScope scope1) {
 		// TODO Auto-generated method stub
 		return false;
 	}

diff --git a/...ipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/GenericAstVisitor.java b/...ipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/GenericAstVisitor.java
@@ -445,7 +445,7 @@ public boolean visit(StringLiteralConcatenation literal, BlockScope scope) {
 	}
 
 	@Override
-	public boolean visit(StringTemplate expr, BlockScope scope1) {
+	public boolean visit(org.eclipse.jdt.internal.compiler.ast.StringTemplate expr, BlockScope scope1) {
 		return visitNode(expr);
 	}
 	@Override

diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Parser.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Parser.java
@@ -57,6 +57,7 @@
 import org.eclipse.jdt.internal.compiler.ASTVisitor;
 import org.eclipse.jdt.internal.compiler.CompilationResult;
 import org.eclipse.jdt.internal.compiler.ast.*;
+import org.eclipse.jdt.internal.compiler.ast.StringTemplate;
 import org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;
 import org.eclipse.jdt.internal.compiler.codegen.ConstantPool;
 import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;