MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (duplicate class eliminated)

Browse Source
This commit is contained in:
Roman Shevchenko
2013-03-01 16:56:45 +01:00
parent a7a2698a25
commit 1744117d84
4 changed files with 22 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaClassReferenceListElementType.java
+1 -7
View File
@@ -26,7 +26,6 @@ import com.intellij.psi.impl.java.stubs.index.JavaStubIndexKeys;
import com.intellij.psi.impl.source.PsiReferenceListImpl;
import com.intellij.psi.impl.source.tree.JavaElementType;
import com.intellij.psi.impl.source.tree.LightTreeUtil;
import com.intellij.psi.impl.source.tree.java.PsiTypeParameterExtendsBoundsListImpl;
import com.intellij.psi.stubs.IndexSink;
import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.stubs.StubInputStream;
@@ -55,12 +54,7 @@ public abstract class JavaClassReferenceListElementType extends JavaStubElementT
@Override
public PsiReferenceList createPsi(@NotNull ASTNode node) {
if (node.getElementType() == JavaStubElementTypes.EXTENDS_BOUND_LIST) {
return new PsiTypeParameterExtendsBoundsListImpl(node);
}
else {
return new PsiReferenceListImpl(node);
}
return new PsiReferenceListImpl(node);
}
@Override
java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/SourceStubPsiFactory.java
-4
View File
@@ -47,10 +47,6 @@ public class SourceStubPsiFactory extends StubPsiFactory {
@Override
public PsiReferenceList createClassReferenceList(PsiClassReferenceListStub stub) {
if (stub.getRole() == PsiReferenceList.Role.EXTENDS_BOUNDS_LIST) {
return new PsiTypeParameterExtendsBoundsListImpl(stub, JavaStubElementTypes.EXTENDS_BOUND_LIST);
}
return new PsiReferenceListImpl(stub, stub.getStubType());
}
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiReferenceListImpl.java
+21 -21
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,37 +22,38 @@ import com.intellij.psi.impl.java.stubs.PsiClassReferenceListStub;
import com.intellij.psi.impl.source.tree.JavaElementType;
import com.intellij.psi.stubs.IStubElementType;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.NotNull;
public final class PsiReferenceListImpl extends JavaStubPsiElement<PsiClassReferenceListStub> implements PsiReferenceList {
/**
* @author max
*/
public class PsiReferenceListImpl extends JavaStubPsiElement<PsiClassReferenceListStub> implements PsiReferenceList {
private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiReferenceListImpl");
private static final TokenSet REFERENCE_BIT_SET = TokenSet.create(Constants.JAVA_CODE_REFERENCE);
public PsiReferenceListImpl(final PsiClassReferenceListStub stub, final IStubElementType nodeType) {
public PsiReferenceListImpl(PsiClassReferenceListStub stub, IStubElementType nodeType) {
super(stub, nodeType);
}
public PsiReferenceListImpl(final ASTNode node) {
public PsiReferenceListImpl(ASTNode node) {
super(node);
}
@Override
@NotNull
public PsiJavaCodeReferenceElement[] getReferenceElements() {
return calcTreeElement().getChildrenAsPsiElements(REFERENCE_BIT_SET, PsiJavaCodeReferenceElement.ARRAY_FACTORY);
return calcTreeElement().getChildrenAsPsiElements(JavaElementType.JAVA_CODE_REFERENCE, PsiJavaCodeReferenceElement.ARRAY_FACTORY);
}
@Override
@NotNull
public PsiClassType[] getReferencedTypes() {
final PsiClassReferenceListStub stub = getStub();
PsiClassReferenceListStub stub = getStub();
if (stub != null) {
return stub.getReferencedTypes();
}
final PsiJavaCodeReferenceElement[] refs = getReferenceElements();
final PsiElementFactory factory = JavaPsiFacade.getInstance(getProject()).getElementFactory();
PsiJavaCodeReferenceElement[] refs = getReferenceElements();
PsiElementFactory factory = JavaPsiFacade.getInstance(getProject()).getElementFactory();
PsiClassType[] types = new PsiClassType[refs.length];
for (int i = 0; i < types.length; i++) {
types[i] = factory.createType(refs[i]);
@@ -63,24 +64,22 @@ public final class PsiReferenceListImpl extends JavaStubPsiElement<PsiClassRefer
@Override
public Role getRole() {
final IElementType tt = getElementType();
if (tt == JavaElementType.EXTENDS_LIST) {
IElementType type = getElementType();
if (type == JavaElementType.EXTENDS_LIST) {
return Role.EXTENDS_LIST;
}
else if (tt == JavaElementType.IMPLEMENTS_LIST) {
else if (type == JavaElementType.IMPLEMENTS_LIST) {
return Role.IMPLEMENTS_LIST;
}
else if (tt == JavaElementType.THROWS_LIST) {
else if (type == JavaElementType.THROWS_LIST) {
return Role.THROWS_LIST;
}
else if (tt == JavaElementType.EXTENDS_BOUND_LIST) {
else if (type == JavaElementType.EXTENDS_BOUND_LIST) {
return Role.EXTENDS_BOUNDS_LIST;
}
else {
LOG.error("Unknown element type:" + tt);
return null;
}
LOG.error("Unknown element type:" + type);
return null;
}
@Override
@@ -94,6 +93,7 @@ public final class PsiReferenceListImpl extends JavaStubPsiElement<PsiClassRefer
}
public String toString() {
return "PsiReferenceList";
return getElementType() == JavaElementType.EXTENDS_BOUND_LIST ? "PsiElement(EXTENDS_BOUND_LIST)"
: "PsiReferenceList"; // todo[r.sh] fix test data
}
}
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterExtendsBoundsListImpl.java
-80
View File
@@ -1,80 +0,0 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.psi.impl.source.tree.java;
import com.intellij.lang.ASTNode;
import com.intellij.psi.*;
import com.intellij.psi.impl.java.stubs.PsiClassReferenceListStub;
import com.intellij.psi.impl.source.Constants;
import com.intellij.psi.impl.source.JavaStubPsiElement;
import com.intellij.psi.stubs.IStubElementType;
import org.jetbrains.annotations.NotNull;
/**
* @author max
*/
public class PsiTypeParameterExtendsBoundsListImpl extends JavaStubPsiElement<PsiClassReferenceListStub> implements PsiReferenceList {
public PsiTypeParameterExtendsBoundsListImpl(final PsiClassReferenceListStub stub, final IStubElementType nodeType) {
super(stub, nodeType);
}
public PsiTypeParameterExtendsBoundsListImpl(final ASTNode node) {
super(node);
}
@Override
@NotNull
public PsiJavaCodeReferenceElement[] getReferenceElements() {
return calcTreeElement().getChildrenAsPsiElements(Constants.JAVA_CODE_REFERENCE_BIT_SET, PsiJavaCodeReferenceElement.ARRAY_FACTORY);
}
@Override
@NotNull
public PsiClassType[] getReferencedTypes() {
final PsiClassReferenceListStub stub = getStub();
if (stub != null) return stub.getReferencedTypes();
return createTypes(getReferenceElements());
}
@Override
public Role getRole() {
return Role.EXTENDS_BOUNDS_LIST;
}
private PsiClassType[] createTypes(final PsiJavaCodeReferenceElement[] refs) {
final PsiElementFactory factory = JavaPsiFacade.getInstance(getProject()).getElementFactory();
PsiClassType[] types = new PsiClassType[refs.length];
for (int i = 0; i < refs.length; i++) {
types[i] = factory.createType(refs[i]);
}
return types;
}
@Override
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JavaElementVisitor) {
((JavaElementVisitor)visitor).visitReferenceList(this);
}
else {
visitor.visitElement(this);
}
}
public String toString() {
return "PsiElement(EXTENDS_BOUND_LIST)";
}
}