Skip to content

Commit 57524a8

Browse files
committed
Clean up KodiTreeItem
1 parent 755879a commit 57524a8

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

src/main/java/drrename/kodi/CheckService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ public void addChildItem(MovieTreeItem treeItem) {
4141

4242
public abstract R checkPath(Path path) throws IOException;
4343

44-
public abstract KodiTreeItem<R> buildChildItem(R checkResult);
44+
public abstract KodiTreeItem buildChildItem(R checkResult);
4545
}

src/main/java/drrename/kodi/KodiTreeItem.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
import drrename.ui.FilterableTreeItem;
2323
import javafx.scene.control.TreeItem;
2424

25-
public class KodiTreeItem<T extends CheckResult> extends FilterableTreeItem<KodiTreeItemContent> {
25+
public class KodiTreeItem extends FilterableTreeItem<KodiTreeItemContent> {
2626

2727
public KodiTreeItem(KodiTreeItemContent value) {
2828
super(value);
2929
getValue().setTreeItem(this);
3030
}
3131

32-
public void add(KodiTreeItem<?> childItem) {
32+
public void add(KodiTreeItem childItem) {
3333
getSourceChildren().add(childItem);
3434
}
3535

36-
public <R extends CheckResult> boolean contains(KodiTreeItem<R> childItem) {
36+
public <R extends CheckResult> boolean contains(KodiTreeItem childItem) {
3737
return getSourceChildren().stream().map(TreeItem::getValue).anyMatch(v -> v.equals(childItem.getValue()));
3838
}
3939
}

src/main/java/drrename/kodi/MovieTreeItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import java.nio.file.Path;
2323

24-
public class MovieTreeItem extends KodiTreeItem<CheckResult> {
24+
public class MovieTreeItem extends KodiTreeItem {
2525

2626
public MovieTreeItem(MovieTreeItemContent content) {
2727
super(content);

src/main/java/drrename/kodi/NfoFileContentCheckService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
public class NfoFileContentCheckService extends CheckService<NfoFileContentCheckResult> {
3939

4040
@Override
41-
public KodiTreeItem<NfoFileContentCheckResult> buildChildItem(NfoFileContentCheckResult checkResult) {
42-
return new KodiTreeItem<>(new NfoFileContentTreeItemContent(checkResult));
41+
public KodiTreeItem buildChildItem(NfoFileContentCheckResult checkResult) {
42+
return new KodiTreeItem(new NfoFileContentTreeItemContent(checkResult));
4343
}
4444

4545
public NfoFileContentCheckResult checkPath(Path path) throws IOException {

src/main/java/drrename/kodi/NfoFileNameTreeItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package drrename.kodi;
2121

22-
public class NfoFileNameTreeItem extends KodiTreeItem<NfoFileNameCheckResult> {
22+
public class NfoFileNameTreeItem extends KodiTreeItem {
2323

2424
public NfoFileNameTreeItem(NfoFileNameTreeItemContent value) {
2525
super(value);

src/main/java/drrename/kodi/SubdirsCheckService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public CheckResult checkPath(Path path) throws IOException {
4141
}
4242

4343
@Override
44-
public KodiTreeItem<CheckResult> buildChildItem(CheckResult checkResult) {
45-
return new KodiTreeItem<>(new CheckResultTreeItemContent(checkResult));
44+
public KodiTreeItem buildChildItem(CheckResult checkResult) {
45+
return new KodiTreeItem(new CheckResultTreeItemContent(checkResult));
4646
}
4747

4848
static List<Path> getSubdirs(Path path) throws IOException {

0 commit comments

Comments
 (0)