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

Converted JavaPackage and its implementation to Kotlin

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-30 21:48:43 +03:00
parent 9c9b431d7b
commit 72e0546fde
3 changed files with 44 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.java
-60
View File
@@ -1,60 +0,0 @@
/*
* Copyright 2010-2014 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 org.jetbrains.jet.lang.resolve.java.structure.impl;
import com.intellij.openapi.util.Condition;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiPackage;
import com.intellij.util.containers.ContainerUtil;
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.impl.JavaElementCollectionFromPsiArrayUtil.classes;
import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.packages;
public class JavaPackageImpl extends JavaElementImpl<PsiPackage> implements JavaPackage {
public JavaPackageImpl(@NotNull PsiPackage psiPackage) {
super(psiPackage);
}
@Override
@NotNull
public Collection<JavaClass> getClasses() {
return classes(ContainerUtil.filter(getPsi().getClasses(), new Condition<PsiClass>() {
@Override
public boolean value(PsiClass aClass) {
return aClass.getName() != null;
}
}));
}
@Override
@NotNull
public Collection<JavaPackage> getSubPackages() {
return packages(getPsi().getSubPackages());
}
@Override
@NotNull
public FqName getFqName() {
return new FqName(getPsi().getQualifiedName());
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.kt
+37
View File
@@ -0,0 +1,37 @@
/*
* Copyright 2010-2014 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 org.jetbrains.jet.lang.resolve.java.structure.impl
import com.intellij.openapi.util.Condition
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiPackage
import com.intellij.util.containers.ContainerUtil
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 org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classes
import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.packages
public class JavaPackageImpl(psiPackage: PsiPackage) : JavaElementImpl<PsiPackage>(psiPackage), JavaPackage {
override fun getClasses() = classes(getPsi().getClasses().filter { it.getName() != null })
override fun getSubPackages() = packages(getPsi().getSubPackages())
override fun getFqName() = FqName(getPsi().getQualifiedName())
}