From: Daniil Ovchinnikov Date: Tue, 3 May 2016 18:00:03 +0000 (+0300) Subject: [groovy] remove methods that became unused after transformations refactoring X-Git-Tag: appcode/146.1675~12 X-Git-Url: https://git.jetbrains.org/?p=idea%2Fcommunity.git;a=commitdiff_plain;h=976376048f52ce7bb4797659bee0789e62350f3d [groovy] remove methods that became unused after transformations refactoring --- diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java index 2cb7806cd3a2..300d849179b6 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java @@ -35,7 +35,6 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MostlySingularMultiMap; import com.intellij.util.containers.hash.HashSet; -import gnu.trove.TObjectIntHashMap; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -647,50 +646,6 @@ public class GrClassImplUtil { return new PsiMethod[]{method}; } - public static void addExpandingReflectedMethods(Collection result, PsiMethod method) { - if (method instanceof GrMethod) { - final GrReflectedMethod[] reflectedMethods = ((GrMethod)method).getReflectedMethods(); - if (reflectedMethods.length > 0) { - result.addAll(Arrays.asList(reflectedMethods)); - return; - } - } - result.add(method); - } - - public static void collectMethodsFromBody(@NotNull GrTypeDefinition definition, Collection result) { - for (GrMethod method : definition.getCodeMethods()) { - addExpandingReflectedMethods(result, method); - } - - //for (GrField field : definition.getFields()) { - // if (!field.isProperty()) continue; - // ContainerUtil.addAll(result, field.getGetters()); - // ContainerUtil.addIfNotNull(result, field.getSetter()); - //} - } - - public static Collection filterOutAccessors(Collection result) { - final TObjectIntHashMap map = new TObjectIntHashMap(); - for (PsiMethod method : result) { - if (method instanceof GrAccessorMethod || GroovyPropertyUtils.isSimplePropertyAccessor(method)) { - final String methodName = method.getName(); - if (map.containsKey(methodName)) { - map.adjustValue(methodName, 1); - } - else { - map.put(methodName, 1); - } - } - } - return ContainerUtil.filter(result, new Condition() { - @Override - public boolean value(PsiMethod method) { - return !(method instanceof GrAccessorMethod) || map.get(method.getName()) <= 1; - } - }); - } - @NotNull public static Map getDuplicatedMethods(@NotNull PsiClass clazz) { return CachedValuesManager.getCachedValue(clazz, () -> {