Skip to content

Commit 5b830ed

Browse files
committed
Tiny cleanup
1 parent 61354e0 commit 5b830ed

File tree

1 file changed

+5
-10
lines changed
  • eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons

1 file changed

+5
-10
lines changed

eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/InjectBean.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@
1111
import org.eclipse.core.runtime.Assert;
1212
import org.eclipse.jdt.core.ICompilationUnit;
1313
import org.eclipse.jdt.core.IJavaProject;
14-
import org.eclipse.jdt.core.IType;
1514
import org.eclipse.jdt.core.JavaModelException;
1615
import org.eclipse.jdt.core.dom.AST;
1716
import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
1817
import org.eclipse.jdt.core.dom.Assignment;
1918
import org.eclipse.jdt.core.dom.Block;
20-
import org.eclipse.jdt.core.dom.ChildListPropertyDescriptor;
2119
import org.eclipse.jdt.core.dom.CompilationUnit;
2220
import org.eclipse.jdt.core.dom.FieldAccess;
2321
import org.eclipse.jdt.core.dom.FieldDeclaration;
@@ -35,7 +33,6 @@
3533
import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
3634
import org.eclipse.jdt.internal.corext.refactoring.util.RefactoringASTParser;
3735
import org.eclipse.jdt.internal.ui.JavaPlugin;
38-
import org.eclipse.jdt.internal.ui.text.java.MethodDeclarationCompletionProposal;
3936
import org.eclipse.lsp4e.LSPEclipseUtils;
4037
import org.eclipse.lsp4j.Position;
4138
import org.eclipse.lsp4j.Range;
@@ -62,7 +59,7 @@ public InjectBean(Logger logger) {
6259
this.logger = logger;
6360
}
6461

65-
private void createFieldDeclaration(IJavaProject project, CompilationUnitRewrite cuRewrite, CompilationUnit domCu,
62+
private void createFieldDeclaration(CompilationUnitRewrite cuRewrite, CompilationUnit domCu,
6663
String typeName, String fieldType, String fieldName) throws JavaModelException {
6764
AST ast= cuRewrite.getAST();
6865
VariableDeclarationFragment variableDeclarationFragment= ast.newVariableDeclarationFragment();
@@ -73,10 +70,8 @@ private void createFieldDeclaration(IJavaProject project, CompilationUnitRewrite
7370
fieldDeclaration.modifiers().add(ast.newModifier(Modifier.ModifierKeyword.PRIVATE_KEYWORD));
7471
fieldDeclaration.modifiers().add(ast.newModifier(Modifier.ModifierKeyword.FINAL_KEYWORD));
7572

76-
IType itype = project.findType(fieldType);
77-
String fqn = itype.getFullyQualifiedName();
7873
ImportRewrite importRewrite= cuRewrite.getImportRewrite();
79-
fieldTypeDeclarationName = importRewrite.addImport(fqn);
74+
fieldTypeDeclarationName = importRewrite.addImport(fieldType);
8075
fieldDeclaration.setType(ast.newSimpleType(ast.newName(fieldTypeDeclarationName)));
8176

8277
AbstractTypeDeclaration parent = ((Stream<AbstractTypeDeclaration>) domCu.types().stream()
@@ -91,7 +86,7 @@ private void createFieldDeclaration(IJavaProject project, CompilationUnitRewrite
9186
listRewrite.insertFirst(fieldDeclaration, msg);
9287
}
9388

94-
private void maybeAddConstructor(IJavaProject project, CompilationUnitRewrite cuRewrite, CompilationUnit domCu,
89+
private void maybeAddConstructor(CompilationUnitRewrite cuRewrite, CompilationUnit domCu,
9590
String typeName, String fieldType, String fieldName) {
9691
TypeDeclaration typeDom = (TypeDeclaration) ((Stream<AbstractTypeDeclaration>) domCu.types().stream()
9792
.filter(TypeDeclaration.class::isInstance)
@@ -194,9 +189,9 @@ public TextDocumentEdit computeEdits(String docUri, String typeName, String fiel
194189

195190
CompilationUnitRewrite cuRewrite = new CompilationUnitRewrite(null, cu, domCu, Map.of());
196191

197-
createFieldDeclaration(project, cuRewrite, domCu, typeName, fieldType, fieldName);
192+
createFieldDeclaration(cuRewrite, domCu, typeName, fieldType, fieldName);
198193

199-
maybeAddConstructor(project, cuRewrite, domCu, typeName, fieldType, fieldName);
194+
maybeAddConstructor(cuRewrite, domCu, typeName, fieldType, fieldName);
200195

201196
// TextEdit edit = cuRewrite.getASTRewrite().rewriteAST();
202197

0 commit comments

Comments
 (0)