From ac87d8497a3b5936bb8ca9fbdf95e63c9ab997f8 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 13 Aug 2012 15:20:29 +0400 Subject: [PATCH] Refactor Dangerous*: drop unused stuff. Adapted from https://github.com/develar/kotlin/commit/a9e0a42fb1347fa8e21c86b5a073ef8a7c873da0. --- .../k2js/translate/utils/dangerous/DangerousData.java | 11 ++++------- .../utils/dangerous/DangerousTranslator.java | 9 +++------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousData.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousData.java index 4f4c4c43ab8..09755b727b7 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousData.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousData.java @@ -38,6 +38,9 @@ import java.util.List; * RootNode is a node which contains such an expression. For example, it may be a statement expression belongs to. */ public class DangerousData { + @NotNull + private final List nodesToBeGeneratedBefore = Lists.newArrayList(); + @NotNull public static DangerousData collect(@NotNull JetExpression expression, @NotNull TranslationContext context) { @@ -48,10 +51,7 @@ public class DangerousData { } private static boolean cantContainDangerousElements(@NotNull JetElement element) { - if (element instanceof JetBlockExpression) { - return true; - } - return false; + return element instanceof JetBlockExpression; } @NotNull @@ -86,9 +86,6 @@ public class DangerousData { return EMPTY; } - @NotNull - private final List nodesToBeGeneratedBefore = Lists.newArrayList(); - @Nullable private JetExpression dangerousNode = null; diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousTranslator.java index 154bdb177ed..38491832308 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousTranslator.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/utils/dangerous/DangerousTranslator.java @@ -34,18 +34,15 @@ import java.util.Map; * @author Pavel Talanov */ public final class DangerousTranslator extends AbstractTranslator { - + @NotNull + private final DangerousData data; @NotNull public static JsNode translate(@NotNull DangerousData data, @NotNull TranslationContext context) { assert data.exists(); - DangerousTranslator translator = new DangerousTranslator(data, context); - return translator.translate(); + return new DangerousTranslator(data, context).translate(); } - @NotNull - private final DangerousData data; - private DangerousTranslator(@NotNull DangerousData data, @NotNull TranslationContext context) { super(context); this.data = data;