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

Remove some unused methods from QualifiedNamesUtil

Browse Source
This commit is contained in:
Nikolay Krasko
2012-08-14 19:31:21 +04:00
parent 8f5811fce2
commit 84a6c63d07
3 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/util/QualifiedNamesUtil.java
-15
View File
@@ -37,11 +37,6 @@ public final class QualifiedNamesUtil {
(subpackageName.getFqName().startsWith(packageName.getFqName()) && subpackageName.getFqName().charAt(packageName.getFqName().length()) == '.');
}
public static boolean isShortNameForFQN(@NotNull final String name, @NotNull final FqName fqn) {
return fqn.getFqName().equals(name) ||
(fqn.getFqName().endsWith(name) && fqn.getFqName().charAt(fqn.getFqName().length() - name.length() - 1) == '.');
}
public static boolean isOneSegmentFQN(@NotNull final String fqn) {
if (fqn.isEmpty()) {
return false;
@@ -54,16 +49,6 @@ public final class QualifiedNamesUtil {
return isOneSegmentFQN(fqn.getFqName());
}
@NotNull
public static Name fqnToShortName(@NotNull FqName fqn) {
return getLastSegment(fqn);
}
@NotNull
public static Name getLastSegment(@NotNull FqName fqn) {
return fqn.shortName();
}
@NotNull
public static String getFirstSegment(@NotNull String fqn) {
int dotIndex = fqn.indexOf('.');
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java
+1 -2
View File
@@ -51,7 +51,6 @@ import org.jetbrains.jet.lang.resolve.java.JetFilesProvider;
import org.jetbrains.jet.lang.resolve.java.JetJavaMirrorMarker;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.plugin.JetLanguage;
import org.jetbrains.jet.util.QualifiedNamesUtil;
import org.jetbrains.jet.utils.Progress;
import javax.swing.*;
@@ -74,7 +73,7 @@ public class JetLightClass extends AbstractLightClass implements JetJavaMirrorMa
@Override
public String getName() {
return QualifiedNamesUtil.fqnToShortName(qualifiedName).getName();
return qualifiedName.shortName().getName();
}
@Override
idea/src/org/jetbrains/jet/plugin/caches/JetFromJavaDescriptorHelper.java
+1 -1
View File
@@ -137,7 +137,7 @@ class JetFromJavaDescriptorHelper {
FqName classFQN = new FqName(containingClass.getQualifiedName());
if (classFQN != null) {
if (QualifiedNamesUtil.fqnToShortName(classFQN).getName().equals(JvmAbi.PACKAGE_CLASS)) {
if (classFQN.shortName().toString().equals(JvmAbi.PACKAGE_CLASS)) {
FqName classParentFQN = QualifiedNamesUtil.withoutLastSegment(classFQN);
return QualifiedNamesUtil.combine(classParentFQN, Name.identifier(method.getName()));
}