azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move JavaElement implementations to 'impl' package

Browse Source
This commit is contained in:
Alexander Udalov
2013-08-19 20:52:07 +04:00
parent ac4561a9e2
commit 714dbe2df3
34 changed files with 100 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java
+2 -2
View File
@@ -21,9 +21,9 @@ import com.intellij.psi.PsiPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClassImpl;
import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage;
import org.jetbrains.jet.lang.resolve.java.structure.JavaPackageImpl;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPackageImpl;
import org.jetbrains.jet.lang.resolve.name.FqName;
import javax.inject.Inject;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverPsiUtils.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java;
import com.intellij.psi.PsiClass;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClassImpl;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl;
public class JavaResolverPsiUtils {
private JavaResolverPsiUtils() {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java
+1
View File
@@ -29,6 +29,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.Visibilities;
import org.jetbrains.jet.lang.resolve.java.resolver.JavaSupertypeResolver;
import org.jetbrains.jet.lang.resolve.java.structure.*;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaTypeSubstitutorImpl;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.JetType;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
+1 -1
View File
@@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetClsMethod;
import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass;
import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod;
import org.jetbrains.jet.lang.resolve.java.structure.JavaMethodImpl;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.resolve.name.Name;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedExternalAnnotationResolver.java
+2 -2
View File
@@ -24,9 +24,9 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.JvmClassName;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationImpl;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner;
import org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaAnnotationImpl;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil;
import org.jetbrains.jet.lang.resolve.name.FqName;
import java.util.Collection;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java
+1
View File
@@ -29,6 +29,7 @@ import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
import org.jetbrains.jet.lang.resolve.OverridingUtil;
import org.jetbrains.jet.lang.resolve.java.kotlinSignature.SignaturesUtil;
import org.jetbrains.jet.lang.resolve.java.structure.*;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl;
import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.SubstitutionUtils;
import org.jetbrains.jet.lang.types.TypeSubstitution;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactory.java
+1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.lang.resolve.java.structure;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementFactoryImpl;
public abstract class JavaElementFactory {
@NotNull
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatter.java
+1
View File
@@ -17,6 +17,7 @@
package org.jetbrains.jet.lang.resolve.java.structure;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaSignatureFormatterImpl;
public abstract class JavaSignatureFormatter {
public static JavaSignatureFormatter getInstance() {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationArgumentImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java
+2 -1
View File
@@ -14,11 +14,12 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationArgument;
import org.jetbrains.jet.lang.resolve.name.Name;
public abstract class JavaAnnotationArgumentImpl extends JavaElementImpl implements JavaAnnotationArgument {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationAsAnnotationArgumentImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationAsAnnotationArgumentImpl.java
+3 -1
View File
@@ -14,11 +14,13 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiAnnotation;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationAsAnnotationArgument;
import org.jetbrains.jet.lang.resolve.name.Name;
public class JavaAnnotationAsAnnotationArgumentImpl extends JavaAnnotationArgumentImpl implements JavaAnnotationAsAnnotationArgument {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java
+4 -2
View File
@@ -14,18 +14,20 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiAnnotation;
import com.intellij.psi.PsiAnnotationMemberValue;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationArgument;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.Collection;
import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.namedAnnotationArguments;
import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.namedAnnotationArguments;
public class JavaAnnotationImpl extends JavaElementImpl implements JavaAnnotation {
public JavaAnnotationImpl(@NotNull PsiAnnotation psiAnnotation) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayAnnotationArgumentImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayAnnotationArgumentImpl.java
+4 -2
View File
@@ -14,16 +14,18 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiArrayInitializerMemberValue;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationArgument;
import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayAnnotationArgument;
import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.Collection;
import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.namelessAnnotationArguments;
import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.namelessAnnotationArguments;
public class JavaArrayAnnotationArgumentImpl extends JavaAnnotationArgumentImpl implements JavaArrayAnnotationArgument {
protected JavaArrayAnnotationArgumentImpl(@NotNull PsiArrayInitializerMemberValue psiArrayInitializerMemberValue, @Nullable Name name) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayTypeImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayTypeImpl.java
+3 -1
View File
@@ -14,10 +14,12 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiArrayType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayType;
import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
public class JavaArrayTypeImpl extends JavaTypeImpl implements JavaArrayType {
public JavaArrayTypeImpl(@NotNull PsiArrayType psiArrayType) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java
+3 -2
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass;
@@ -27,12 +27,13 @@ import org.jetbrains.jet.lang.descriptors.ClassKind;
import org.jetbrains.jet.lang.descriptors.Modality;
import org.jetbrains.jet.lang.descriptors.Visibility;
import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker;
import org.jetbrains.jet.lang.resolve.java.structure.*;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.Collection;
import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.*;
import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.*;
public class JavaClassImpl extends JavaClassifierImpl implements JavaClass {
public JavaClassImpl(@NotNull PsiClass psiClass) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java
+2 -1
View File
@@ -14,11 +14,12 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiTypeParameter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClassifier;
public abstract class JavaClassifierImpl extends JavaElementImpl implements JavaClassifier {
protected JavaClassifierImpl(@NotNull PsiClass psiClass) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierTypeImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierTypeImpl.java
+6 -2
View File
@@ -14,20 +14,24 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiClassType;
import com.intellij.psi.PsiType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClassifier;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClassifierType;
import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeSubstitutor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.types;
import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.types;
public class JavaClassifierTypeImpl extends JavaTypeImpl implements JavaClassifierType {
private static class ResolutionResult {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementCollectionFromPsiArrayUtil.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java
+2 -1
View File
@@ -14,10 +14,11 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.ArrayList;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementFactoryImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementFactoryImpl.java
+4 -1
View File
@@ -14,9 +14,12 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayType;
import org.jetbrains.jet.lang.resolve.java.structure.JavaElementFactory;
import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
public class JavaElementFactoryImpl extends JavaElementFactory {
@NotNull
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementImpl.java
+2 -1
View File
@@ -14,10 +14,11 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.JavaElement;
public abstract class JavaElementImpl implements JavaElement {
private final PsiElement psiElement;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementUtil.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementUtil.java
+5 -2
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiAnnotation;
import com.intellij.psi.PsiModifier;
@@ -24,12 +24,15 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.Visibilities;
import org.jetbrains.jet.lang.descriptors.Visibility;
import org.jetbrains.jet.lang.resolve.java.JavaVisibilities;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner;
import org.jetbrains.jet.lang.resolve.java.structure.JavaModifierListOwner;
import org.jetbrains.jet.lang.resolve.name.FqName;
import java.util.Collection;
import java.util.Collections;
import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.annotations;
import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.annotations;
/* package */ class JavaElementUtil {
private JavaElementUtil() {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaFieldImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaFieldImpl.java
+3 -1
View File
@@ -14,11 +14,13 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiEnumConstant;
import com.intellij.psi.PsiField;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.JavaField;
import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
public class JavaFieldImpl extends JavaMemberImpl implements JavaField {
public JavaFieldImpl(@NotNull PsiField psiField) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaLiteralAnnotationArgumentImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaLiteralAnnotationArgumentImpl.java
+2 -1
View File
@@ -14,11 +14,12 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiLiteralExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaLiteralAnnotationArgument;
import org.jetbrains.jet.lang.resolve.name.Name;
public class JavaLiteralAnnotationArgumentImpl extends JavaAnnotationArgumentImpl implements JavaLiteralAnnotationArgument {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMemberImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java
+4 -1
View File
@@ -14,13 +14,16 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiMember;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.Visibility;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass;
import org.jetbrains.jet.lang.resolve.java.structure.JavaMember;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethodImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java
+7 -3
View File
@@ -14,19 +14,23 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiAnnotationMethod;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod;
import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter;
import org.jetbrains.jet.lang.resolve.java.structure.JavaValueParameter;
import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.Collection;
import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.typeParameters;
import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.valueParameters;
import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.typeParameters;
import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.valueParameters;
public class JavaMethodImpl extends JavaMemberImpl implements JavaMethod {
public JavaMethodImpl(@NotNull PsiMethod psiMethod) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackageImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.java
+5 -3
View File
@@ -14,16 +14,18 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass;
import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage;
import org.jetbrains.jet.lang.resolve.name.FqName;
import java.util.Collection;
import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.classes;
import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.packages;
import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classes;
import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.packages;
public class JavaPackageImpl extends JavaElementImpl implements JavaPackage {
public JavaPackageImpl(@NotNull PsiPackage psiPackage) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPrimitiveTypeImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPrimitiveTypeImpl.java
+2 -1
View File
@@ -14,10 +14,11 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiPrimitiveType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.JavaPrimitiveType;
public class JavaPrimitiveTypeImpl extends JavaTypeImpl implements JavaPrimitiveType {
public JavaPrimitiveTypeImpl(@NotNull PsiPrimitiveType psiPrimitiveType) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgumentImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaReferenceAnnotationArgumentImpl.java
+3 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiEnumConstant;
@@ -22,6 +22,8 @@ import com.intellij.psi.PsiField;
import com.intellij.psi.PsiReferenceExpression;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaElement;
import org.jetbrains.jet.lang.resolve.java.structure.JavaReferenceAnnotationArgument;
import org.jetbrains.jet.lang.resolve.name.Name;
public class JavaReferenceAnnotationArgumentImpl extends JavaAnnotationArgumentImpl implements JavaReferenceAnnotationArgument {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaSignatureFormatterImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaSignatureFormatterImpl.java
+3 -1
View File
@@ -14,11 +14,13 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiSubstitutor;
import com.intellij.psi.util.PsiFormatUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod;
import org.jetbrains.jet.lang.resolve.java.structure.JavaSignatureFormatter;
import static com.intellij.psi.util.PsiFormatUtilBase.*;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java
+2 -1
View File
@@ -14,11 +14,12 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
public abstract class JavaTypeImpl implements JavaType {
private final PsiType psiType;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java
+3 -2
View File
@@ -14,16 +14,17 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.Collection;
import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.classifierTypes;
import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classifierTypes;
public class JavaTypeParameterImpl extends JavaClassifierImpl implements JavaTypeParameter {
public JavaTypeParameterImpl(@NotNull PsiTypeParameter psiTypeParameter) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProviderImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeProviderImpl.java
+3 -1
View File
@@ -14,12 +14,14 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiManager;
import com.intellij.psi.PsiType;
import com.intellij.psi.search.GlobalSearchScope;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeProvider;
public class JavaTypeProviderImpl implements JavaTypeProvider {
private final PsiManager manager;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeSubstitutorImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeSubstitutorImpl.java
+4 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiSubstitutor;
import com.intellij.psi.PsiType;
@@ -22,6 +22,9 @@ import com.intellij.psi.PsiTypeParameter;
import com.intellij.psi.impl.PsiSubstitutorImpl;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter;
import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeSubstitutor;
import java.util.HashMap;
import java.util.Map;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameterImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java
+4 -1
View File
@@ -14,11 +14,14 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiParameter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation;
import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
import org.jetbrains.jet.lang.resolve.java.structure.JavaValueParameter;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardTypeImpl.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaWildcardTypeImpl.java
+5 -2
View File
@@ -14,12 +14,15 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java.structure;
package org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.psi.PsiType;
import com.intellij.psi.PsiWildcardType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.structure.JavaType;
import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeProvider;
import org.jetbrains.jet.lang.resolve.java.structure.JavaWildcardType;
public class JavaWildcardTypeImpl extends JavaTypeImpl implements JavaWildcardType {
public JavaWildcardTypeImpl(@NotNull PsiWildcardType psiWildcardType) {
@@ -36,7 +39,7 @@ public class JavaWildcardTypeImpl extends JavaTypeImpl implements JavaWildcardTy
@Nullable
public JavaType getBound() {
PsiType bound = getPsi().getBound();
return bound == null ? null : JavaTypeImpl.create(bound);
return bound == null ? null : create(bound);
}
@Override