Skip to content

get rid of unused methods #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hsestupin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

get rid of unused methods #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 0 additions & 68 deletions model/src/main/java/jetbrains/jetpad/model/composite/CompositesWithBounds.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -56,16 +55,6 @@ ViewT endElement(ViewT cell) {
}
}

public <ViewT extends NavComposite<ViewT> & HasFocusability & HasVisibility & HasBounds>
Iterable<ViewT> upperFocusables(ViewT v) {
return Composites.iterate(v, new NextUpperFocusable<>(v));
}

public <ViewT extends NavComposite<ViewT> & HasFocusability & HasVisibility & HasBounds>
Iterable<ViewT> lowerFocusables(ViewT v) {
return Composites.iterate(v, new NextLowerFocusable<>(v));
}

public <ViewT extends NavComposite<ViewT> & HasFocusability & HasVisibility & HasBounds>
ViewT upperFocusable(ViewT v, int xOffset) {
ViewT current = Composites.prevFocusable(v);
Expand Down Expand Up @@ -119,61 +108,4 @@ public <ViewT extends HasBounds> double distanceTo(ViewT c, int x) {
return bounds.distance(new Vector(x, bounds.origin.y));
}

private class NextUpperFocusable<ViewT extends NavComposite<ViewT> & HasFocusability & HasVisibility & HasBounds>
implements Function<ViewT, ViewT> {

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<ViewT extends NavComposite<ViewT> & HasFocusability & HasVisibility & HasBounds>
implements Function<ViewT, ViewT> {

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;
}
}
}
60 changes: 0 additions & 60 deletions model/src/test/java/jetbrains/jetpad/model/composite/UpperLowerFocusableTest.java
View file
Open in desktop

This file was deleted.