From e9a73cb0287f9470aeeffd4066c6bc75a1d3d803 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Sun, 12 Jul 2015 20:55:13 +0200 Subject: [PATCH] use List interface instead of ArrayList implementation in several places --- .../replaymod/assets/CustomObjectRepository.java | 14 ++++++++++---- .../replaymod/gui/GuiObjectManager.java | 3 +-- .../replaymod/gui/elements/GuiEntryList.java | 2 +- .../replaymod/replay/ReplayHandler.java | 4 ++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/assets/CustomObjectRepository.java b/src/main/java/eu/crushedpixel/replaymod/assets/CustomObjectRepository.java index 22856e4d..28e18727 100644 --- a/src/main/java/eu/crushedpixel/replaymod/assets/CustomObjectRepository.java +++ b/src/main/java/eu/crushedpixel/replaymod/assets/CustomObjectRepository.java @@ -1,18 +1,24 @@ package eu.crushedpixel.replaymod.assets; -import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.Getter; import java.util.ArrayList; +import java.util.List; -@Data -@AllArgsConstructor public class CustomObjectRepository { public CustomObjectRepository() { this.objects = new ArrayList(); } + public CustomObjectRepository(List objects) { + setObjects(objects); + } + public void setObjects(List objects) { + this.objects = new ArrayList(objects); + } + + @Getter private ArrayList objects; } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java index e0cd9ec5..4ab0950c 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiObjectManager.java @@ -26,7 +26,6 @@ import org.lwjgl.util.Point; import java.awt.*; import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -363,7 +362,7 @@ public class GuiObjectManager extends GuiScreen { } private void saveOnQuit() { - ArrayList objects = objectList.getCopyOfElements(); + List objects = objectList.getCopyOfElements(); ReplayHandler.setCustomImageObjects(objects); if(objects.size() > 0) { diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiEntryList.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiEntryList.java index c44553f2..fa2de206 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiEntryList.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiEntryList.java @@ -150,7 +150,7 @@ public class GuiEntryList extends GuiAdvancedTextFi fireSelectionChangeEvent(); } - public ArrayList getCopyOfElements() { + public List getCopyOfElements() { return new ArrayList(elements); } diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java index c056da48..2cfd2e7d 100755 --- a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java @@ -617,8 +617,8 @@ public class ReplayHandler { customImageObjects.getObjects().add(object); } - public static void setCustomImageObjects(ArrayList objects) { - customImageObjects.setObjects(objects); + public static void setCustomImageObjects(List objects) { + customImageObjects.setObjects(new ArrayList(objects)); } public static void fireKeyframesModifyEvent() {