From 60267d800abab2658cddf1a36886b71d268eaa3b Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 14 Apr 2011 20:20:04 +0200 Subject: [PATCH] remove the old console folding API --- .../filters/AuxiliaryCallsFolding.java | 33 ------------------- .../filters/ReflectionStackFrameFilter.java | 17 ---------- .../filters/RmiStackFrameFilter.java | 28 ---------------- .../execution/filters/StackFrameFilter.java | 13 -------- .../src/META-INF/LangExtensions.xml | 4 --- plugins/groovy/src/META-INF/plugin.xml | 1 - .../GroovyDebuggerClassFilterProvider.java | 3 +- resources/src/META-INF/IdeaPlugin.xml | 12 +++---- 8 files changed, 6 insertions(+), 105 deletions(-) delete mode 100644 java/execution/impl/src/com/intellij/execution/filters/AuxiliaryCallsFolding.java delete mode 100644 java/execution/openapi/src/com/intellij/execution/filters/ReflectionStackFrameFilter.java delete mode 100644 java/execution/openapi/src/com/intellij/execution/filters/RmiStackFrameFilter.java delete mode 100644 java/execution/openapi/src/com/intellij/execution/filters/StackFrameFilter.java diff --git a/java/execution/impl/src/com/intellij/execution/filters/AuxiliaryCallsFolding.java b/java/execution/impl/src/com/intellij/execution/filters/AuxiliaryCallsFolding.java deleted file mode 100644 index 83df6698588d..000000000000 --- a/java/execution/impl/src/com/intellij/execution/filters/AuxiliaryCallsFolding.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.intellij.execution.filters; - -import com.intellij.execution.ConsoleFolding; -import com.intellij.openapi.util.TextRange; -import com.intellij.openapi.util.Trinity; - -import java.util.List; - -/** - * @author peter - */ -public class AuxiliaryCallsFolding extends ConsoleFolding { - @Override - public boolean shouldFoldLine(String line) { - final Trinity pair = ExceptionFilter.parseExceptionLine(line); - return pair != null && shouldFold(pair.first, pair.second); - } - - private static boolean shouldFold(String className, String methodName) { - for (StackFrameFilter provider : StackFrameFilter.EP_NAME.getExtensions()) { - if (provider.isAuxiliaryFrame(className, methodName)) { - return true; - } - } - return false; - } - - - @Override - public String getPlaceholderText(List lines) { - return " <" + lines.size() + " internal calls>"; - } -} diff --git a/java/execution/openapi/src/com/intellij/execution/filters/ReflectionStackFrameFilter.java b/java/execution/openapi/src/com/intellij/execution/filters/ReflectionStackFrameFilter.java deleted file mode 100644 index 3cd61a5d95f8..000000000000 --- a/java/execution/openapi/src/com/intellij/execution/filters/ReflectionStackFrameFilter.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.intellij.execution.filters; - -/** - * @author peter - */ -public class ReflectionStackFrameFilter extends StackFrameFilter { - public boolean isAuxiliaryFrame(String className, String methodName) { - if (className.equals("java.lang.reflect.Method") && methodName.equals("invoke")) { - return true; - } - if (className.equals("java.lang.reflect.Constructor") && methodName.equals("newInstance")) { - return true; - } - - return className.startsWith("sun.reflect."); - } -} diff --git a/java/execution/openapi/src/com/intellij/execution/filters/RmiStackFrameFilter.java b/java/execution/openapi/src/com/intellij/execution/filters/RmiStackFrameFilter.java deleted file mode 100644 index 878b911b26f8..000000000000 --- a/java/execution/openapi/src/com/intellij/execution/filters/RmiStackFrameFilter.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2000-2010 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.execution.filters; - -/** - * @author Gregory.Shrago - */ -public class RmiStackFrameFilter extends StackFrameFilter { - public boolean isAuxiliaryFrame(String className, String methodName) { - if (className.startsWith("java.rmi.") && methodName.startsWith("invoke")) { - return true; - } - return className.startsWith("sun.rmi."); - } -} \ No newline at end of file diff --git a/java/execution/openapi/src/com/intellij/execution/filters/StackFrameFilter.java b/java/execution/openapi/src/com/intellij/execution/filters/StackFrameFilter.java deleted file mode 100644 index 25f6cdb1b07c..000000000000 --- a/java/execution/openapi/src/com/intellij/execution/filters/StackFrameFilter.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.intellij.execution.filters; - -import com.intellij.openapi.extensions.ExtensionPointName; - -/** - * @author peter - */ -public abstract class StackFrameFilter { - public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.stackFrameFilter"); - - public abstract boolean isAuxiliaryFrame(String className, String methodName); - -} diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml index b74d5e3e7830..266312e61dee 100644 --- a/platform/platform-resources/src/META-INF/LangExtensions.xml +++ b/platform/platform-resources/src/META-INF/LangExtensions.xml @@ -396,10 +396,6 @@ - - - - diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml index 6d7eb36e55f2..1692c19ad1b7 100644 --- a/plugins/groovy/src/META-INF/plugin.xml +++ b/plugins/groovy/src/META-INF/plugin.xml @@ -214,7 +214,6 @@ - diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerClassFilterProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerClassFilterProvider.java index 0d3f16fb22c9..ac50c0773ec6 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerClassFilterProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/filters/GroovyDebuggerClassFilterProvider.java @@ -15,7 +15,6 @@ */ package org.jetbrains.plugins.groovy.debugger.filters; -import com.intellij.execution.filters.StackFrameFilter; import com.intellij.ui.classFilter.ClassFilter; import com.intellij.ui.classFilter.DebuggerClassFilterProvider; import com.intellij.util.containers.ContainerUtil; @@ -27,7 +26,7 @@ import java.util.List; /** * @author ilyas */ -public class GroovyDebuggerClassFilterProvider extends StackFrameFilter implements DebuggerClassFilterProvider { +public class GroovyDebuggerClassFilterProvider implements DebuggerClassFilterProvider { private static final ClassFilter[] FILTERS = {new ClassFilter("org.codehaus.groovy.*"), new ClassFilter("groovy.*")}; public List getFilters() { diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml index 985c190de36f..963a850b80ad 100644 --- a/resources/src/META-INF/IdeaPlugin.xml +++ b/resources/src/META-INF/IdeaPlugin.xml @@ -147,8 +147,6 @@ - - @@ -725,8 +723,6 @@ - - - - - + + + + +