From 6bbbf8dfdda654fc5ed53534986535f7ae63088e Mon Sep 17 00:00:00 2001 From: Sergey Stupin Date: Fri, 10 Nov 2017 18:27:16 +0300 Subject: [PATCH] get rid of unused methods --- .../model/composite/CompositesWithBounds.java | 68 ------------------- .../composite/UpperLowerFocusableTest.java | 60 ---------------- 2 files changed, 128 deletions(-) delete mode 100644 model/src/test/java/jetbrains/jetpad/model/composite/UpperLowerFocusableTest.java diff --git a/model/src/main/java/jetbrains/jetpad/model/composite/CompositesWithBounds.java b/model/src/main/java/jetbrains/jetpad/model/composite/CompositesWithBounds.java index b172405b..16d0a8ea 100644 --- a/model/src/main/java/jetbrains/jetpad/model/composite/CompositesWithBounds.java +++ b/model/src/main/java/jetbrains/jetpad/model/composite/CompositesWithBounds.java @@ -15,7 +15,6 @@ */ package jetbrains.jetpad.model.composite; -import jetbrains.jetpad.base.function.Function; import jetbrains.jetpad.geometry.Rectangle; import jetbrains.jetpad.geometry.Vector; @@ -56,16 +55,6 @@ ViewT endElement(ViewT cell) { } } - public & HasFocusability & HasVisibility & HasBounds> - Iterable upperFocusables(ViewT v) { - return Composites.iterate(v, new NextUpperFocusable<>(v)); - } - - public & HasFocusability & HasVisibility & HasBounds> - Iterable lowerFocusables(ViewT v) { - return Composites.iterate(v, new NextLowerFocusable<>(v)); - } - public & HasFocusability & HasVisibility & HasBounds> ViewT upperFocusable(ViewT v, int xOffset) { ViewT current = Composites.prevFocusable(v); @@ -119,61 +108,4 @@ public double distanceTo(ViewT c, int x) { return bounds.distance(new Vector(x, bounds.origin.y)); } - private class NextUpperFocusable & HasFocusability & HasVisibility & HasBounds> - implements Function { - - private final ViewT myFirstFocusableAbove; - private final ViewT myInitial; - - NextUpperFocusable(ViewT initial) { - myFirstFocusableAbove = firstFocusableAbove(initial); - myInitial = initial; - } - - private ViewT firstFocusableAbove(ViewT initial) { - ViewT current = Composites.prevFocusable(initial); - while (current != null && !isAbove(current, initial)) { - current = Composites.prevFocusable(current); - } - return current; - } - - @Override - public ViewT apply(ViewT value) { - if (value == myInitial) { - return myFirstFocusableAbove; - } - ViewT next = Composites.prevFocusable(value); - return next != null && !isAbove(next, myFirstFocusableAbove) ? next : null; - } - } - - private class NextLowerFocusable & HasFocusability & HasVisibility & HasBounds> - implements Function { - - private final ViewT myFirstFocusableBelow; - private final ViewT myInitial; - - NextLowerFocusable(ViewT initial) { - myFirstFocusableBelow = firstFocusableBelow(initial); - myInitial = initial; - } - - private ViewT firstFocusableBelow(ViewT initial) { - ViewT current = Composites.nextFocusable(initial); - while (current != null && !isBelow(current, initial)) { - current = Composites.nextFocusable(current); - } - return current; - } - - @Override - public ViewT apply(ViewT value) { - if (value == myInitial) { - return myFirstFocusableBelow; - } - ViewT next = Composites.nextFocusable(value); - return next != null && !isBelow(next, myFirstFocusableBelow) ? next : null; - } - } } \ No newline at end of file diff --git a/model/src/test/java/jetbrains/jetpad/model/composite/UpperLowerFocusableTest.java b/model/src/test/java/jetbrains/jetpad/model/composite/UpperLowerFocusableTest.java deleted file mode 100644 index a241af1f..00000000 --- a/model/src/test/java/jetbrains/jetpad/model/composite/UpperLowerFocusableTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2012-2017 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 jetbrains.jetpad.model.composite; - -import com.google.common.collect.Lists; -import org.junit.Assert; -import org.junit.Test; - -import java.util.Arrays; - -import static jetbrains.jetpad.model.composite.TestComposite.create; - -public class UpperLowerFocusableTest { - - @Test - public void upperFocusable() { - TestComposite root = create(0, 0, 10, 2); - - TestComposite row1 = create(0, 0, 10, 1); - TestComposite row2 = create(0, 1, 10, 1); - - TestComposite left = create(1, 0, 3, 1); - TestComposite right = create(5, 0, 3, 1); - - row1.children().addAll(Arrays.asList(left, right)); - root.children().addAll(Arrays.asList(row1, row2)); - - Assert.assertEquals(Arrays.asList(right, left), Lists.newArrayList(new CompositesWithBounds(0).upperFocusables(row2))); - } - - @Test - public void lowerFocusable() { - TestComposite root = create(0, 0, 10, 2); - - TestComposite row1 = create(0, 0, 10, 1); - TestComposite row2 = create(0, 1, 10, 1); - - TestComposite left = create(1, 1, 5, 1); - TestComposite right = create(8, 1, 1, 1); - - row2.children().addAll(Arrays.asList(left, right)); - - root.children().addAll(Arrays.asList(row1, row2)); - - Assert.assertEquals(Arrays.asList(left, right), Lists.newArrayList(new CompositesWithBounds(0).lowerFocusables(row1))); - } -} \ No newline at end of file