cleanup

diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/CallFrameView.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/CallFrameView.java
index e140c1f5f18f75824599ae5599144d4761df3e8e..29c403c98c2e68864e98f80262f422fd84af094a 100644 (file)
--- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/CallFrameView.java
+++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/CallFrameView.java
@@ -1,9 +1,11 @@
 package org.jetbrains.debugger.frame;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ui.ColoredTextContainer;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.xdebugger.evaluation.XDebuggerEvaluator;
 import com.intellij.xdebugger.frame.XCompositeNode;
+import com.intellij.xdebugger.frame.XStackFrame;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.concurrency.Promise;
@@ -11,13 +13,15 @@ import org.jetbrains.debugger.*;
 
 import java.util.List;
 
-public final class CallFrameView extends StackFrameImplBase implements VariableContext {
+public final class CallFrameView extends XStackFrame implements VariableContext {
+  private final SourceInfo sourceInfo;
   private final DebuggerViewSupport viewSupport;
   private final CallFrame callFrame;
 
   private final Script script;
 
   private final boolean inLibraryContent;
+  private XDebuggerEvaluator evaluator;
 
   public CallFrameView(@NotNull CallFrame callFrame, @NotNull DebuggerViewSupport viewSupport, @Nullable Script script) {
     this(callFrame, viewSupport.getSourceInfo(script, callFrame), viewSupport, script);
@@ -27,7 +31,7 @@ public final class CallFrameView extends StackFrameImplBase implements VariableC
                        @Nullable SourceInfo sourceInfo,
                        @NotNull DebuggerViewSupport viewSupport,
                        @Nullable Script script) {
-    super(sourceInfo);
+    this.sourceInfo = sourceInfo;
 
     this.viewSupport = viewSupport;
     this.callFrame = callFrame;
@@ -42,36 +46,11 @@ public final class CallFrameView extends StackFrameImplBase implements VariableC
     return script;
   }
 
-  @Override
-  protected boolean isInFileScope() {
-    List<Scope> scopes = callFrame.getVariableScopes();
-    return scopes.size() == 1 && scopes.get(0).isGlobal();
-  }
-
-  @Override
-  protected XDebuggerEvaluator createEvaluator() {
-    return viewSupport.createFrameEvaluator(this);
-  }
-
   @Override
   public Object getEqualityObject() {
     return callFrame.getEqualityObject();
   }
 
-  @Override
-  protected boolean isInLibraryContent() {
-    return inLibraryContent;
-  }
-
-  @Override
-  protected void customizeInvalidFramePresentation(ColoredTextContainer component) {
-    assert sourceInfo == null;
-
-    String scriptName = script == null ? "unknown" : script.getUrl().trimParameters().toDecodedForm();
-    int line = callFrame.getLine();
-    component.append(line != -1 ? scriptName + ':' + line : scriptName, SimpleTextAttributes.ERROR_ATTRIBUTES);
-  }
-
   @Override
   public void computeChildren(@NotNull XCompositeNode node) {
     node.setAlreadySorted(true);
@@ -128,4 +107,50 @@ public final class CallFrameView extends StackFrameImplBase implements VariableC
   public Scope getScope() {
     return null;
   }
+
+  @Override
+  public final XDebuggerEvaluator getEvaluator() {
+    if (evaluator == null) {
+      evaluator = viewSupport.createFrameEvaluator(this);
+    }
+    return evaluator;
+  }
+
+  @Override
+  @Nullable
+  public SourceInfo getSourcePosition() {
+    return sourceInfo;
+  }
+
+  @Override
+  public final void customizePresentation(@NotNull ColoredTextContainer component) {
+    if (sourceInfo == null) {
+      String scriptName = script == null ? "unknown" : script.getUrl().trimParameters().toDecodedForm();
+      int line = callFrame.getLine();
+      component.append(line != -1 ? scriptName + ':' + line : scriptName, SimpleTextAttributes.ERROR_ATTRIBUTES);
+      return;
+    }
+
+    String fileName = sourceInfo.getFile().getName();
+    int line = sourceInfo.getLine() + 1;
+
+    boolean isInLibraryContent = inLibraryContent;
+    SimpleTextAttributes textAttributes = isInLibraryContent ? SimpleTextAttributes.GRAYED_ATTRIBUTES : SimpleTextAttributes.REGULAR_ATTRIBUTES;
+
+    String functionName = sourceInfo.getFunctionName();
+    List<Scope> scopes = callFrame.getVariableScopes();
+    if (functionName == null || (functionName.isEmpty() && scopes.size() == 1 && scopes.get(0).isGlobal())) {
+      component.append(fileName + ":" + line, textAttributes);
+    }
+    else {
+      if (functionName.isEmpty()) {
+        component.append("anonymous", isInLibraryContent ? SimpleTextAttributes.GRAYED_ITALIC_ATTRIBUTES : SimpleTextAttributes.REGULAR_ITALIC_ATTRIBUTES);
+      }
+      else {
+        component.append(functionName, textAttributes);
+      }
+      component.append("(), " + fileName + ":" + line, textAttributes);
+    }
+    component.setIcon(AllIcons.Debugger.StackFrame);
+  }
 }
\ No newline at end of file

diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/StackFrameImplBase.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/StackFrameImplBase.java
deleted file mode 100644 (file)
index fb4e877..0000000
--- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/frame/StackFrameImplBase.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.jetbrains.debugger.frame;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.ui.ColoredTextContainer;
-import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.xdebugger.evaluation.XDebuggerEvaluator;
-import com.intellij.xdebugger.frame.XStackFrame;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.debugger.SourceInfo;
-
-// todo remove when Firefox implementation will use SDK
-public abstract class StackFrameImplBase extends XStackFrame {
-  protected final SourceInfo sourceInfo;
-  protected XDebuggerEvaluator evaluator;
-
-  public StackFrameImplBase(@Nullable SourceInfo sourceInfo) {
-    this.sourceInfo = sourceInfo;
-  }
-
-  @Override
-  public final XDebuggerEvaluator getEvaluator() {
-    if (evaluator == null) {
-      evaluator = createEvaluator();
-    }
-    return evaluator;
-  }
-
-  protected abstract XDebuggerEvaluator createEvaluator();
-
-  @Override
-  @Nullable
-  public SourceInfo getSourcePosition() {
-    return sourceInfo;
-  }
-
-  protected boolean isInFileScope() {
-    return false;
-  }
-
-  protected boolean isInLibraryContent() {
-    return false;
-  }
-
-  @Override
-  public final void customizePresentation(@NotNull ColoredTextContainer component) {
-    if (sourceInfo == null) {
-      customizeInvalidFramePresentation(component);
-      return;
-    }
-
-    String fileName = sourceInfo.getFile().getName();
-    int line = sourceInfo.getLine() + 1;
-
-    boolean isInLibraryContent = isInLibraryContent();
-    SimpleTextAttributes textAttributes = isInLibraryContent ? SimpleTextAttributes.GRAYED_ATTRIBUTES : SimpleTextAttributes.REGULAR_ATTRIBUTES;
-
-    String functionName = sourceInfo.getFunctionName();
-    if (functionName == null || (functionName.isEmpty() && isInFileScope())) {
-      component.append(fileName + ":" + line, textAttributes);
-    }
-    else {
-      if (functionName.isEmpty()) {
-        component.append("anonymous", isInLibraryContent ? SimpleTextAttributes.GRAYED_ITALIC_ATTRIBUTES : SimpleTextAttributes.REGULAR_ITALIC_ATTRIBUTES);
-      }
-      else {
-        component.append(functionName, textAttributes);
-      }
-      component.append("(), " + fileName + ":" + line, textAttributes);
-    }
-    component.setIcon(AllIcons.Debugger.StackFrame);
-  }
-
-  protected void customizeInvalidFramePresentation(ColoredTextContainer component) {
-    super.customizePresentation(component);
-  }
-}
\ No newline at end of file