From efc14fe563a59bfe26f87272f24dbec722a39b8f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 19 Jul 2016 12:32:33 +0200 Subject: [PATCH] Cleanup (better name for module ref. element) --- .../com/intellij/psi/formatter/java/AbstractJavaBlock.java | 2 +- .../src/com/intellij/psi/JavaElementVisitor.java | 2 +- java/java-psi-api/src/com/intellij/psi/PsiJavaModule.java | 3 ++- ...uleReference.java => PsiJavaModuleReferenceElement.java} | 2 +- .../com/intellij/psi/impl/compiled/ClsJavaModuleImpl.java | 6 +++--- ...enceImpl.java => ClsJavaModuleReferenceElementImpl.java} | 6 +++--- .../src/com/intellij/psi/impl/source/PsiJavaModuleImpl.java | 4 ++-- ...enceImpl.java => PsiJavaModuleReferenceElementImpl.java} | 4 ++-- .../com/intellij/psi/impl/source/tree/JavaElementType.java | 2 +- 9 files changed, 16 insertions(+), 15 deletions(-) rename java/java-psi-api/src/com/intellij/psi/{PsiJavaModuleReference.java => PsiJavaModuleReferenceElement.java} (92%) rename java/java-psi-impl/src/com/intellij/psi/impl/compiled/{ClsJavaModuleReferenceImpl.java => ClsJavaModuleReferenceElementImpl.java} (88%) rename java/java-psi-impl/src/com/intellij/psi/impl/source/{PsiJavaModuleReferenceImpl.java => PsiJavaModuleReferenceElementImpl.java} (90%) diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java index 1343dd0834b7..372aa1f881a3 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java @@ -203,7 +203,7 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo InjectedLanguageUtil.hasInjections((PsiLanguageInjectionHost)child)) { return new CommentWithInjectionBlock(child, wrap, alignment, indent, settings, javaSettings); } - if (child instanceof LeafElement || childPsi instanceof PsiJavaModuleReference) { + if (child instanceof LeafElement || childPsi instanceof PsiJavaModuleReferenceElement) { final LeafBlock block = new LeafBlock(child, wrap, alignment, actualIndent); block.setStartOffset(startOffset); return block; diff --git a/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java b/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java index a0b0ea22d8f2..6002fc8ea273 100644 --- a/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java +++ b/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java @@ -391,7 +391,7 @@ public abstract class JavaElementVisitor extends PsiElementVisitor { visitElement(module); } - public void visitModuleReference(PsiJavaModuleReference moduleRef) { + public void visitModuleReference(PsiJavaModuleReferenceElement moduleRef) { visitElement(moduleRef); } diff --git a/java/java-psi-api/src/com/intellij/psi/PsiJavaModule.java b/java/java-psi-api/src/com/intellij/psi/PsiJavaModule.java index 37a2d2b332ec..35f763621067 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiJavaModule.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiJavaModule.java @@ -26,6 +26,7 @@ public interface PsiJavaModule extends NavigatablePsiElement { String MODULE_INFO_CLASS = "module-info"; String MODULE_INFO_FILE = MODULE_INFO_CLASS + ".java"; - @NotNull PsiJavaModuleReference getNameElement(); + @NotNull + PsiJavaModuleReferenceElement getNameElement(); @NotNull String getModuleName(); } \ No newline at end of file diff --git a/java/java-psi-api/src/com/intellij/psi/PsiJavaModuleReference.java b/java/java-psi-api/src/com/intellij/psi/PsiJavaModuleReferenceElement.java similarity index 92% rename from java/java-psi-api/src/com/intellij/psi/PsiJavaModuleReference.java rename to java/java-psi-api/src/com/intellij/psi/PsiJavaModuleReferenceElement.java index 0dae11ea5584..64a2bb1d79d6 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiJavaModuleReference.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiJavaModuleReferenceElement.java @@ -22,6 +22,6 @@ import org.jetbrains.annotations.NotNull; * * @since 2016.3 */ -public interface PsiJavaModuleReference extends PsiElement { +public interface PsiJavaModuleReferenceElement extends PsiElement { @NotNull String getReferenceText(); } \ No newline at end of file diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleImpl.java index d5100fd2f30a..cab4baad5c02 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleImpl.java @@ -25,16 +25,16 @@ import com.intellij.psi.impl.source.tree.TreeElement; import org.jetbrains.annotations.NotNull; public class ClsJavaModuleImpl extends ClsRepositoryPsiElement implements PsiJavaModule { - private PsiJavaModuleReference myReference; + private PsiJavaModuleReferenceElement myReference; public ClsJavaModuleImpl(PsiJavaModuleStub stub) { super(stub); - myReference = new ClsJavaModuleReferenceImpl(this, stub.getName()); + myReference = new ClsJavaModuleReferenceElementImpl(this, stub.getName()); } @NotNull @Override - public PsiJavaModuleReference getNameElement() { + public PsiJavaModuleReferenceElement getNameElement() { return myReference; } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleReferenceImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleReferenceElementImpl.java similarity index 88% rename from java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleReferenceImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleReferenceElementImpl.java index d290f3a5e09f..5734c5b7f467 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleReferenceImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaModuleReferenceElementImpl.java @@ -18,16 +18,16 @@ package com.intellij.psi.impl.compiled; import com.intellij.psi.JavaElementVisitor; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.PsiJavaModuleReference; +import com.intellij.psi.PsiJavaModuleReferenceElement; import com.intellij.psi.impl.source.tree.JavaElementType; import com.intellij.psi.impl.source.tree.TreeElement; import org.jetbrains.annotations.NotNull; -public class ClsJavaModuleReferenceImpl extends ClsElementImpl implements PsiJavaModuleReference { +public class ClsJavaModuleReferenceElementImpl extends ClsElementImpl implements PsiJavaModuleReferenceElement { private final PsiElement myParent; private final String myText; - public ClsJavaModuleReferenceImpl(PsiElement parent, String text) { + public ClsJavaModuleReferenceElementImpl(PsiElement parent, String text) { myParent = parent; myText = text; } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleImpl.java index 36d754083fe4..975d8badbead 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleImpl.java @@ -35,8 +35,8 @@ public class PsiJavaModuleImpl extends JavaStubPsiElement imp @NotNull @Override - public PsiJavaModuleReference getNameElement() { - return PsiTreeUtil.getRequiredChildOfType(this, PsiJavaModuleReference.class); + public PsiJavaModuleReferenceElement getNameElement() { + return PsiTreeUtil.getRequiredChildOfType(this, PsiJavaModuleReferenceElement.class); } @NotNull diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleReferenceImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleReferenceElementImpl.java similarity index 90% rename from java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleReferenceImpl.java rename to java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleReferenceElementImpl.java index 0f9cf99c101b..1f3062e2f26c 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleReferenceImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaModuleReferenceElementImpl.java @@ -20,8 +20,8 @@ import com.intellij.psi.impl.source.tree.CompositePsiElement; import com.intellij.psi.impl.source.tree.JavaElementType; import org.jetbrains.annotations.NotNull; -public class PsiJavaModuleReferenceImpl extends CompositePsiElement implements PsiJavaModuleReference { - public PsiJavaModuleReferenceImpl() { +public class PsiJavaModuleReferenceElementImpl extends CompositePsiElement implements PsiJavaModuleReferenceElement { + public PsiJavaModuleReferenceElementImpl() { super(JavaElementType.MODULE_REFERENCE); } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java index d751a3a75339..f1e0f2e083ca 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java @@ -140,7 +140,7 @@ public interface JavaElementType { IElementType ANNOTATION_ARRAY_INITIALIZER = new JavaCompositeElementType("ANNOTATION_ARRAY_INITIALIZER", PsiArrayInitializerMemberValueImpl.class); IElementType RECEIVER_PARAMETER = new JavaCompositeElementType("RECEIVER", PsiReceiverParameterImpl.class); - IElementType MODULE_REFERENCE = new JavaCompositeElementType("MODULE_REFERENCE", PsiJavaModuleReferenceImpl.class); + IElementType MODULE_REFERENCE = new JavaCompositeElementType("MODULE_REFERENCE", PsiJavaModuleReferenceElementImpl.class); IElementType REQUIRES_STATEMENT = new JavaCompositeElementType("REQUIRES_STATEMENT", PsiRequiresStatementImpl.class); IElementType EXPORTS_STATEMENT = new JavaCompositeElementType("EXPORTS_STATEMENT", PsiExportsStatementImpl.class); IElementType USES_STATEMENT = new JavaCompositeElementType("USES_STATEMENT", PsiUsesStatementImpl.class);