Refactoring.

Dead code elimination. Missing annotations.
This commit is contained in:
Pavel V. Talanov
2012-07-27 19:25:40 +04:00
parent c02e54678e
commit 40c14c6533
3 changed files with 3 additions and 29 deletions
@@ -103,6 +103,7 @@ public final class AnalyzerFacadeForJS {
}
}
@NotNull
public static AnalyzeExhaust analyzeBodiesInFiles(
@NotNull Predicate<PsiFile> filesToAnalyzeCompletely,
@NotNull Config config,
@@ -39,19 +39,6 @@ import static org.jetbrains.k2js.translate.utils.PsiUtils.isBackingFieldReferenc
*/
public abstract class PropertyAccessTranslator extends AbstractTranslator implements AccessTranslator {
//TODO: is it really called?
@NotNull
private static PropertyAccessTranslator newInstance(@NotNull PropertyDescriptor descriptor,
@NotNull ResolvedCall<?> resolvedCall,
@NotNull TranslationContext context) {
if (isNativeObject(descriptor)) {
return new NativePropertyAccessTranslator(descriptor, /*qualifier = */ null, context);
}
else {
return new KotlinPropertyAccessTranslator(descriptor, /*qualifier = */ null, resolvedCall, context);
}
}
@NotNull
public static PropertyAccessTranslator newInstance(@NotNull JetSimpleNameExpression expression,
@Nullable JsExpression qualifier,
@@ -80,15 +67,6 @@ public abstract class PropertyAccessTranslator extends AbstractTranslator implem
}
@NotNull
/*package*/
static JsExpression translateAsPropertyGetterCall(@NotNull PropertyDescriptor descriptor,
@NotNull ResolvedCall<?> resolvedCall,
@NotNull TranslationContext context) {
return (newInstance(descriptor, resolvedCall, context))
.translateAsGet();
}
@NotNull
public static JsExpression translateAsPropertyGetterCall(@NotNull JetSimpleNameExpression expression,
@Nullable JsExpression qualifier,
@@ -41,13 +41,13 @@ public class DangerousData {
@NotNull
public static DangerousData collect(@NotNull JetExpression expression, @NotNull TranslationContext context) {
if (cantContainDangerousElements(expression, context)) {
if (cantContainDangerousElements(expression)) {
return emptyData();
}
return doCollectData(expression, context);
}
private static boolean cantContainDangerousElements(@NotNull JetElement element, @NotNull TranslationContext context) {
private static boolean cantContainDangerousElements(@NotNull JetElement element) {
if (element instanceof JetBlockExpression) {
return true;
}
@@ -105,11 +105,6 @@ public class DangerousData {
return nodesToBeGeneratedBefore;
}
@SuppressWarnings("NullableProblems")
public void setNodesToBeGeneratedBefore(@NotNull List<JetExpression> nodesToBeGeneratedBefore) {
this.nodesToBeGeneratedBefore = nodesToBeGeneratedBefore;
}
public boolean exists() {
return dangerousNode != null;
}