diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/MemberFilter.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/MemberFilter.java index 7d39fb8ca451..b25d555d465c 100644 --- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/MemberFilter.java +++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/MemberFilter.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2015 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 org.jetbrains.debugger; import org.jetbrains.annotations.NotNull; @@ -6,7 +21,7 @@ import org.jetbrains.annotations.Nullable; import java.util.Collection; public interface MemberFilter { - boolean isMemberVisible(@NotNull Variable variable, boolean filterFunctions); + boolean isMemberVisible(@NotNull Variable variable); @NotNull Collection getAdditionalVariables(); diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/MemberFilterBase.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/MemberFilterBase.java index 414b169b4679..27ca585710ab 100644 --- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/MemberFilterBase.java +++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/MemberFilterBase.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2015 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 org.jetbrains.debugger; import org.jetbrains.annotations.NotNull; @@ -8,7 +23,7 @@ import java.util.Collections; public abstract class MemberFilterBase implements MemberFilter { @Override - public boolean isMemberVisible(@NotNull Variable variable, boolean filterFunctions) { + public boolean isMemberVisible(@NotNull Variable variable) { return variable.isReadable(); } diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/VariableView.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/VariableView.java index 8e3bf4b8c93c..e6462e61cce5 100644 --- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/VariableView.java +++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/VariableView.java @@ -431,7 +431,7 @@ public final class VariableView extends XNamedValue implements VariableContext { } private void computeArrayRanges(@NotNull List properties, @NotNull XCompositeNode node) { - final List variables = Variables.filterAndSort(properties, memberFilter, false); + final List variables = Variables.filterAndSort(properties, memberFilter); int count = variables.size(); int bucketSize = XCompositeNode.MAX_CHILDREN_TO_SHOW; if (count <= bucketSize) { diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/Variables.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/Variables.java index 9d3fbc5724ac..ad38b972d3b6 100644 --- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/Variables.java +++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/Variables.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2015 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 org.jetbrains.debugger; import com.intellij.openapi.util.text.StringUtil; @@ -65,7 +80,7 @@ public final class Variables { List properties = new ArrayList(variables.size() + additionalVariables.size()); List functions = new SmartList(); for (Variable variable : variables) { - if (memberFilter.isMemberVisible(variable, false)) { + if (memberFilter.isMemberVisible(variable)) { Value value = variable.getValue(); if (value != null && value.getType() == ValueType.FUNCTION && @@ -112,7 +127,7 @@ public final class Variables { @NotNull MemberFilter memberFilter, int maxChildrenToAdd, boolean defaultIsLast) { - List list = filterAndSort(variables, memberFilter, true); + List list = filterAndSort(variables, memberFilter); if (list.isEmpty()) { if (defaultIsLast) { node.addChildren(XValueChildrenList.EMPTY, true); @@ -133,7 +148,7 @@ public final class Variables { } @NotNull - public static List filterAndSort(@NotNull List variables, @NotNull MemberFilter memberFilter, boolean filterFunctions) { + public static List filterAndSort(@NotNull List variables, @NotNull MemberFilter memberFilter) { if (variables.isEmpty()) { return Collections.emptyList(); } @@ -141,7 +156,7 @@ public final class Variables { Collection additionalVariables = memberFilter.getAdditionalVariables(); List result = new ArrayList(variables.size() + additionalVariables.size()); for (Variable variable : variables) { - if (memberFilter.isMemberVisible(variable, filterFunctions)) { + if (memberFilter.isMemberVisible(variable)) { result.add(variable); } }