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

Minor. Renamed method.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-12-04 17:46:58 +04:00
parent e175ebf60a
commit 3352d8a954
49 changed files with 80 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java
+3 -3
View File
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
import java.util.Map;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName;
/**
* Provides a mechanism to bind some of the kotlin/java declations with library implementations.
@@ -153,12 +153,12 @@ public final class StandardClasses {
}
public boolean isStandardObject(@NotNull DeclarationDescriptor descriptor) {
return standardObjects.containsKey(getFQName(descriptor));
return standardObjects.containsKey(getFqName(descriptor));
}
@NotNull
public JsName getStandardObjectName(@NotNull DeclarationDescriptor descriptor) {
return standardObjects.get(getFQName(descriptor));
return standardObjects.get(getFqName(descriptor));
}
@NotNull
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java
+1 -1
View File
@@ -94,7 +94,7 @@ public final class PatternBuilder {
}
private boolean doApply(@NotNull FunctionDescriptor descriptor) {
List<Name> nameParts = DescriptorUtils.getFQName(descriptor).pathSegments();
List<Name> nameParts = DescriptorUtils.getFqName(descriptor).pathSegments();
if (nameParts.size() != checkersWithPrefixChecker.size()) {
return false;
}
js/js.translator/src/org/jetbrains/k2js/translate/utils/AnnotationsUtils.java
+1 -1
View File
@@ -98,7 +98,7 @@ public final class AnnotationsUtils {
DeclarationDescriptor annotationDeclaration =
annotationDescriptor.getType().getConstructor().getDeclarationDescriptor();
assert annotationDeclaration != null : "Annotation supposed to have a declaration";
return DescriptorUtils.getFQName(annotationDeclaration).asString();
return DescriptorUtils.getFqName(annotationDeclaration).asString();
}
public static boolean isNativeObject(@NotNull DeclarationDescriptor descriptor) {
js/js.translator/src/org/jetbrains/k2js/translate/utils/JsDescriptorUtils.java
+3 -3
View File
@@ -36,12 +36,12 @@ import java.util.List;
import java.util.Set;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName;
public final class JsDescriptorUtils {
// TODO: maybe we should use external annotations or something else.
private static final Set<String> FAKE_CLASSES = ContainerUtil.immutableSet(
getFQName(KotlinBuiltIns.getInstance().getAny()).toSafe().asString(),
getFqName(KotlinBuiltIns.getInstance().getAny()).toSafe().asString(),
"jet.Iterable"
);
@@ -82,7 +82,7 @@ public final class JsDescriptorUtils {
@Override
public boolean value(JetType type) {
ClassDescriptor classDescriptor = getClassDescriptorForType(type);
return !FAKE_CLASSES.contains(getFQName(classDescriptor).toSafe().asString());
return !FAKE_CLASSES.contains(getFqName(classDescriptor).toSafe().asString());
}
});
}
js/js.translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java
+2 -2
View File
@@ -34,7 +34,7 @@ import java.util.Collections;
import java.util.List;
import static com.google.dart.compiler.backend.js.ast.JsBinaryOperator.*;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFQName;
import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName;
import static org.jetbrains.k2js.translate.context.Namer.getKotlinBackingFieldName;
import static org.jetbrains.k2js.translate.utils.BindingUtils.getFunctionDescriptorForOperationExpression;
import static org.jetbrains.k2js.translate.utils.JsAstUtils.assignment;
@@ -133,7 +133,7 @@ public final class TranslationUtils {
@NotNull
public static String getMangledName(@NotNull PropertyDescriptor descriptor, @NotNull String suggestedName) {
int absHashCode = Math.abs(getFQName(descriptor).asString().hashCode());
int absHashCode = Math.abs(getFqName(descriptor).asString().hashCode());
return suggestedName + "_" + Integer.toString(absHashCode, Character.MAX_RADIX) + "$";
}