Skip to content

Commit ac16ca5

Browse files
committed
Rename tree iterator
1 parent 0b87e9f commit ac16ca5

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

patternfx-core/src/main/java/com/techsenger/patternfx/core/AbstractBreadthFirstIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*
2727
* @author Pavel Castornii
2828
*/
29-
abstract class AbstractBreadthFirstIterator<T> implements SubtreeIterator<T> {
29+
abstract class AbstractBreadthFirstIterator<T> implements TreeIterator<T> {
3030

3131
private final Queue<Pair<T, Integer>> queue = new LinkedList<>();
3232

patternfx-core/src/main/java/com/techsenger/patternfx/core/AbstractDepthFirstIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*
2626
* @author Pavel Castornii
2727
*/
28-
abstract class AbstractDepthFirstIterator<T> implements SubtreeIterator<T> {
28+
abstract class AbstractDepthFirstIterator<T> implements TreeIterator<T> {
2929

3030
private final Stack<Pair<T, Integer>> stack = new Stack<>();
3131

patternfx-core/src/main/java/com/techsenger/patternfx/core/AbstractParentComponent.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public Mediator() {
4747
}
4848

4949
@Override
50-
public SubtreeIterator<ParentViewModel<?>> depthFirstIterator() {
50+
public TreeIterator<ParentViewModel<?>> depthFirstIterator() {
5151
return new AbstractDepthFirstIterator<ParentViewModel<?>>(getView().getViewModel()) {
5252

5353
@Override
@@ -58,7 +58,7 @@ List<ParentViewModel<?>> getChildren(ParentViewModel<?> parent) {
5858
}
5959

6060
@Override
61-
public SubtreeIterator<ParentViewModel<?>> breadthFirstIterator() {
61+
public TreeIterator<ParentViewModel<?>> breadthFirstIterator() {
6262
return new AbstractBreadthFirstIterator<ParentViewModel<?>>(getView().getViewModel()) {
6363

6464
@Override
@@ -107,7 +107,7 @@ public AbstractParentComponent(T view) {
107107
}
108108

109109
@Override
110-
public SubtreeIterator<ParentComponent<?>> depthFirstIterator() {
110+
public TreeIterator<ParentComponent<?>> depthFirstIterator() {
111111
return new AbstractDepthFirstIterator<ParentComponent<?>>(this) {
112112

113113
@Override
@@ -118,7 +118,7 @@ List<ParentComponent<?>> getChildren(ParentComponent<?> parent) {
118118
}
119119

120120
@Override
121-
public SubtreeIterator<ParentComponent<?>> breadthFirstIterator() {
121+
public TreeIterator<ParentComponent<?>> breadthFirstIterator() {
122122
return new AbstractBreadthFirstIterator<ParentComponent<?>>(this) {
123123

124124
@Override
@@ -150,7 +150,7 @@ protected ObservableList<ChildComponent<?>> getModifiableChildren() {
150150
@Override
151151
protected abstract Mediator createMediator();
152152

153-
public <T> String toTreeString(SubtreeIterator<T> iterator, BiConsumer<T, StringBuilder> componentAppender) {
153+
public <T> String toTreeString(TreeIterator<T> iterator, BiConsumer<T, StringBuilder> componentAppender) {
154154
var builder = new StringBuilder();
155155
var sep = System.lineSeparator();
156156
while (iterator.hasNext()) {

patternfx-core/src/main/java/com/techsenger/patternfx/core/ParentComponent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ public interface ParentComponent<T extends ParentView<?, ?>> extends Component<T
3737
*
3838
* @return an {@link Iterator} that iterates over this component and all of its descendants
3939
*/
40-
SubtreeIterator<ParentComponent<?>> depthFirstIterator();
40+
TreeIterator<ParentComponent<?>> depthFirstIterator();
4141

4242
/**
4343
* Returns an iterator that traverses the component subtree starting from this component in breadth-first order.
4444
*
4545
* @return an {@link Iterator} that iterates over this component and all of its descendants
4646
*/
47-
SubtreeIterator<ParentComponent<?>> breadthFirstIterator();
47+
TreeIterator<ParentComponent<?>> breadthFirstIterator();
4848

4949
/**
5050
* Returns a string representation of this component and all its descendants as a sub-tree with this

patternfx-core/src/main/java/com/techsenger/patternfx/core/ParentMediator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ public interface ParentMediator extends ComponentMediator {
3737
*
3838
* @return an {@link Iterator} that iterates over this component and all of its descendants
3939
*/
40-
SubtreeIterator<ParentViewModel<?>> depthFirstIterator();
40+
TreeIterator<ParentViewModel<?>> depthFirstIterator();
4141

4242
/**
4343
* Returns an iterator that traverses the component subtree starting from this component in breadth-first order.
4444
*
4545
* @return an {@link Iterator} that iterates over this component and all of its descendants
4646
*/
47-
SubtreeIterator<ParentViewModel<?>> breadthFirstIterator();
47+
TreeIterator<ParentViewModel<?>> breadthFirstIterator();
4848

4949
/**
5050
* Returns a string representation of this component and all its descendants as a sub-tree with this

patternfx-core/src/main/java/com/techsenger/patternfx/core/SubtreeIterator.java renamed to patternfx-core/src/main/java/com/techsenger/patternfx/core/TreeIterator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*
2323
* @author Pavel Castornii
2424
*/
25-
public interface SubtreeIterator<T> extends Iterator<T> {
25+
public interface TreeIterator<T> extends Iterator<T> {
2626

2727
int getDepth();
2828
}

0 commit comments

Comments
 (0)