From fc96d6fd05ba0da7e0aa52866a333fe74adebde9 Mon Sep 17 00:00:00 2001 From: tobias <tobias@thecodedev.de> Date: Thu, 12 Dec 2019 21:47:10 +0100 Subject: [PATCH] Fixed getPage method in Project --- .idea/encodings.xml | 20 +++++++++++++++++++ .../de/tobias/playpad/project/Project.java | 6 +++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.idea/encodings.xml b/.idea/encodings.xml index cfb629fb..573656f6 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -3,16 +3,36 @@ <component name="Encoding" native2AsciiForPropertiesFiles="true"> <file url="file://$PROJECT_DIR$" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/PlayWall" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWall/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWall/src/main/resources" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWall/src/main/resources/config" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/PlayWallComponents" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallComponents/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallComponents/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/PlayWallCore" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallCore/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallCore/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/PlayWallPlugins" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginAwake" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginAwake/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginAwake/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginEqualizer" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginEqualizer/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginEqualizer/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginLaunchpad" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginMedia" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginMedia/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginMedia/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginNativeAudio" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginNativeAudio/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginPlayoutLog" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/resources" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginWebAPI" charset="UTF-8" /> + <file url="file://$PROJECT_DIR$/PlayWallPlugins/PlayWallPluginWebAPI/src/main/resources" charset="UTF-8" /> <file url="PROJECT" charset="UTF-8" /> </component> </project> \ No newline at end of file diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java index e5b537f6..7378376a 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java +++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java @@ -136,7 +136,11 @@ public class Project { // Pages public Page getPage(int position) { - if (position >= pages.size() && position < ProjectSettings.MAX_PAGES) { + if (position < ProjectSettings.MAX_PAGES) { + return null; + } + + while (position >= pages.size()) { addPage(new Page(position, this)); } return pages.get(position); -- GitLab