Merge remote branch 'origin/master'

This commit is contained in:
Evgeny Zakrevsky
2012-02-26 21:20:17 +04:00
2 changed files with 11 additions and 10 deletions
@@ -17,28 +17,25 @@ package org.jetbrains.plugins.groovy.debugger.filters;
import com.intellij.ui.classFilter.ClassFilter;
import com.intellij.ui.classFilter.DebuggerClassFilterProvider;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* @author ilyas
*/
public class GroovyDebuggerClassFilterProvider implements DebuggerClassFilterProvider {
private static final ClassFilter[] FILTERS = {new ClassFilter("org.codehaus.groovy.*"), new ClassFilter("groovy.*")};
private static final List<ClassFilter> FILTERS = Arrays.asList(new ClassFilter("org.codehaus.groovy.*"), new ClassFilter("groovy.*"));
public List<ClassFilter> getFilters() {
final GroovyDebuggerSettings settings = GroovyDebuggerSettings.getInstance();
final Boolean flag = settings.DEBUG_DISABLE_SPECIFIC_GROOVY_METHODS;
final ArrayList<ClassFilter> list = new ArrayList<ClassFilter>();
GroovyDebuggerSettings settings = GroovyDebuggerSettings.getInstance();
Boolean flag = settings.DEBUG_DISABLE_SPECIFIC_GROOVY_METHODS;
if (flag == null || flag.booleanValue()) {
ContainerUtil.addAll(list, FILTERS);
return list;
return FILTERS;
}
return list;
return Collections.emptyList();
}
public boolean isAuxiliaryFrame(String className, String methodName) {
+4
View File
@@ -64,4 +64,8 @@
<option name="PATTERN" value="com.yourkit.runtime.*" />
<option name="ENABLED" value="true" />
</filter>
<filter>
<option name="PATTERN" value="com.springsource.loaded.*" />
<option name="ENABLED" value="true" />
</filter>
</component>