diff --git a/PlayWall/src/main/java/de/tobias/playpad/trigger/CartTriggerItem.java b/PlayWall/src/main/java/de/tobias/playpad/trigger/CartTriggerItem.java index a9bb720c3fc9b2e5ac0a080cf5b7175b08fbc57c..96018fd9e44d571a9841cf184de8cbcdf98db73d 100644 --- a/PlayWall/src/main/java/de/tobias/playpad/trigger/CartTriggerItem.java +++ b/PlayWall/src/main/java/de/tobias/playpad/trigger/CartTriggerItem.java @@ -9,7 +9,6 @@ import de.tobias.playpad.tigger.TriggerItem; import de.tobias.playpad.viewcontroller.main.IMainViewController; import org.dom4j.Element; -import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -76,7 +75,7 @@ public class CartTriggerItem extends TriggerItem { public TriggerItem copy() { CartTriggerItem clone = new CartTriggerItem(getType()); - clone.uuids = new ArrayList<>(); + clone.uuids = new UniqList<>(); clone.uuids.addAll(uuids); clone.allCarts = allCarts; clone.newStatus = newStatus; diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java index 85793e58329cc0793f8919085cf1059bd01cb500..aefadb33f2cfa1caf2319ba151ee3d0f9b2326af 100644 --- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java +++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java @@ -69,8 +69,8 @@ public class TriggerPointViewController extends NVC { try { TriggerItemFactory connect = PlayPadPlugin.getRegistries().getTriggerItems().getFactory(item.getType()); - VBox itemBox = new VBox(14); - NVC controller = connect.getSettingsController(item, mainViewController); + final VBox itemBox = new VBox(14); + final NVC controller = connect.getSettingsController(item, mainViewController); if (controller != null) { itemBox.getChildren().add(controller.getParent()); @@ -79,11 +79,11 @@ public class TriggerPointViewController extends NVC { itemBox.getChildren().add(timeViewController.getParent()); } - Button deleteButton = new Button("", new FontIcon(FontAwesomeType.TRASH)); - HBox hbox = new HBox(itemBox, deleteButton); + final Button deleteButton = new Button("", new FontIcon(FontAwesomeType.TRASH)); + final HBox hbox = new HBox(itemBox, deleteButton); hbox.setSpacing(14); - VBox rootBox = new VBox(14.0, hbox, new Separator()); + final VBox rootBox = new VBox(14.0, hbox, new Separator()); itemView.getChildren().addAll(rootBox); diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/view/main/ProjectPreviewView.java b/PlayWallCore/src/main/java/de/tobias/playpad/view/main/ProjectPreviewView.java index 849d93003b3112b2522fb5b3c2ae525e27f9ef97..0e7774ca30c7c9d29426c304409fc31f1fd06380 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/view/main/ProjectPreviewView.java +++ b/PlayWallCore/src/main/java/de/tobias/playpad/view/main/ProjectPreviewView.java @@ -30,7 +30,7 @@ public class ProjectPreviewView extends Pagination { setPageFactory(this::getPageNode); } - private Node getPageNode(int index) { + private Node getPageNode(int pageIndex) { GridPane gridPane = new GridPane(); gridPane.setHgap(7); gridPane.setVgap(7); @@ -38,7 +38,7 @@ public class ProjectPreviewView extends Pagination { gridPane.setPadding(new Insets(0, 0, 7, 0)); - final IPage page = project.getPage(index); + final IPage page = project.getPage(pageIndex); for (int x = 0; x < project.getSettings().getColumns(); x++) { for (int y = 0; y < project.getSettings().getRows(); y++) { final IPad pad = page.getPad(x, y);