Skip to content

Commit e69ef00

Browse files
migrated the method getChildren from CommandNode to CommandLink
1 parent 55b0d42 commit e69ef00

File tree

2 files changed

+16
-22
lines changed

2 files changed

+16
-22
lines changed

src/main/java/com/datasiqn/commandcore/command/builder/CommandLink.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
import com.datasiqn.resultapi.None;
55
import com.datasiqn.resultapi.Result;
66
import org.jetbrains.annotations.NotNull;
7+
import org.jetbrains.annotations.UnmodifiableView;
78

8-
import java.util.ArrayList;
9-
import java.util.HashSet;
10-
import java.util.List;
11-
import java.util.Set;
9+
import java.util.*;
1210
import java.util.function.Consumer;
1311
import java.util.function.Function;
1412

@@ -71,9 +69,18 @@ public T executes(@NotNull Consumer<CommandContext> executor) {
7169
return getThis();
7270
}
7371

72+
/**
73+
* Gets all children nodes
74+
* @return An unmodifiable view of all children nodes
75+
*/
76+
@UnmodifiableView
77+
public @NotNull Set<CommandNode<?>> getChildren() {
78+
return Collections.unmodifiableSet(children);
79+
}
80+
7481
/**
7582
* Gets the executor
76-
* @return the executor
83+
* @return The executor
7784
*/
7885
public Consumer<CommandContext> getExecutor() {
7986
return executor;

src/main/java/com/datasiqn/commandcore/command/builder/CommandNode.java

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
import com.datasiqn.commandcore.command.context.CommandContext;
55
import com.datasiqn.resultapi.None;
66
import com.datasiqn.resultapi.Result;
7-
import org.jetbrains.annotations.Contract;
87
import org.jetbrains.annotations.NotNull;
9-
import org.jetbrains.annotations.Unmodifiable;
10-
import org.jetbrains.annotations.UnmodifiableView;
118

12-
import java.util.*;
9+
import java.util.ArrayList;
10+
import java.util.Comparator;
11+
import java.util.List;
1312
import java.util.function.Function;
1413
import java.util.stream.Collectors;
1514

@@ -42,19 +41,7 @@ public abstract class CommandNode<This extends CommandNode<This>> extends Comman
4241
* @return The tabcomplete
4342
*/
4443
@NotNull
45-
public List<String> getTabComplete(@NotNull CommandContext context) {
46-
return new ArrayList<>();
47-
}
48-
49-
/**
50-
* Gets the children of this node
51-
* @return A view of this node's children
52-
*/
53-
@Contract(" -> new")
54-
@UnmodifiableView
55-
public final @NotNull @Unmodifiable Set<CommandNode<?>> getChildren() {
56-
return Collections.unmodifiableSet(children);
57-
}
44+
public abstract List<String> getTabComplete(@NotNull CommandContext context);
5845

5946
/**
6047
* Attempts to parse a string

0 commit comments

Comments
 (0)