diff --git a/.gitignore b/.gitignore
index 5b112a343b00cae8a6671b16ab48622d3f937356..897d5d66231d5f79ddb3166e0d6ad93ba95e2805 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
**/.DS_Store
/out/
+/target/
.idea/workspace.xml
.idea/dictionaries/*
kotlinc.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 083d87445a76e1794d25f6dfc01d855f39a03367..ac2647c403892a3cbb63e19b2af934e141ebe927 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" native2AsciiForPropertiesFiles="true">
+ <file url="file://$PROJECT_DIR$/PlayWall" charset="UTF-8" />
+ <file url="file://$PROJECT_DIR$/PlayWallCore" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 42adbd2624ca985305a405618c3f8163fd57e087..f28356139ae5482b3e98b562b74236e1f6d6c1b6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -34,6 +34,12 @@
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/PlayWall/pom.xml" />
+ <option value="$PROJECT_DIR$/PlayWallCore/pom.xml" />
+ <option value="$PROJECT_DIR$/PluginAwake/pom.xml" />
+ <option value="$PROJECT_DIR$/PluginEqualizer/pom.xml" />
+ <option value="$PROJECT_DIR$/PluginLaunchpad/pom.xml" />
+ <option value="$PROJECT_DIR$/PluginMedia/pom.xml" />
+ <option value="$PROJECT_DIR$/PluginNativeAudio/pom.xml" />
</list>
</option>
</component>
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 064bfd64f6e90a56d55cb5ffe64bbc06f4462531..50861d52337869ea9f86ffcc5dc14b306d5f9013 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
- <file url="file://$PROJECT_DIR$/PlayWallCore/src/de/tobias/playpad/log/storage/SqlLiteLogSeasonStorageHandler.java" dialect="SQLite" />
+ <file url="file://$PROJECT_DIR$/PlayWallCore/src/main/java/de/tobias/playpad/log/storage/SqlLiteLogSeasonStorageHandler.java" dialect="SQLite" />
</component>
</project>
\ No newline at end of file
diff --git a/PlayWall/PlayWall.iml b/PlayWall/PlayWall.iml
index a9f9acbfd9c0b90e807d404c539d0b8d5540fa3b..4c15056639c63a54bc8a9c965a5f050cd96eca96 100644
--- a/PlayWall/PlayWall.iml
+++ b/PlayWall/PlayWall.iml
@@ -1,40 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
- <orderEntry type="module" module-name="PlayWallCore" exported="" />
- <orderEntry type="module-library" exported="">
- <library name="junit4">
- <CLASSES>
- <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" exported="" name="ControlsFX" level="project" />
- <orderEntry type="library" exported="" name="XML" level="project" />
- <orderEntry type="library" exported="" name="YML" level="project" />
- <orderEntry type="library" exported="" name="Plugins" level="project" />
- <orderEntry type="library" exported="" name="JLayer" level="project" />
- <orderEntry type="library" exported="" name="TinySound" level="project" />
- <orderEntry type="library" exported="" name="JNA" level="project" />
- <orderEntry type="library" exported="" name="HTML Builder" level="project" />
- <orderEntry type="library" exported="" name="libUtils" level="project" />
- <orderEntry type="library" exported="" name="Updater" level="project" />
- <orderEntry type="library" exported="" name="Json" level="project" />
- <orderEntry type="library" exported="" name="GSON" level="project" />
- <orderEntry type="library" exported="" name="Websocket Client" level="project" />
- <orderEntry type="library" exported="" name="libLogger" level="project" />
- <orderEntry type="library" exported="" name="unirest" level="project" />
- <orderEntry type="library" name="scala-sdk-2.12.6" level="application" />
- <orderEntry type="library" name="itextpdf-5.5.3" level="project" />
+ <orderEntry type="module" module-name="PlayWallCore" />
+ <orderEntry type="library" name="Maven: de.tobias:libUtils:1.5.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.hp.gagawa:gagawa:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:23.3-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.0.18" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:YAMLStorage:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libStorage:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libLogger:1.3.5" level="project" />
+ <orderEntry type="library" name="Maven: org.fusesource.jansi:jansi:1.17.1" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:Updater:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+ <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.23.1" level="project" />
+ <orderEntry type="library" name="Maven: net.xeoh:jspf:1.0.2" level="project" />
+ <orderEntry type="library" name="Maven: kuusisto:tinysound:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jcraft:jorbis:0.0.17" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:vorbisspi:1.0.3.3" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:jorbis:0.0.17.4" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:tritonus-share:0.3.7.4" level="project" />
+ <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.4.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+ <orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.5" level="project" />
+ <orderEntry type="library" name="Maven: javazoom:jlayer:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: net.minidev:json-smart:1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:9.0.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.5.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.5.0" level="project" />
+ <orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13" level="project" />
+ <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.6" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/PlayWall/build.xml b/PlayWall/build.xml
deleted file mode 100644
index 5842d5658151bc46e41158ddb5ee5a17a730d86e..0000000000000000000000000000000000000000
--- a/PlayWall/build.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<project name="Build App" default="buildApp" basedir="/Users/tobias/Documents/Programmieren/Java/eclipse/">
-
- <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="/Users/tobias/Documents/Programmieren/Java/ant/lib/appbundler-1.0.jar" />
- <taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask" classpath="/Users/tobias/Documents/Programmieren/Java/ant/lib/launch4j/launch4j.jar:${launch4j.dir}/lib/xstream.jar" />
-
- <target name="buildApp">
- <bundleapp outputdirectory="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/out/dist" name="Play Wall" displayname="Play Wall" identifier="de.tobias.playwall" mainclassname="de.tobias.playpad.PlayPadMain" icon="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/src/icon.icns">
- <runtime dir="/Library/Java/JavaVirtualMachines/jdk1.8.0_111.jdk/Contents/Home" />
- <classpath file="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/out/artifacts/PlayWall.jar" />
- </bundleapp>
-
- <launch4j>
- <config headerType="gui" outfile="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/out/dist/PlayWall.exe" dontWrapJar="false" jarPath="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/out/artifacts/PlayWall.jar" icon="/Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/src/icon.ico">
- <classPath mainClass="de.tobias.playpad.PlayPadMain" />
- <jre minVersion="1.8.0">
- </jre>
- </config>
- </launch4j>
- </target>
-</project>
\ No newline at end of file
diff --git a/PlayWall/pom.xml b/PlayWall/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..51d0544e9bb866b59f1b6f1a6949b5b3207f76a8
--- /dev/null
+++ b/PlayWall/pom.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallDesktop</artifactId>
+ <version>1.0.0</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+
+ <!--Scala Plugin-->
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>scala-compile-first</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>add-source</goal>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>scala-test-compile</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>scala</id>
+ <name>Scala Tools</name>
+ <url>http://scala-tools.org/repo-releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <repositories>
+ <repository>
+ <id>scala</id>
+ <name>Scala Tools</name>
+ <url>http://scala-tools.org/repo-releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>releases</id>
+ <url>https://maven.thecodelabs.de/nexus/content/repositories/releases</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallCore</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.controlsfx</groupId>
+ <artifactId>controlsfx</artifactId>
+ <version>9.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>4.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ <version>4.5.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>itextpdf</artifactId>
+ <version>5.5.13</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.12.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/PlayWall/src/controlsfx_de_DE.properties b/PlayWall/src/controlsfx_de_DE.properties
deleted file mode 100644
index 3416523e7ebdad7ee87d1388e65e7287ce7cf2d0..0000000000000000000000000000000000000000
--- a/PlayWall/src/controlsfx_de_DE.properties
+++ /dev/null
@@ -1,70 +0,0 @@
-### Dialogs ###
-
-dlg.ok.button = OK
-dlg.cancel.button = Abbruch
-dlg.yes.button = Ja
-dlg.no.button = Nein
-dlg.close.button = Schlie�en
-dlg.detail.button.more = Show Details
-dlg.detail.button.less = Hide Details
-
-### Common Dialogs ###
-
-font.dlg.title=Select font
-font.dlg.header=Select font
-font.dlg.sample.text=Sample
-font.dlg.font.label=Font
-font.dlg.style.label=Style
-font.dlg.size.label=Size
-
-progress.dlg.title=Progress
-progress.dlg.header=Progress
-
-login.dlg.title=Login
-login.dlg.header=Enter user name and password
-login.dlg.user.caption=User Name
-login.dlg.pswd.caption=Password
-login.dlg.login.button=Login
-
-exception.dlg.title = Exception Details
-exception.dlg.header = Exception Details
-exception.dlg.label = The exception stacktrace was:
-exception.button.label = Open Exception
-
-### Wizard ###
-
-wizard.next.button = Weiter
-wizard.previous.button = Zur�ck
-
-### Property Sheet ###
-
-bean.property.change.error.title = Property Change Error
-bean.property.change.error.header = Change is not allowed
-bean.property.category.basic=Basic
-bean.property.category.expert=Expert
-
-property.sheet.search.field.prompt = Search
-property.sheet.group.mode.byname = By Name
-property.sheet.group.mode.bycategory = By Category
-
-### Spreadsheet View ###
-
-spreadsheet.view.menu.copy = Copy
-spreadsheet.view.menu.paste = Paste
-spreadsheet.view.menu.comment = Comment cell
-spreadsheet.view.menu.comment.top-left = top left
-spreadsheet.view.menu.comment.top-right = top right
-spreadsheet.view.menu.comment.bottom-right = bottom right
-spreadsheet.view.menu.comment.bottom-left = bottom left
-spreadsheet.column.menu.fix = Fix column
-spreadsheet.column.menu.unfix = Unfix column
-spreadsheet.verticalheader.menu.fix = Fix row
-spreadsheet.verticalheader.menu.unfix = Unfix row
-
-### Status Bar ###
-statusbar.ok = OK
-
-### List Selection View ###
-listSelectionView.header.source = Available
-listSelectionView.header.target = Selected
-
diff --git a/PlayWall/src/de/tobias/playpad/PlayPadImpl.java b/PlayWall/src/de/tobias/playpad/PlayPadImpl.java
deleted file mode 100644
index 4f068f4b21fb886b25c41aa40aeb4ddea3d9bf39..0000000000000000000000000000000000000000
--- a/PlayWall/src/de/tobias/playpad/PlayPadImpl.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package de.tobias.playpad;
-
-import com.neovisionaries.ws.client.WebSocketException;
-import de.tobias.logger.LogLevel;
-import de.tobias.logger.Logger;
-import de.tobias.playpad.audio.JavaFXHandlerFactory;
-import de.tobias.playpad.log.LogSeasons;
-import de.tobias.playpad.log.storage.SqlLiteLogSeasonStorageHandler;
-import de.tobias.playpad.midi.device.DeviceRegistry;
-import de.tobias.playpad.midi.device.PD12;
-import de.tobias.playpad.plugin.*;
-import de.tobias.playpad.project.Project;
-import de.tobias.playpad.server.Server;
-import de.tobias.playpad.server.Session;
-import de.tobias.playpad.server.SessionDelegate;
-import de.tobias.playpad.settings.GlobalSettings;
-import de.tobias.playpad.view.MapperOverviewViewController;
-import de.tobias.playpad.viewcontroller.BaseMapperOverviewViewController;
-import de.tobias.playpad.viewcontroller.IPadSettingsViewController;
-import de.tobias.playpad.viewcontroller.main.IMainViewController;
-import de.tobias.playpad.viewcontroller.main.MainViewController;
-import de.tobias.playpad.viewcontroller.option.IProfileSettingsViewController;
-import de.tobias.playpad.volume.GlobalVolume;
-import de.tobias.playpad.volume.PadVolume;
-import de.tobias.playpad.volume.VolumeManager;
-import de.tobias.utils.application.App;
-import de.tobias.utils.application.ApplicationUtils;
-import de.tobias.utils.application.container.PathType;
-import de.tobias.utils.nui.NVC;
-import de.tobias.utils.util.FileUtils;
-import de.tobias.utils.util.SystemUtils;
-import de.tobias.utils.util.Worker;
-import javafx.application.Application;
-import javafx.scene.image.Image;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.ResourceBundle;
-import java.util.function.Consumer;
-
-public class PlayPadImpl implements PlayPad {
-
- private Application.Parameters parameters;
-
- protected List<WindowListener<IMainViewController>> mainViewListeners = new ArrayList<>();
- protected List<WindowListener<IProfileSettingsViewController>> settingsViewListeners = new ArrayList<>();
- protected List<WindowListener<IPadSettingsViewController>> padSettingsViewListeners = new ArrayList<>();
- protected List<SettingsListener> settingsListeners = new ArrayList<>();
- protected List<PadListener> padListeners = new ArrayList<>();
-
- private MainViewController mainViewController;
- private Project currentProject;
- private static Module module;
-
- protected GlobalSettings globalSettings;
-
- protected Session session;
-
- PlayPadImpl(GlobalSettings globalSettings, Application.Parameters parameters) {
- this.parameters = parameters;
- this.globalSettings = globalSettings;
-
- App app = ApplicationUtils.getApplication();
- module = new Module(app.getInfo().getName(), app.getInfo().getIdentifier());
- ModernPluginManager.getInstance().addModule(module);
- }
-
- @Override
- public void addMainViewListener(WindowListener<IMainViewController> listener) {
- mainViewListeners.add(listener);
- }
-
- public List<WindowListener<IMainViewController>> getMainViewListeners() {
- return mainViewListeners;
- }
-
- @Override
- public void addSettingsListener(SettingsListener listener) {
- settingsListeners.add(listener);
- }
-
- @Override
- public void removeSettingsListener(SettingsListener listener) {
- settingsListeners.remove(listener);
- }
-
- @Override
- public List<SettingsListener> getSettingsListener() {
- return settingsListeners;
- }
-
- @Override
- public void addPadListener(PadListener listener) {
- padListeners.add(listener);
- }
-
- @Override
- public void removePadListener(PadListener listener) {
- padListeners.remove(listener);
- }
-
- @Override
- public List<PadListener> getPadListener() {
- return padListeners;
- }
-
- @Override
- public IMainViewController getMainViewController() {
- return mainViewController;
- }
-
- @Override
- public Optional<Image> getIcon() {
- return PlayPadMain.stageIcon;
- }
-
- @Override
- public void shutdown() {
- // Shutdown components
- PlayPadPlugin.getRegistryCollection().getAudioHandlers().getComponents().forEach(i ->
- {
- if (i instanceof AutoCloseable) {
- try {
- ((AutoCloseable) i).close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
-
- PlayPadPlugin.getServerHandler().getServer().disconnect();
-
- try {
- LogSeasons.getStorageHandler().close();
- } catch (RuntimeException e) {
- Logger.log(LogLevel.ERROR, "Cannot close LogSeasonStorageHandler (" + e.getLocalizedMessage() + ")");
- }
-
- try {
- Path applicationSupportPath = SystemUtils.getApplicationSupportDirectoryPath("de.tobias.playpad.PlayPadMain");
- FileUtils.deleteDirectory(applicationSupportPath);
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- ModernPluginManager.getInstance().showdown();
- Worker.shutdown();
- }
-
- @Override
- public GlobalSettings getGlobalSettings() {
- return globalSettings;
- }
-
- public void openProject(Project project, Consumer<NVC> onLoaded) {
- if (mainViewController == null) {
- mainViewController = new MainViewController(e -> {
- currentProject = project;
- mainViewController.openProject(project);
- if (onLoaded != null) {
- onLoaded.accept(e);
- }
- mainViewListeners.forEach(l -> l.onInit(mainViewController));
- });
- } else {
- currentProject = project;
- mainViewController.openProject(project);
- }
- }
-
- @Override
- public Project getCurrentProject() {
- return currentProject;
- }
-
- void startup(ResourceBundle resourceBundle, SessionDelegate delegate) {
- App app = ApplicationUtils.getApplication();
- // Setup PlayoutLog
- try {
- Path playOutLogPath = app.getPath(PathType.DOCUMENTS, "logging.db");
- LogSeasons.setStorageHandler(new SqlLiteLogSeasonStorageHandler(playOutLogPath));
- Logger.log(LogLevel.INFO, "Setup LogSeasonStorageHandler in path: " + playOutLogPath);
- } catch (SQLException e) {
- Logger.log(LogLevel.ERROR, "Cannot setup LogSeasonStorageHandler (" + e.getLocalizedMessage() + ")");
- }
- registerComponents(resourceBundle);
- configureServer(delegate);
- }
-
- private void registerComponents(ResourceBundle resourceBundle) {
- // Midi
- DeviceRegistry.getFactoryInstance().registerDevice(PD12.NAME, PD12.class);
-
- try {
- // Load Components
- RegistryCollection registryCollection = PlayPadPlugin.getRegistryCollection();
-
- registryCollection.getActions().loadComponentsFromFile("de/tobias/playpad/components/Actions.xml", module, resourceBundle);
- registryCollection.getAudioHandlers().loadComponentsFromFile("de/tobias/playpad/components/AudioHandler.xml", module, resourceBundle);
- registryCollection.getDragModes().loadComponentsFromFile("de/tobias/playpad/components/DragMode.xml", module, resourceBundle);
- registryCollection.getMappers().loadComponentsFromFile("de/tobias/playpad/components/Mapper.xml", module, resourceBundle);
- registryCollection.getPadContents().loadComponentsFromFile("de/tobias/playpad/components/PadContent.xml", module, resourceBundle);
- registryCollection.getTriggerItems().loadComponentsFromFile("de/tobias/playpad/components/Trigger.xml", module, resourceBundle);
- registryCollection.getMainLayouts().loadComponentsFromFile("de/tobias/playpad/components/Layout.xml", module, resourceBundle);
-
- // Set Default
- // TODO Set Default
- registryCollection.getAudioHandlers().setDefaultID(JavaFXHandlerFactory.class);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- // Volume Management
- VolumeManager volumeManager = VolumeManager.getInstance();
- volumeManager.addFilter(new GlobalVolume());
- volumeManager.addFilter(new PadVolume());
-
- // Mapper
- BaseMapperOverviewViewController.setInstance(new MapperOverviewViewController());
- }
-
- public Application.Parameters getParameters() {
- return parameters;
- }
-
- private void configureServer(SessionDelegate delegate) {
- // Load Server session key
- session = Session.load();
-
- if (session == null) {
- session = delegate.getSession();
- }
-
- // Connect to Server
- Server server = PlayPadPlugin.getServerHandler().getServer();
- try {
- server.connect(session.getKey());
- } catch (IOException | WebSocketException e) {
- e.printStackTrace();
- }
- }
-
- public Session getSession() {
- return session;
- }
-}
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/cart/PadStatusFeedbackListener.java b/PlayWall/src/de/tobias/playpad/action/actions/cart/PadStatusFeedbackListener.java
deleted file mode 100644
index 61263017b1fe3cd5fe97a82e8cdf9756fef920f3..0000000000000000000000000000000000000000
--- a/PlayWall/src/de/tobias/playpad/action/actions/cart/PadStatusFeedbackListener.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package de.tobias.playpad.action.actions.cart;
-
-import de.tobias.playpad.action.feedback.FeedbackMessage;
-import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.PadSettings;
-import de.tobias.playpad.pad.PadStatus;
-import de.tobias.playpad.pad.content.play.Durationable;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
-import javafx.util.Duration;
-
-public class PadStatusFeedbackListener implements ChangeListener<PadStatus> {
-
- private CartAction action;
-
- public void setAction(CartAction action) {
- this.action = action;
- }
-
- @Override
- public void changed(ObservableValue<? extends PadStatus> observable, PadStatus oldValue, PadStatus newValue) {
- if (action != null) {
- Pad pad = action.getPad();
- if (pad.isPadVisible()) {
- switch (newValue) {
- case EMPTY:
- case ERROR:
- action.handleFeedback(FeedbackMessage.OFF);
- break;
- case PAUSE:
- action.handleFeedback(FeedbackMessage.STANDARD);
- break;
- case PLAY:
- action.handleFeedback(FeedbackMessage.EVENT);
-
- // Wenn Cart in Warning Zeitbereich und vomn Pause zu Play wechselt
- try {
- if (pad.getContent() instanceof Durationable) {
- Durationable durationable = (Durationable) pad.getContent();
- PadSettings padSettings = pad.getPadSettings();
-
- if (!padSettings.isLoop()) {
- Duration warning = padSettings.getWarning();
- Duration rest = durationable.getDuration().subtract(durationable.getPosition());
- double seconds = rest.toSeconds();
-
- if (warning.toSeconds() > seconds) {
- action.handleFeedback(FeedbackMessage.WARNING);
- }
- }
- }
- } catch (Exception ignored) {}
- break;
- case READY:
- action.handleFeedback(FeedbackMessage.STANDARD);
- break;
- case STOP:
- action.handleFeedback(FeedbackMessage.STANDARD);
- break;
- default:
- break;
-
- }
- }
- }
- }
-}
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.scala b/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.scala
deleted file mode 100644
index 988808978c83a109629f3cc95fe203610762030c..0000000000000000000000000000000000000000
--- a/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.tobias.playpad.action.actions.cart.handler
-
-import de.tobias.playpad.action.actions.cart.CartAction.CartActionMode
-
-object CartActionHandlerFactory {
-
- def getInstance(cartActionMode: CartActionMode): CartActionHandler = {
- cartActionMode match {
- case CartActionMode.PLAY_STOP => new PlayStopHandler()
- case CartActionMode.PLAY_PAUSE => new PlayPauseHandler()
- case CartActionMode.PLAY_HOLD => new PlayHoldHandler()
- case CartActionMode.PLAY_PLAY => new PlayPlayHandler()
- }
- }
-}
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.scala b/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.scala
deleted file mode 100644
index 455dff70def199d617028d41a5e09549f8efebf7..0000000000000000000000000000000000000000
--- a/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package de.tobias.playpad.action.actions.cart.handler
-
-import de.tobias.playpad.action.InputType
-import de.tobias.playpad.action.actions.cart.CartAction
-import de.tobias.playpad.pad.Pad
-import de.tobias.playpad.project.Project
-import de.tobias.playpad.viewcontroller.main.IMainViewController
-
-class PlayHoldHandler extends CartActionHandler {
- override def performAction(`type`: InputType,
- cartAction: CartAction,
- pad: Pad,
- project: Project,
- mainViewController: IMainViewController) = {
- if (`type` eq InputType.PRESSED) {
- if (pad.isReady) { // Allow the listener to send the feedback
- cartAction.getPadPositionListener.setSend(false)
- pad.play()
- }
- } else if (`type` eq InputType.RELEASED) {
- if (pad.isPlay) {
- pad.stop()
- }
- }
- }
-}
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.scala b/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.scala
deleted file mode 100644
index bbceb5eea1ee5d353f2dcd20a52aa8de885a9bf7..0000000000000000000000000000000000000000
--- a/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-package de.tobias.playpad.action.actions.cart.handler
-
-import de.tobias.playpad.action.InputType
-import de.tobias.playpad.action.actions.cart.CartAction
-import de.tobias.playpad.pad.Pad
-import de.tobias.playpad.project.Project
-import de.tobias.playpad.viewcontroller.main.IMainViewController
-
-class PlayPauseHandler extends CartActionHandler {
- override def performAction(`type`: InputType,
- cartAction: CartAction,
- pad: Pad,
- project: Project,
- mainViewController: IMainViewController) = {
- if (`type` eq InputType.PRESSED) {
- if (pad.isPlay) {
- pad.pause()
- }
- else { // Allow the listener to send the feedback
- cartAction.getPadPositionListener.setSend(false)
- pad.play()
- }
- }
- }
-}
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.scala b/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.scala
deleted file mode 100644
index f1d0a3498a79cd564954281d836a9ed2106d4700..0000000000000000000000000000000000000000
--- a/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.tobias.playpad.action.actions.cart.handler
-
-import de.tobias.playpad.action.InputType
-import de.tobias.playpad.action.actions.cart.CartAction
-import de.tobias.playpad.pad.{Pad, PadStatus}
-import de.tobias.playpad.project.Project
-import de.tobias.playpad.viewcontroller.main.IMainViewController
-
-class PlayPlayHandler extends CartActionHandler {
- override def performAction(`type`: InputType,
- cartAction: CartAction,
- pad: Pad,
- project: Project,
- mainViewController: IMainViewController) = {
- if (`type` eq InputType.PRESSED) {
- pad.setStatus(PadStatus.RESTART);
- }
- }
-}
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.scala b/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.scala
deleted file mode 100644
index c69283d040c2e4d4dcdd2abe38d523fd454dc558..0000000000000000000000000000000000000000
--- a/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.scala
+++ /dev/null
@@ -1,25 +0,0 @@
-package de.tobias.playpad.action.actions.cart.handler
-
-import de.tobias.playpad.action.InputType
-import de.tobias.playpad.action.actions.cart.CartAction
-import de.tobias.playpad.pad.Pad
-import de.tobias.playpad.project.Project
-import de.tobias.playpad.viewcontroller.main.IMainViewController
-
-class PlayStopHandler extends CartActionHandler {
-
- override def performAction(`type`: InputType,
- cartAction: CartAction,
- pad: Pad,
- project: Project,
- mainViewController: IMainViewController) = {
- if (`type` eq InputType.PRESSED) {
- if (pad.isPlay) {
- pad.stop()
- } else { // Allow the listener to send the feedback
- cartAction.getPadPositionListener.setSend(false)
- pad.play()
- }
- }
- }
-}
diff --git a/PlayWall/src/META-INF/MANIFEST.MF b/PlayWall/src/main/java/META-INF/MANIFEST.MF
similarity index 95%
rename from PlayWall/src/META-INF/MANIFEST.MF
rename to PlayWall/src/main/java/META-INF/MANIFEST.MF
index 75a7c8d35b13336ce56a28f7f86a0cc156215937..3246f7586bf704b8728ac9f7e34fb2d50d521c1f 100644
--- a/PlayWall/src/META-INF/MANIFEST.MF
+++ b/PlayWall/src/main/java/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
-Main-Class: de.tobias.playpad.PlayPadMain
-
+Manifest-Version: 1.0
+Main-Class: de.tobias.playpad.PlayPadMain
+
diff --git a/PlayWall/src/de/tobias/playpad/AppUserInfoStrings.java b/PlayWall/src/main/java/de/tobias/playpad/AppUserInfoStrings.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/AppUserInfoStrings.java
rename to PlayWall/src/main/java/de/tobias/playpad/AppUserInfoStrings.java
diff --git a/PlayWall/src/main/java/de/tobias/playpad/PlayPadImpl.java b/PlayWall/src/main/java/de/tobias/playpad/PlayPadImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..8f872818a7f98ccbb1919bed4b48d69959185e69
--- /dev/null
+++ b/PlayWall/src/main/java/de/tobias/playpad/PlayPadImpl.java
@@ -0,0 +1,250 @@
+package de.tobias.playpad;
+
+import com.neovisionaries.ws.client.WebSocketException;
+import de.tobias.logger.LogLevel;
+import de.tobias.logger.Logger;
+import de.tobias.playpad.audio.JavaFXHandlerFactory;
+import de.tobias.playpad.log.LogSeasons;
+import de.tobias.playpad.log.storage.SqlLiteLogSeasonStorageHandler;
+import de.tobias.playpad.midi.device.DeviceRegistry;
+import de.tobias.playpad.midi.device.PD12;
+import de.tobias.playpad.plugin.*;
+import de.tobias.playpad.project.Project;
+import de.tobias.playpad.server.Server;
+import de.tobias.playpad.server.Session;
+import de.tobias.playpad.server.SessionDelegate;
+import de.tobias.playpad.settings.GlobalSettings;
+import de.tobias.playpad.view.MapperOverviewViewController;
+import de.tobias.playpad.viewcontroller.BaseMapperOverviewViewController;
+import de.tobias.playpad.viewcontroller.IPadSettingsViewController;
+import de.tobias.playpad.viewcontroller.main.IMainViewController;
+import de.tobias.playpad.viewcontroller.main.MainViewController;
+import de.tobias.playpad.viewcontroller.option.IProfileSettingsViewController;
+import de.tobias.playpad.volume.GlobalVolume;
+import de.tobias.playpad.volume.PadVolume;
+import de.tobias.playpad.volume.VolumeManager;
+import de.tobias.utils.application.App;
+import de.tobias.utils.application.ApplicationUtils;
+import de.tobias.utils.application.container.PathType;
+import de.tobias.utils.nui.NVC;
+import de.tobias.utils.util.FileUtils;
+import de.tobias.utils.util.SystemUtils;
+import de.tobias.utils.util.Worker;
+import javafx.application.Application;
+import javafx.scene.image.Image;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.ResourceBundle;
+import java.util.function.Consumer;
+
+public class PlayPadImpl implements PlayPad {
+
+ private Application.Parameters parameters;
+
+ protected List<WindowListener<IMainViewController>> mainViewListeners = new ArrayList<>();
+ protected List<WindowListener<IProfileSettingsViewController>> settingsViewListeners = new ArrayList<>();
+ protected List<WindowListener<IPadSettingsViewController>> padSettingsViewListeners = new ArrayList<>();
+ protected List<SettingsListener> settingsListeners = new ArrayList<>();
+ protected List<PadListener> padListeners = new ArrayList<>();
+
+ private MainViewController mainViewController;
+ private Project currentProject;
+ private static Module module;
+
+ protected GlobalSettings globalSettings;
+
+ protected Session session;
+
+ PlayPadImpl(GlobalSettings globalSettings, Application.Parameters parameters) {
+ this.parameters = parameters;
+ this.globalSettings = globalSettings;
+
+ App app = ApplicationUtils.getApplication();
+ module = new Module(app.getInfo().getName(), app.getInfo().getIdentifier());
+ ModernPluginManager.getInstance().addModule(module);
+ }
+
+ @Override
+ public void addMainViewListener(WindowListener<IMainViewController> listener) {
+ mainViewListeners.add(listener);
+ }
+
+ public List<WindowListener<IMainViewController>> getMainViewListeners() {
+ return mainViewListeners;
+ }
+
+ @Override
+ public void addSettingsListener(SettingsListener listener) {
+ settingsListeners.add(listener);
+ }
+
+ @Override
+ public void removeSettingsListener(SettingsListener listener) {
+ settingsListeners.remove(listener);
+ }
+
+ @Override
+ public List<SettingsListener> getSettingsListener() {
+ return settingsListeners;
+ }
+
+ @Override
+ public void addPadListener(PadListener listener) {
+ padListeners.add(listener);
+ }
+
+ @Override
+ public void removePadListener(PadListener listener) {
+ padListeners.remove(listener);
+ }
+
+ @Override
+ public List<PadListener> getPadListener() {
+ return padListeners;
+ }
+
+ @Override
+ public IMainViewController getMainViewController() {
+ return mainViewController;
+ }
+
+ @Override
+ public Optional<Image> getIcon() {
+ return PlayPadMain.stageIcon;
+ }
+
+ @Override
+ public void shutdown() {
+ // Shutdown components
+ PlayPadPlugin.getRegistryCollection().getAudioHandlers().getComponents().forEach(i ->
+ {
+ if (i instanceof AutoCloseable) {
+ try {
+ ((AutoCloseable) i).close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+
+ PlayPadPlugin.getServerHandler().getServer().disconnect();
+
+ try {
+ LogSeasons.getStorageHandler().close();
+ } catch (RuntimeException e) {
+ Logger.log(LogLevel.ERROR, "Cannot close LogSeasonStorageHandler (" + e.getLocalizedMessage() + ")");
+ }
+
+ try {
+ Path applicationSupportPath = SystemUtils.getApplicationSupportDirectoryPath("de.tobias.playpad.PlayPadMain");
+ FileUtils.deleteDirectory(applicationSupportPath);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ ModernPluginManager.getInstance().showdown();
+ Worker.shutdown();
+ }
+
+ @Override
+ public GlobalSettings getGlobalSettings() {
+ return globalSettings;
+ }
+
+ public void openProject(Project project, Consumer<NVC> onLoaded) {
+ if (mainViewController == null) {
+ mainViewController = new MainViewController(e -> {
+ currentProject = project;
+ mainViewController.openProject(project);
+ if (onLoaded != null) {
+ onLoaded.accept(e);
+ }
+ mainViewListeners.forEach(l -> l.onInit(mainViewController));
+ });
+ } else {
+ currentProject = project;
+ mainViewController.openProject(project);
+ }
+ }
+
+ @Override
+ public Project getCurrentProject() {
+ return currentProject;
+ }
+
+ void startup(ResourceBundle resourceBundle, SessionDelegate delegate) {
+ App app = ApplicationUtils.getApplication();
+ // Setup PlayoutLog
+ try {
+ Path playOutLogPath = app.getPath(PathType.DOCUMENTS, "logging.db");
+ LogSeasons.setStorageHandler(new SqlLiteLogSeasonStorageHandler(playOutLogPath));
+ Logger.log(LogLevel.INFO, "Setup LogSeasonStorageHandler in path: " + playOutLogPath);
+ } catch (SQLException e) {
+ Logger.log(LogLevel.ERROR, "Cannot setup LogSeasonStorageHandler (" + e.getLocalizedMessage() + ")");
+ }
+ registerComponents(resourceBundle);
+ configureServer(delegate);
+ }
+
+ private void registerComponents(ResourceBundle resourceBundle) {
+ // Midi
+ DeviceRegistry.getFactoryInstance().registerDevice(PD12.NAME, PD12.class);
+
+ try {
+ // Load Components
+ RegistryCollection registryCollection = PlayPadPlugin.getRegistryCollection();
+
+ registryCollection.getActions().loadComponentsFromFile("de/tobias/playpad/components/Actions.xml", module, resourceBundle);
+ registryCollection.getAudioHandlers().loadComponentsFromFile("de/tobias/playpad/components/AudioHandler.xml", module, resourceBundle);
+ registryCollection.getDragModes().loadComponentsFromFile("de/tobias/playpad/components/DragMode.xml", module, resourceBundle);
+ registryCollection.getMappers().loadComponentsFromFile("de/tobias/playpad/components/Mapper.xml", module, resourceBundle);
+ registryCollection.getPadContents().loadComponentsFromFile("de/tobias/playpad/components/PadContent.xml", module, resourceBundle);
+ registryCollection.getTriggerItems().loadComponentsFromFile("de/tobias/playpad/components/Trigger.xml", module, resourceBundle);
+ registryCollection.getMainLayouts().loadComponentsFromFile("de/tobias/playpad/components/Layout.xml", module, resourceBundle);
+
+ // Set Default
+ // TODO Set Default
+ registryCollection.getAudioHandlers().setDefaultID(JavaFXHandlerFactory.class);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ // Volume Management
+ VolumeManager volumeManager = VolumeManager.getInstance();
+ volumeManager.addFilter(new GlobalVolume());
+ volumeManager.addFilter(new PadVolume());
+
+ // Mapper
+ BaseMapperOverviewViewController.setInstance(new MapperOverviewViewController());
+ }
+
+ public Application.Parameters getParameters() {
+ return parameters;
+ }
+
+ private void configureServer(SessionDelegate delegate) {
+ // Load Server session key
+ session = Session.load();
+
+ if (session == null) {
+ session = delegate.getSession();
+ }
+
+ // Connect to Server
+ Server server = PlayPadPlugin.getServerHandler().getServer();
+ try {
+ server.connect(session.getKey());
+ } catch (IOException | WebSocketException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public Session getSession() {
+ return session;
+ }
+}
diff --git a/PlayWall/src/de/tobias/playpad/PlayPadMain.java b/PlayWall/src/main/java/de/tobias/playpad/PlayPadMain.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/PlayPadMain.java
rename to PlayWall/src/main/java/de/tobias/playpad/PlayPadMain.java
index 83fd76ea6bc5f149c766731ddbf0d98d3fc0a71d..2a840c991fe92f8ee23d4353fb3df1d90d7a7921 100644
--- a/PlayWall/src/de/tobias/playpad/PlayPadMain.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/PlayPadMain.java
@@ -1,6 +1,7 @@
package de.tobias.playpad;
import com.mashape.unirest.http.Unirest;
+import de.tobias.logger.FileOutputOption;
import de.tobias.logger.LogLevel;
import de.tobias.logger.LogLevelFilter;
import de.tobias.logger.Logger;
@@ -108,7 +109,7 @@ public class PlayPadMain extends Application implements LocalizationDelegate {
App app = ApplicationUtils.getApplication();
if (!app.isDebug()) {
- Logger.enableFileOutput(true);
+ Logger.setFileOutput(FileOutputOption.COMBINED);
}
// Init SSLContext
diff --git a/PlayWall/src/de/tobias/playpad/PseudoClasses.java b/PlayWall/src/main/java/de/tobias/playpad/PseudoClasses.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/PseudoClasses.java
rename to PlayWall/src/main/java/de/tobias/playpad/PseudoClasses.java
diff --git a/PlayWall/src/de/tobias/playpad/RegistryCollectionImpl.java b/PlayWall/src/main/java/de/tobias/playpad/RegistryCollectionImpl.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/RegistryCollectionImpl.java
rename to PlayWall/src/main/java/de/tobias/playpad/RegistryCollectionImpl.java
index 52fbbf70040c675135a2ff7905cb38d2ecff5a29..8ce9197ecd36d56896a076442e18c9aa59f46af4 100644
--- a/PlayWall/src/de/tobias/playpad/RegistryCollectionImpl.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/RegistryCollectionImpl.java
@@ -61,7 +61,7 @@ public class RegistryCollectionImpl implements RegistryCollection {
public Registry<TriggerItemFactory> getTriggerItems() {
return triggerItemRegistry;
}
-
+
@Override
public DefaultRegistry<MainLayoutFactory> getMainLayouts() {
return mainLayoutRegistry;
diff --git a/PlayWall/src/de/tobias/playpad/Strings.java b/PlayWall/src/main/java/de/tobias/playpad/Strings.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/Strings.java
rename to PlayWall/src/main/java/de/tobias/playpad/Strings.java
diff --git a/PlayWall/src/de/tobias/playpad/VersionUpdater.java b/PlayWall/src/main/java/de/tobias/playpad/VersionUpdater.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/VersionUpdater.java
rename to PlayWall/src/main/java/de/tobias/playpad/VersionUpdater.java
diff --git a/PlayWall/src/de/tobias/playpad/action/MappingUtils.java b/PlayWall/src/main/java/de/tobias/playpad/action/MappingUtils.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/MappingUtils.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/MappingUtils.java
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/NavigateAction.java b/PlayWall/src/main/java/de/tobias/playpad/action/actions/NavigateAction.java
similarity index 91%
rename from PlayWall/src/de/tobias/playpad/action/actions/NavigateAction.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/actions/NavigateAction.java
index bc3fa798eee6e2b2d34cdf7ea8030e854ab96c4f..026799cc762c739a5d9c6abbc3141c0a01dfcd11 100644
--- a/PlayWall/src/de/tobias/playpad/action/actions/NavigateAction.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/actions/NavigateAction.java
@@ -68,14 +68,14 @@ public class NavigateAction extends Action {
public void performAction(InputType type, Project project, IMainViewController mainViewController) {
if (type == InputType.PRESSED) {
switch (this.action) {
- case PREVIOUS:
- Platform.runLater(() -> mainViewController.showPage(mainViewController.getPage() - 1));
- break;
- case NEXT:
- Platform.runLater(() -> mainViewController.showPage(mainViewController.getPage() + 1));
- break;
- default:
- break;
+ case PREVIOUS:
+ Platform.runLater(() -> mainViewController.showPage(mainViewController.getPage() - 1));
+ break;
+ case NEXT:
+ Platform.runLater(() -> mainViewController.showPage(mainViewController.getPage() + 1));
+ break;
+ default:
+ break;
}
}
}
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/PageAction.java b/PlayWall/src/main/java/de/tobias/playpad/action/actions/PageAction.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/actions/PageAction.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/actions/PageAction.java
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/StopAction.java b/PlayWall/src/main/java/de/tobias/playpad/action/actions/StopAction.java
similarity index 92%
rename from PlayWall/src/de/tobias/playpad/action/actions/StopAction.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/actions/StopAction.java
index 721ff672d6577375087ccc557b40b6c53f7201cd..60cad77bb89b3d45361ba9e7e72320d5f6528bc4 100644
--- a/PlayWall/src/de/tobias/playpad/action/actions/StopAction.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/actions/StopAction.java
@@ -9,8 +9,8 @@ import de.tobias.playpad.pad.Pad;
import de.tobias.playpad.pad.PadStatus;
import de.tobias.playpad.project.Project;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import de.tobias.utils.util.Localization;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
@@ -60,10 +60,12 @@ public class StopAction extends Action {
}
@Override
- public void load(Element root) {}
+ public void load(Element root) {
+ }
@Override
- public void save(Element root) {}
+ public void save(Element root) {
+ }
@Override
public StringProperty displayProperty() {
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/cart/CartAction.java b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/CartAction.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/actions/cart/CartAction.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/CartAction.java
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/cart/PadContentFeedbackListener.java b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/PadContentFeedbackListener.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/action/actions/cart/PadContentFeedbackListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/PadContentFeedbackListener.java
index 441423e403ad94b3d853552f5a426283e3e3f097..906d41c4f261193f30d85c0c5cf9a313bebef219 100644
--- a/PlayWall/src/de/tobias/playpad/action/actions/cart/PadContentFeedbackListener.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/PadContentFeedbackListener.java
@@ -21,7 +21,7 @@ public class PadContentFeedbackListener implements ChangeListener<PadContent> {
durationable.positionProperty().addListener(action.getPadPositionListener());
}
}
-
+
if (newValue != null) {
if (newValue instanceof Durationable) {
Durationable durationable = (Durationable) newValue;
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/cart/PadPositionWarningListener.java b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/PadPositionWarningListener.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/actions/cart/PadPositionWarningListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/PadPositionWarningListener.java
diff --git a/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/PadStatusFeedbackListener.java b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/PadStatusFeedbackListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..97737ce8472cd7bd173cd4f6bba07c53e3dc46c6
--- /dev/null
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/PadStatusFeedbackListener.java
@@ -0,0 +1,68 @@
+package de.tobias.playpad.action.actions.cart;
+
+import de.tobias.playpad.action.feedback.FeedbackMessage;
+import de.tobias.playpad.pad.Pad;
+import de.tobias.playpad.pad.PadSettings;
+import de.tobias.playpad.pad.PadStatus;
+import de.tobias.playpad.pad.content.play.Durationable;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.util.Duration;
+
+public class PadStatusFeedbackListener implements ChangeListener<PadStatus> {
+
+ private CartAction action;
+
+ public void setAction(CartAction action) {
+ this.action = action;
+ }
+
+ @Override
+ public void changed(ObservableValue<? extends PadStatus> observable, PadStatus oldValue, PadStatus newValue) {
+ if (action != null) {
+ Pad pad = action.getPad();
+ if (pad.isPadVisible()) {
+ switch (newValue) {
+ case EMPTY:
+ case ERROR:
+ action.handleFeedback(FeedbackMessage.OFF);
+ break;
+ case PAUSE:
+ action.handleFeedback(FeedbackMessage.STANDARD);
+ break;
+ case PLAY:
+ action.handleFeedback(FeedbackMessage.EVENT);
+
+ // Wenn Cart in Warning Zeitbereich und vomn Pause zu Play wechselt
+ try {
+ if (pad.getContent() instanceof Durationable) {
+ Durationable durationable = (Durationable) pad.getContent();
+ PadSettings padSettings = pad.getPadSettings();
+
+ if (!padSettings.isLoop()) {
+ Duration warning = padSettings.getWarning();
+ Duration rest = durationable.getDuration().subtract(durationable.getPosition());
+ double seconds = rest.toSeconds();
+
+ if (warning.toSeconds() > seconds) {
+ action.handleFeedback(FeedbackMessage.WARNING);
+ }
+ }
+ }
+ } catch (Exception ignored) {
+ }
+ break;
+ case READY:
+ action.handleFeedback(FeedbackMessage.STANDARD);
+ break;
+ case STOP:
+ action.handleFeedback(FeedbackMessage.STANDARD);
+ break;
+ default:
+ break;
+
+ }
+ }
+ }
+ }
+}
diff --git a/PlayWall/src/de/tobias/playpad/action/actions/cart/handler/CartActionHandler.java b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/CartActionHandler.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/actions/cart/handler/CartActionHandler.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/CartActionHandler.java
diff --git a/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.scala b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.scala
new file mode 100644
index 0000000000000000000000000000000000000000..f6b6ba4dc65077bd1378bf75e472cf57ec5bc237
--- /dev/null
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/CartActionHandlerFactory.scala
@@ -0,0 +1,15 @@
+package de.tobias.playpad.action.actions.cart.handler
+
+import de.tobias.playpad.action.actions.cart.CartAction.CartActionMode
+
+object CartActionHandlerFactory {
+
+ def getInstance(cartActionMode: CartActionMode): CartActionHandler = {
+ cartActionMode match {
+ case CartActionMode.PLAY_STOP => new PlayStopHandler()
+ case CartActionMode.PLAY_PAUSE => new PlayPauseHandler()
+ case CartActionMode.PLAY_HOLD => new PlayHoldHandler()
+ case CartActionMode.PLAY_PLAY => new PlayPlayHandler()
+ }
+ }
+}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.scala b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.scala
new file mode 100644
index 0000000000000000000000000000000000000000..763b09b5e06901bcb20e06aa0e3ad7637df02f85
--- /dev/null
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/PlayHoldHandler.scala
@@ -0,0 +1,26 @@
+package de.tobias.playpad.action.actions.cart.handler
+
+import de.tobias.playpad.action.InputType
+import de.tobias.playpad.action.actions.cart.CartAction
+import de.tobias.playpad.pad.Pad
+import de.tobias.playpad.project.Project
+import de.tobias.playpad.viewcontroller.main.IMainViewController
+
+class PlayHoldHandler extends CartActionHandler {
+ override def performAction(`type`: InputType,
+ cartAction: CartAction,
+ pad: Pad,
+ project: Project,
+ mainViewController: IMainViewController) = {
+ if (`type` eq InputType.PRESSED) {
+ if (pad.isReady) { // Allow the listener to send the feedback
+ cartAction.getPadPositionListener.setSend(false)
+ pad.play()
+ }
+ } else if (`type` eq InputType.RELEASED) {
+ if (pad.isPlay) {
+ pad.stop()
+ }
+ }
+ }
+}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.scala b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.scala
new file mode 100644
index 0000000000000000000000000000000000000000..2e55c03c25a535277fd40b01ae036b2f3fb64c88
--- /dev/null
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/PlayPauseHandler.scala
@@ -0,0 +1,25 @@
+package de.tobias.playpad.action.actions.cart.handler
+
+import de.tobias.playpad.action.InputType
+import de.tobias.playpad.action.actions.cart.CartAction
+import de.tobias.playpad.pad.Pad
+import de.tobias.playpad.project.Project
+import de.tobias.playpad.viewcontroller.main.IMainViewController
+
+class PlayPauseHandler extends CartActionHandler {
+ override def performAction(`type`: InputType,
+ cartAction: CartAction,
+ pad: Pad,
+ project: Project,
+ mainViewController: IMainViewController) = {
+ if (`type` eq InputType.PRESSED) {
+ if (pad.isPlay) {
+ pad.pause()
+ }
+ else { // Allow the listener to send the feedback
+ cartAction.getPadPositionListener.setSend(false)
+ pad.play()
+ }
+ }
+ }
+}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.scala b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.scala
new file mode 100644
index 0000000000000000000000000000000000000000..16273d0d8ff38a0de51cfc6593b854141924dd8f
--- /dev/null
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/PlayPlayHandler.scala
@@ -0,0 +1,19 @@
+package de.tobias.playpad.action.actions.cart.handler
+
+import de.tobias.playpad.action.InputType
+import de.tobias.playpad.action.actions.cart.CartAction
+import de.tobias.playpad.pad.{Pad, PadStatus}
+import de.tobias.playpad.project.Project
+import de.tobias.playpad.viewcontroller.main.IMainViewController
+
+class PlayPlayHandler extends CartActionHandler {
+ override def performAction(`type`: InputType,
+ cartAction: CartAction,
+ pad: Pad,
+ project: Project,
+ mainViewController: IMainViewController) = {
+ if (`type` eq InputType.PRESSED) {
+ pad.setStatus(PadStatus.RESTART);
+ }
+ }
+}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.scala b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.scala
new file mode 100644
index 0000000000000000000000000000000000000000..3353c4526fc85c06d691f32ca608928714bec120
--- /dev/null
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/actions/cart/handler/PlayStopHandler.scala
@@ -0,0 +1,25 @@
+package de.tobias.playpad.action.actions.cart.handler
+
+import de.tobias.playpad.action.InputType
+import de.tobias.playpad.action.actions.cart.CartAction
+import de.tobias.playpad.pad.Pad
+import de.tobias.playpad.project.Project
+import de.tobias.playpad.viewcontroller.main.IMainViewController
+
+class PlayStopHandler extends CartActionHandler {
+
+ override def performAction(`type`: InputType,
+ cartAction: CartAction,
+ pad: Pad,
+ project: Project,
+ mainViewController: IMainViewController) = {
+ if (`type` eq InputType.PRESSED) {
+ if (pad.isPlay) {
+ pad.stop()
+ } else { // Allow the listener to send the feedback
+ cartAction.getPadPositionListener.setSend(false)
+ pad.play()
+ }
+ }
+ }
+}
diff --git a/PlayWall/src/de/tobias/playpad/action/factory/CartActionFactory.java b/PlayWall/src/main/java/de/tobias/playpad/action/factory/CartActionFactory.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/factory/CartActionFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/factory/CartActionFactory.java
diff --git a/PlayWall/src/de/tobias/playpad/action/factory/NavigateActionFactory.java b/PlayWall/src/main/java/de/tobias/playpad/action/factory/NavigateActionFactory.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/factory/NavigateActionFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/factory/NavigateActionFactory.java
diff --git a/PlayWall/src/de/tobias/playpad/action/factory/PageActionFactory.java b/PlayWall/src/main/java/de/tobias/playpad/action/factory/PageActionFactory.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/factory/PageActionFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/factory/PageActionFactory.java
diff --git a/PlayWall/src/de/tobias/playpad/action/factory/StopActionFactory.java b/PlayWall/src/main/java/de/tobias/playpad/action/factory/StopActionFactory.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/factory/StopActionFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/factory/StopActionFactory.java
diff --git a/PlayWall/src/de/tobias/playpad/action/mapper/KeyboardMapper.java b/PlayWall/src/main/java/de/tobias/playpad/action/mapper/KeyboardMapper.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/mapper/KeyboardMapper.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/mapper/KeyboardMapper.java
diff --git a/PlayWall/src/de/tobias/playpad/action/mapper/KeyboardMapperFactory.java b/PlayWall/src/main/java/de/tobias/playpad/action/mapper/KeyboardMapperFactory.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/mapper/KeyboardMapperFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/mapper/KeyboardMapperFactory.java
diff --git a/PlayWall/src/de/tobias/playpad/action/mapper/MidiMapper.java b/PlayWall/src/main/java/de/tobias/playpad/action/mapper/MidiMapper.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/action/mapper/MidiMapper.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/mapper/MidiMapper.java
index aae0bffbffb46c4102943948c479299fff4542f1..4bfab85891b01cd3e65a860fa4212657653c4913 100644
--- a/PlayWall/src/de/tobias/playpad/action/mapper/MidiMapper.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/mapper/MidiMapper.java
@@ -70,7 +70,7 @@ public class MidiMapper extends Mapper implements ColorAssociator, MapperFeedbac
public Feedback getFeedback() {
return feedback;
}
-
+
@Deprecated
public void setFeedback(Feedback feedback) {
this.feedback = feedback;
@@ -140,7 +140,7 @@ public class MidiMapper extends Mapper implements ColorAssociator, MapperFeedbac
}
return null;
}
-
+
@Override
public DisplayableFeedbackColor map(Color color) {
MidiDeviceImpl midiDeviceImpl = Midi.getInstance().getMidiDevice();
diff --git a/PlayWall/src/de/tobias/playpad/action/mapper/MidiMapperFactory.java b/PlayWall/src/main/java/de/tobias/playpad/action/mapper/MidiMapperFactory.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/mapper/MidiMapperFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/mapper/MidiMapperFactory.java
diff --git a/PlayWall/src/de/tobias/playpad/action/mapper/feedback/DoubleMidiFeedback.java b/PlayWall/src/main/java/de/tobias/playpad/action/mapper/feedback/DoubleMidiFeedback.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/action/mapper/feedback/DoubleMidiFeedback.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/mapper/feedback/DoubleMidiFeedback.java
index bc58bf381281fb5cecd7ca9e519183bf2590bf68..9e930fc25266650f6b1eb8c16c88325e1d07e188 100644
--- a/PlayWall/src/de/tobias/playpad/action/mapper/feedback/DoubleMidiFeedback.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/mapper/feedback/DoubleMidiFeedback.java
@@ -6,11 +6,9 @@ import org.dom4j.Element;
/**
* Implementierung eines 2 State Feedbacks für MIDI Geräte.
- *
+ *
* @author tobias
- *
* @since 5.0.0
- *
*/
public class DoubleMidiFeedback extends Feedback {
diff --git a/PlayWall/src/de/tobias/playpad/action/mapper/feedback/SingleMidiFeedback.java b/PlayWall/src/main/java/de/tobias/playpad/action/mapper/feedback/SingleMidiFeedback.java
similarity index 92%
rename from PlayWall/src/de/tobias/playpad/action/mapper/feedback/SingleMidiFeedback.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/mapper/feedback/SingleMidiFeedback.java
index 34d8f40062179fde88a879e0e5284a1d43d35f68..e637347b1c4dc5eabceaaf163237761e26c18eaa 100644
--- a/PlayWall/src/de/tobias/playpad/action/mapper/feedback/SingleMidiFeedback.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/mapper/feedback/SingleMidiFeedback.java
@@ -6,11 +6,9 @@ import org.dom4j.Element;
/**
* Implementierung eines 1 State Feedbacks für MIDI Geräte.
- *
+ *
* @author tobias
- *
* @since 5.0.0
- *
*/
public class SingleMidiFeedback extends Feedback {
@@ -37,14 +35,14 @@ public class SingleMidiFeedback extends Feedback {
@Override
public int getValueForFeedbackMessage(FeedbackMessage message) {
switch (message) {
- case EVENT:
- return feedbackValue;
- case OFF:
- return 0;
- case STANDARD:
- return feedbackValue;
- default:
- break;
+ case EVENT:
+ return feedbackValue;
+ case OFF:
+ return 0;
+ case STANDARD:
+ return feedbackValue;
+ default:
+ break;
}
return 0;
}
diff --git a/PlayWall/src/de/tobias/playpad/action/mapper/listener/KeyboardHandler.java b/PlayWall/src/main/java/de/tobias/playpad/action/mapper/listener/KeyboardHandler.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/action/mapper/listener/KeyboardHandler.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/mapper/listener/KeyboardHandler.java
diff --git a/PlayWall/src/de/tobias/playpad/action/mapper/listener/MidiHandler.java b/PlayWall/src/main/java/de/tobias/playpad/action/mapper/listener/MidiHandler.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/action/mapper/listener/MidiHandler.java
rename to PlayWall/src/main/java/de/tobias/playpad/action/mapper/listener/MidiHandler.java
index 0a7faff90ffd77544bbde06a4d67825f8aa5f374..7e4d42884c8020e4edd9d4a2c3ba19525eed624b 100644
--- a/PlayWall/src/de/tobias/playpad/action/mapper/listener/MidiHandler.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/action/mapper/listener/MidiHandler.java
@@ -16,9 +16,8 @@ import java.util.List;
/**
* Diese Klasse Verwaltet den MIDI Input und führt die Actions aus.
- *
- * @author tobias
*
+ * @author tobias
*/
public class MidiHandler implements MidiListener {
diff --git a/PlayWall/src/de/tobias/playpad/audio/ClipAudioHandler.java b/PlayWall/src/main/java/de/tobias/playpad/audio/ClipAudioHandler.java
similarity index 98%
rename from PlayWall/src/de/tobias/playpad/audio/ClipAudioHandler.java
rename to PlayWall/src/main/java/de/tobias/playpad/audio/ClipAudioHandler.java
index 7180c9988fdfae1ac1adb8b0d6e3362940986846..8cef7db06d22f6bef7ad796a5076d277e158ec89 100644
--- a/PlayWall/src/de/tobias/playpad/audio/ClipAudioHandler.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/audio/ClipAudioHandler.java
@@ -57,7 +57,7 @@ public class ClipAudioHandler extends AudioHandler {
}
}
- for (Iterator<ClipAudioHandler> iterator = playedHandlers.iterator(); iterator.hasNext();) {
+ for (Iterator<ClipAudioHandler> iterator = playedHandlers.iterator(); iterator.hasNext(); ) {
ClipAudioHandler handler = iterator.next();
Pad pad = handler.getContent().getPad();
@@ -160,9 +160,8 @@ public class ClipAudioHandler extends AudioHandler {
/**
* Lineaer to dB
- *
- * @param volume
- * [0, 1]
+ *
+ * @param volume [0, 1]
*/
@Override
public void setVolume(double volume) {
diff --git a/PlayWall/src/de/tobias/playpad/audio/ClipAudioHandlerFactory.java b/PlayWall/src/main/java/de/tobias/playpad/audio/ClipAudioHandlerFactory.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/audio/ClipAudioHandlerFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/audio/ClipAudioHandlerFactory.java
diff --git a/PlayWall/src/de/tobias/playpad/audio/JavaFXAudioHandler.java b/PlayWall/src/main/java/de/tobias/playpad/audio/JavaFXAudioHandler.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/audio/JavaFXAudioHandler.java
rename to PlayWall/src/main/java/de/tobias/playpad/audio/JavaFXAudioHandler.java
diff --git a/PlayWall/src/de/tobias/playpad/audio/JavaFXHandlerFactory.java b/PlayWall/src/main/java/de/tobias/playpad/audio/JavaFXHandlerFactory.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/audio/JavaFXHandlerFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/audio/JavaFXHandlerFactory.java
index 306a43733c8adfad24432305af94d085e345f7a1..e144bc3c2d475ee0d82bbb801a0122d527cf399a 100644
--- a/PlayWall/src/de/tobias/playpad/audio/JavaFXHandlerFactory.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/audio/JavaFXHandlerFactory.java
@@ -13,7 +13,7 @@ public class JavaFXHandlerFactory extends AudioHandlerFactory {
public AudioHandler createAudioHandler(PadContent content) {
return new JavaFXAudioHandler(content);
}
-
+
@Override
public boolean isFeatureAvailable(AudioCapability audioCapability) {
for (Class<?> clazz : JavaFXAudioHandler.class.getInterfaces()) {
@@ -22,7 +22,7 @@ public class JavaFXHandlerFactory extends AudioHandlerFactory {
}
return false;
}
-
+
@Override
public AudioHandlerViewController getAudioFeatureSettings(AudioCapability audioCapablility) {
return null;
diff --git a/PlayWall/src/de/tobias/playpad/audio/TinyAudioHandler.java b/PlayWall/src/main/java/de/tobias/playpad/audio/TinyAudioHandler.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/audio/TinyAudioHandler.java
rename to PlayWall/src/main/java/de/tobias/playpad/audio/TinyAudioHandler.java
index 5adcf3ef5d59cdcfa0287fc08d4a502121425057..3ddc7428d69667f277f826ea9f33705f19452fc5 100644
--- a/PlayWall/src/de/tobias/playpad/audio/TinyAudioHandler.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/audio/TinyAudioHandler.java
@@ -59,7 +59,7 @@ public class TinyAudioHandler extends AudioHandler implements Soundcardable, See
}
}
- for (Iterator<TinyAudioHandler> iterator = playedHandlers.iterator(); iterator.hasNext();) {
+ for (Iterator<TinyAudioHandler> iterator = playedHandlers.iterator(); iterator.hasNext(); ) {
TinyAudioHandler handler = iterator.next();
Pad pad = handler.getContent().getPad();
@@ -93,7 +93,8 @@ public class TinyAudioHandler extends AudioHandler implements Soundcardable, See
}
Thread.sleep(SLEEP_TIME_POSITION);
- } catch (InterruptedException | ConcurrentModificationException ignored) {} catch (Exception e) {
+ } catch (InterruptedException | ConcurrentModificationException ignored) {
+ } catch (Exception e) {
e.printStackTrace();
}
}
diff --git a/PlayWall/src/de/tobias/playpad/audio/TinyAudioHandlerFactory.java b/PlayWall/src/main/java/de/tobias/playpad/audio/TinyAudioHandlerFactory.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/audio/TinyAudioHandlerFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/audio/TinyAudioHandlerFactory.java
index 85237820a52cffddbdcffd7e75f05241fa207715..e0245a4e1ecfbce0a517cbe0aad179b2e9c9a26e 100644
--- a/PlayWall/src/de/tobias/playpad/audio/TinyAudioHandlerFactory.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/audio/TinyAudioHandlerFactory.java
@@ -33,7 +33,7 @@ public class TinyAudioHandlerFactory extends AudioHandlerFactory implements Auto
}
return false;
}
-
+
@Override
public AudioHandlerViewController getAudioFeatureSettings(AudioCapability audioCapablility) {
if (audioCapablility == AudioCapability.SOUNDCARD) {
diff --git a/PlayWall/src/de/tobias/playpad/design/modern/ModernCartDesignHandlerImpl.java b/PlayWall/src/main/java/de/tobias/playpad/design/modern/ModernCartDesignHandlerImpl.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/design/modern/ModernCartDesignHandlerImpl.java
rename to PlayWall/src/main/java/de/tobias/playpad/design/modern/ModernCartDesignHandlerImpl.java
diff --git a/PlayWall/src/de/tobias/playpad/design/modern/ModernDesignAnimator.java b/PlayWall/src/main/java/de/tobias/playpad/design/modern/ModernDesignAnimator.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/design/modern/ModernDesignAnimator.java
rename to PlayWall/src/main/java/de/tobias/playpad/design/modern/ModernDesignAnimator.java
index 9f9cc52670eb1b0f2a8fed70296879bf121ebcf4..da7ad9f5cc4a5b40bf3c8ec3e576dace9638553d 100644
--- a/PlayWall/src/de/tobias/playpad/design/modern/ModernDesignAnimator.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/design/modern/ModernDesignAnimator.java
@@ -19,7 +19,8 @@ import java.util.HashMap;
public class ModernDesignAnimator {
// alles nur static, neine objecte von der Klasse
- private ModernDesignAnimator() {}
+ private ModernDesignAnimator() {
+ }
private static HashMap<Integer, Timeline> timelines = new HashMap<>();
diff --git a/PlayWall/src/de/tobias/playpad/design/modern/ModernDesignHandlerImpl.java b/PlayWall/src/main/java/de/tobias/playpad/design/modern/ModernDesignHandlerImpl.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/design/modern/ModernDesignHandlerImpl.java
rename to PlayWall/src/main/java/de/tobias/playpad/design/modern/ModernDesignHandlerImpl.java
diff --git a/PlayWall/src/de/tobias/playpad/design/modern/ModernDesignSizeHelper.java b/PlayWall/src/main/java/de/tobias/playpad/design/modern/ModernDesignSizeHelper.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/design/modern/ModernDesignSizeHelper.java
rename to PlayWall/src/main/java/de/tobias/playpad/design/modern/ModernDesignSizeHelper.java
diff --git a/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesignHandlerImpl.java b/PlayWall/src/main/java/de/tobias/playpad/design/modern/ModernGlobalDesignHandlerImpl.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesignHandlerImpl.java
rename to PlayWall/src/main/java/de/tobias/playpad/design/modern/ModernGlobalDesignHandlerImpl.java
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopColorPickerView.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopColorPickerView.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/layout/desktop/DesktopColorPickerView.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopColorPickerView.java
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopEditMode.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopEditMode.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/layout/desktop/DesktopEditMode.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopEditMode.java
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMainLayoutFactory.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMainLayoutFactory.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMainLayoutFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMainLayoutFactory.java
index d00659dfad3778b3c8cfbc24cd991798d7ef8f1e..35efd1e7c59548761c5cd98faaaedf98eb940cbf 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMainLayoutFactory.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMainLayoutFactory.java
@@ -13,9 +13,8 @@ import java.util.Stack;
/**
* Desktop Implmentierung des Main Layouts.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.1.0
*/
public class DesktopMainLayoutFactory extends MainLayoutFactory {
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
index a771a5cfd50cdb3934b988c792e39ed4cbc2133f..c0d97f13bea93670ff0a85ee41039d494ab661d8 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
@@ -41,9 +41,9 @@ import de.tobias.playpad.viewcontroller.option.profile.ProfileSettingsViewContro
import de.tobias.playpad.viewcontroller.option.project.ProjectSettingsViewController;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.nui.NVCStage;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
-import de.tobias.utils.ui.scene.NotificationPane;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
+import de.tobias.utils.nui.scene.NotificationPane;
import de.tobias.utils.util.Localization;
import javafx.application.Platform;
import javafx.beans.binding.Bindings;
@@ -789,7 +789,7 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
MenuItem item = (MenuItem) event.getSource();
ProjectReference ref = (ProjectReference) item.getUserData();
- ProjectReader.ProjectReaderDelegate delegate = ProjectReaderDelegateImpl.getInstance(getWindow());
+ ProjectReader.ProjectReaderDelegate delegate = ProjectReaderDelegateImpl.getInstance(getContainingWindow());
try {
// Speichern das alte Project in mvc.setProject(Project)
ProjectLoader loader = new ProjectLoader(ref);
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPageEditButtonView.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopPageEditButtonView.java
similarity index 96%
rename from PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPageEditButtonView.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopPageEditButtonView.java
index f3bccc4b60cdb91d72994f3a24c16fe99039a65e..15652328e9d797be4a07bb335528fde07457a192 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPageEditButtonView.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/DesktopPageEditButtonView.java
@@ -7,8 +7,8 @@ import de.tobias.playpad.project.Project;
import de.tobias.playpad.project.page.Page;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import de.tobias.playpad.viewcontroller.main.MenuToolbarViewController;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import de.tobias.utils.util.Localization;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
@@ -128,7 +128,7 @@ public class DesktopPageEditButtonView extends HBox implements EventHandler<Acti
alert.setHeaderText(Localization.getString(Strings.UI_Dialog_Page_Delete_Header));
alert.setContentText(Localization.getString(Strings.UI_Dialog_Page_Delete_Content));
- alert.initOwner(controller.getStage());
+ alert.initOwner(controller.getContainingWindow());
alert.initModality(Modality.WINDOW_MODAL);
Stage stage = (Stage) alert.getDialogPane().getScene().getWindow();
PlayPadMain.stageIcon.ifPresent(stage.getIcons()::add);
@@ -151,7 +151,7 @@ public class DesktopPageEditButtonView extends HBox implements EventHandler<Acti
dialog.setHeaderText(Localization.getString(Strings.UI_Dialog_Page_Name_Header));
dialog.setContentText(Localization.getString(Strings.UI_Dialog_Page_Name_Content));
- dialog.initOwner(controller.getStage());
+ dialog.initOwner(controller.getContainingWindow());
dialog.initModality(Modality.WINDOW_MODAL);
Stage stage = (Stage) dialog.getDialogPane().getScene().getWindow();
PlayPadMain.stageIcon.ifPresent(stage.getIcons()::add);
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/listener/DesktopSearchController.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/DesktopSearchController.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/layout/desktop/listener/DesktopSearchController.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/DesktopSearchController.java
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/listener/PadRemoveMouseListener.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadRemoveMouseListener.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/layout/desktop/listener/PadRemoveMouseListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PadRemoveMouseListener.java
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/listener/PageButtonDragHandler.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PageButtonDragHandler.java
similarity index 98%
rename from PlayWall/src/de/tobias/playpad/layout/desktop/listener/PageButtonDragHandler.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PageButtonDragHandler.java
index 565b646a162717b511911c1a81c323d207c8aaa4..2cec7a4eed1deab214a30558935ad8ed6a1d94b4 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/listener/PageButtonDragHandler.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/listener/PageButtonDragHandler.java
@@ -6,9 +6,8 @@ import javafx.scene.input.DragEvent;
/**
* Drag and Drop eines Pads auf ein Page Button (umschalten auf neue Page), wird im DesktopMenuToolbarController verwaltet.
- *
+ *
* @author tobias
- *
* @since 5.1.0
*/
public class PageButtonDragHandler implements EventHandler<DragEvent> {
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/pad/DesktopPadDragListener.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadDragListener.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/layout/desktop/pad/DesktopPadDragListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadDragListener.java
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java
similarity index 98%
rename from PlayWall/src/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java
index dc69d4484d80d08771e2a716be6b6df719d3b867..fa8eb4de6ba404b3392a071e39a702a1c3a68d4c 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java
@@ -18,10 +18,10 @@ import de.tobias.playpad.project.page.PadIndex;
import de.tobias.playpad.registry.NoSuchComponentException;
import de.tobias.playpad.util.ColorUtils;
import de.tobias.playpad.view.EmptyPadView;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
-import de.tobias.utils.ui.scene.BusyView;
-import de.tobias.utils.ui.translation.PulseTranslation;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
+import de.tobias.utils.nui.scene.BusyView;
+import de.tobias.utils.nui.translation.PulseTranslation;
import javafx.beans.property.Property;
import javafx.css.PseudoClass;
import javafx.geometry.Pos;
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/pad/DesktopPadViewController.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadViewController.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/layout/desktop/pad/DesktopPadViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadViewController.java
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMainLayoutFactory.java b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMainLayoutFactory.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/layout/touch/TouchMainLayoutFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMainLayoutFactory.java
index a2b031f060ac32d115a42bb9d714e4dac8444aa5..28401fd554684fc8a4651098bf2eb05b40b92484 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMainLayoutFactory.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMainLayoutFactory.java
@@ -10,9 +10,8 @@ import java.util.Stack;
/**
* Touch Implementierung des Main Layout.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.1.0
*/
public class TouchMainLayoutFactory extends MainLayoutFactory {
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
similarity index 89%
rename from PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
index bd20bb5b7e878247bbcaf2e7fa9d9017b6ff5dab..2d06d2dc6266d01f7987e86fdb815cf3a83400eb 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
@@ -11,7 +11,7 @@ import de.tobias.playpad.view.main.MainLayoutFactory;
import de.tobias.playpad.view.main.MenuType;
import de.tobias.playpad.viewcontroller.main.BasicMenuToolbarViewController;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontIcon;
import de.tobias.utils.util.Localization;
import javafx.beans.binding.Bindings;
import javafx.beans.binding.StringBinding;
@@ -25,9 +25,11 @@ import javafx.scene.control.Slider;
public class TouchMenuToolbarViewController extends BasicMenuToolbarViewController {
- @FXML protected Button closeButton;
+ @FXML
+ protected Button closeButton;
- @FXML protected Label liveLabel;
+ @FXML
+ protected Label liveLabel;
private IMainViewController mainViewController;
@@ -82,16 +84,20 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
}
@Override
- public void loadKeybinding(KeyCollection keys) {}
+ public void loadKeybinding(KeyCollection keys) {
+ }
@Override
- public void setLocked(boolean looked) {}
+ public void setLocked(boolean looked) {
+ }
@Override
- public void setAlwaysOnTopActive(boolean alwaysOnTopActive) {}
+ public void setAlwaysOnTopActive(boolean alwaysOnTopActive) {
+ }
@Override
- public void setFullScreenActive(boolean fullScreenActive) {}
+ public void setFullScreenActive(boolean fullScreenActive) {
+ }
@Override
public void addToolbarItem(Node node) {
@@ -104,13 +110,16 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
}
@Override
- public void addMenuItem(MenuItem item, MenuType type) {}
+ public void addMenuItem(MenuItem item, MenuType type) {
+ }
@Override
- public void removeMenuItem(MenuItem item) {}
+ public void removeMenuItem(MenuItem item) {
+ }
@Override
- public void deinit() {}
+ public void deinit() {
+ }
private int currentPage = 0;
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/pad/TouchPadView.java b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/pad/TouchPadView.java
similarity index 92%
rename from PlayWall/src/de/tobias/playpad/layout/touch/pad/TouchPadView.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/touch/pad/TouchPadView.java
index 217bcc94abbbbc3c777950960f251566c132a760..622cc3ce5b8f6a8e00ccf17ba49e9b72fccfb6a7 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/pad/TouchPadView.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/pad/TouchPadView.java
@@ -14,9 +14,9 @@ import de.tobias.playpad.project.page.PadIndex;
import de.tobias.playpad.registry.NoSuchComponentException;
import de.tobias.playpad.util.ColorUtils;
import de.tobias.playpad.view.EmptyPadView;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
-import de.tobias.utils.ui.scene.BusyView;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
+import de.tobias.utils.nui.scene.BusyView;
import de.tobias.utils.util.OS;
import de.tobias.utils.util.win.User32X;
import javafx.beans.property.Property;
@@ -256,26 +256,26 @@ public class TouchPadView implements IPadView {
@Override
public void removeStyleClasses() {
- superRoot.getStyleClass().removeIf( c -> c.startsWith("pad"));
+ superRoot.getStyleClass().removeIf(c -> c.startsWith("pad"));
- indexLabel.getStyleClass().removeIf( c -> c.startsWith("pad"));
- timeLabel.getStyleClass().removeIf( c -> c.startsWith("pad"));
- loopLabel.getGraphic().getStyleClass().removeIf( c -> c.startsWith("pad"));
- triggerLabel.getGraphic().getStyleClass().removeIf( c -> c.startsWith("pad"));
- errorLabel.getGraphic().getStyleClass().removeIf( c -> c.startsWith("pad"));
+ indexLabel.getStyleClass().removeIf(c -> c.startsWith("pad"));
+ timeLabel.getStyleClass().removeIf(c -> c.startsWith("pad"));
+ loopLabel.getGraphic().getStyleClass().removeIf(c -> c.startsWith("pad"));
+ triggerLabel.getGraphic().getStyleClass().removeIf(c -> c.startsWith("pad"));
+ errorLabel.getGraphic().getStyleClass().removeIf(c -> c.startsWith("pad"));
- preview.getChildren().forEach(i -> i.getStyleClass().removeIf( c -> c.startsWith("pad")));
+ preview.getChildren().forEach(i -> i.getStyleClass().removeIf(c -> c.startsWith("pad")));
- playBar.getStyleClass().removeIf( c -> c.startsWith("pad"));
+ playBar.getStyleClass().removeIf(c -> c.startsWith("pad"));
root.getStyleClass().remove("pad-root");
}
@Override
public void highlightView(int milliSecounds) {
-
+
}
-
+
void clearIndex() {
indexLabel.setText("");
}
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/pad/TouchPadViewController.java b/PlayWall/src/main/java/de/tobias/playpad/layout/touch/pad/TouchPadViewController.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/layout/touch/pad/TouchPadViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/layout/touch/pad/TouchPadViewController.java
diff --git a/PlayWall/src/de/tobias/playpad/log/export/PlayoutLogPdfExport.java b/PlayWall/src/main/java/de/tobias/playpad/log/export/PlayoutLogPdfExport.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/log/export/PlayoutLogPdfExport.java
rename to PlayWall/src/main/java/de/tobias/playpad/log/export/PlayoutLogPdfExport.java
diff --git a/PlayWall/src/de/tobias/playpad/midi/device/PD12.java b/PlayWall/src/main/java/de/tobias/playpad/midi/device/PD12.java
similarity index 94%
rename from PlayWall/src/de/tobias/playpad/midi/device/PD12.java
rename to PlayWall/src/main/java/de/tobias/playpad/midi/device/PD12.java
index ad6048db3c1f5038b3efdda40647fe93561f74e9..49030266197b192b96df209a6faafdbdfda83264 100644
--- a/PlayWall/src/de/tobias/playpad/midi/device/PD12.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/midi/device/PD12.java
@@ -40,13 +40,16 @@ public class PD12 extends MidiDeviceImpl {
}
@Override
- public void handleFeedback(FeedbackMessage type, int key, Feedback feedback) {}
+ public void handleFeedback(FeedbackMessage type, int key, Feedback feedback) {
+ }
@Override
- public void initDevice() {}
+ public void initDevice() {
+ }
@Override
- public void clearFeedback() {}
+ public void clearFeedback() {
+ }
@Override
public DisplayableFeedbackColor getColor(int id) {
diff --git a/PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java b/PlayWall/src/main/java/de/tobias/playpad/pad/content/AudioContent.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java
rename to PlayWall/src/main/java/de/tobias/playpad/pad/content/AudioContent.java
diff --git a/PlayWall/src/de/tobias/playpad/pad/content/AudioPadContentFactory.java b/PlayWall/src/main/java/de/tobias/playpad/pad/content/AudioPadContentFactory.java
similarity index 96%
rename from PlayWall/src/de/tobias/playpad/pad/content/AudioPadContentFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/pad/content/AudioPadContentFactory.java
index 63361f8cb6e4069ffea19c0fc77d6004c0f30876..c4720f3bf7b6af1ccdd9b132b39df386934056a1 100644
--- a/PlayWall/src/de/tobias/playpad/pad/content/AudioPadContentFactory.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/pad/content/AudioPadContentFactory.java
@@ -14,7 +14,7 @@ import javafx.scene.text.TextAlignment;
public class AudioPadContentFactory extends PadContentFactory {
- public static final String[] FILE_EXTENSION = { "*.mp3", "*.wav" };
+ public static final String[] FILE_EXTENSION = {"*.mp3", "*.wav"};
public AudioPadContentFactory(String type) {
super(type);
diff --git a/PlayWall/src/de/tobias/playpad/pad/drag/DuplicateDragMode.java b/PlayWall/src/main/java/de/tobias/playpad/pad/drag/DuplicateDragMode.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/pad/drag/DuplicateDragMode.java
rename to PlayWall/src/main/java/de/tobias/playpad/pad/drag/DuplicateDragMode.java
diff --git a/PlayWall/src/de/tobias/playpad/pad/drag/MoveDragMode.java b/PlayWall/src/main/java/de/tobias/playpad/pad/drag/MoveDragMode.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/pad/drag/MoveDragMode.java
rename to PlayWall/src/main/java/de/tobias/playpad/pad/drag/MoveDragMode.java
diff --git a/PlayWall/src/de/tobias/playpad/pad/drag/ReplaceDragMode.java b/PlayWall/src/main/java/de/tobias/playpad/pad/drag/ReplaceDragMode.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/pad/drag/ReplaceDragMode.java
rename to PlayWall/src/main/java/de/tobias/playpad/pad/drag/ReplaceDragMode.java
diff --git a/PlayWall/src/de/tobias/playpad/pad/listener/PadContentListener.java b/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadContentListener.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/pad/listener/PadContentListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadContentListener.java
diff --git a/PlayWall/src/de/tobias/playpad/pad/listener/PadDurationListener.java b/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadDurationListener.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/pad/listener/PadDurationListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadDurationListener.java
diff --git a/PlayWall/src/de/tobias/playpad/pad/listener/PadLockedListener.java b/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadLockedListener.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/pad/listener/PadLockedListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadLockedListener.java
diff --git a/PlayWall/src/de/tobias/playpad/pad/listener/PadPositionListener.java b/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadPositionListener.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/pad/listener/PadPositionListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadPositionListener.java
diff --git a/PlayWall/src/de/tobias/playpad/pad/listener/PadStatusListener.java b/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadStatusListener.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/pad/listener/PadStatusListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadStatusListener.java
diff --git a/PlayWall/src/de/tobias/playpad/project/ProjectJsonReader.java b/PlayWall/src/main/java/de/tobias/playpad/project/ProjectJsonReader.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/project/ProjectJsonReader.java
rename to PlayWall/src/main/java/de/tobias/playpad/project/ProjectJsonReader.java
diff --git a/PlayWall/src/de/tobias/playpad/project/ProjectJsonWriter.java b/PlayWall/src/main/java/de/tobias/playpad/project/ProjectJsonWriter.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/project/ProjectJsonWriter.java
rename to PlayWall/src/main/java/de/tobias/playpad/project/ProjectJsonWriter.java
diff --git a/PlayWall/src/de/tobias/playpad/server/ServerHandlerImpl.java b/PlayWall/src/main/java/de/tobias/playpad/server/ServerHandlerImpl.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/server/ServerHandlerImpl.java
rename to PlayWall/src/main/java/de/tobias/playpad/server/ServerHandlerImpl.java
diff --git a/PlayWall/src/de/tobias/playpad/server/ServerImpl.java b/PlayWall/src/main/java/de/tobias/playpad/server/ServerImpl.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/server/ServerImpl.java
rename to PlayWall/src/main/java/de/tobias/playpad/server/ServerImpl.java
diff --git a/PlayWall/src/de/tobias/playpad/server/ServerSyncListener.java b/PlayWall/src/main/java/de/tobias/playpad/server/ServerSyncListener.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/server/ServerSyncListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/server/ServerSyncListener.java
diff --git a/PlayWall/src/de/tobias/playpad/server/Session.java b/PlayWall/src/main/java/de/tobias/playpad/server/Session.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/server/Session.java
rename to PlayWall/src/main/java/de/tobias/playpad/server/Session.java
diff --git a/PlayWall/src/de/tobias/playpad/server/SessionDelegate.java b/PlayWall/src/main/java/de/tobias/playpad/server/SessionDelegate.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/server/SessionDelegate.java
rename to PlayWall/src/main/java/de/tobias/playpad/server/SessionDelegate.java
diff --git a/PlayWall/src/de/tobias/playpad/server/sync/command/CommandExecutorHandlerImpl.java b/PlayWall/src/main/java/de/tobias/playpad/server/sync/command/CommandExecutorHandlerImpl.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/server/sync/command/CommandExecutorHandlerImpl.java
rename to PlayWall/src/main/java/de/tobias/playpad/server/sync/command/CommandExecutorHandlerImpl.java
diff --git a/PlayWall/src/de/tobias/playpad/server/sync/command/CommandExecutorImpl.java b/PlayWall/src/main/java/de/tobias/playpad/server/sync/command/CommandExecutorImpl.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/server/sync/command/CommandExecutorImpl.java
rename to PlayWall/src/main/java/de/tobias/playpad/server/sync/command/CommandExecutorImpl.java
diff --git a/PlayWall/src/de/tobias/playpad/server/sync/conflict/ConflictSolverImpl.java b/PlayWall/src/main/java/de/tobias/playpad/server/sync/conflict/ConflictSolverImpl.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/server/sync/conflict/ConflictSolverImpl.java
rename to PlayWall/src/main/java/de/tobias/playpad/server/sync/conflict/ConflictSolverImpl.java
diff --git a/PlayWall/src/de/tobias/playpad/server/sync/conflict/RollbackStrategy.java b/PlayWall/src/main/java/de/tobias/playpad/server/sync/conflict/RollbackStrategy.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/server/sync/conflict/RollbackStrategy.java
rename to PlayWall/src/main/java/de/tobias/playpad/server/sync/conflict/RollbackStrategy.java
diff --git a/PlayWall/src/de/tobias/playpad/server/sync/conflict/UpgradeStrategy.java b/PlayWall/src/main/java/de/tobias/playpad/server/sync/conflict/UpgradeStrategy.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/server/sync/conflict/UpgradeStrategy.java
rename to PlayWall/src/main/java/de/tobias/playpad/server/sync/conflict/UpgradeStrategy.java
diff --git a/PlayWall/src/de/tobias/playpad/trigger/CartTriggerItem.java b/PlayWall/src/main/java/de/tobias/playpad/trigger/CartTriggerItem.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/trigger/CartTriggerItem.java
rename to PlayWall/src/main/java/de/tobias/playpad/trigger/CartTriggerItem.java
diff --git a/PlayWall/src/de/tobias/playpad/trigger/CartTriggerItemFactory.java b/PlayWall/src/main/java/de/tobias/playpad/trigger/CartTriggerItemFactory.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/trigger/CartTriggerItemFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/trigger/CartTriggerItemFactory.java
diff --git a/PlayWall/src/de/tobias/playpad/trigger/TriggerDisplayable.java b/PlayWall/src/main/java/de/tobias/playpad/trigger/TriggerDisplayable.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/trigger/TriggerDisplayable.java
rename to PlayWall/src/main/java/de/tobias/playpad/trigger/TriggerDisplayable.java
diff --git a/PlayWall/src/de/tobias/playpad/trigger/VolumeTriggerItem.java b/PlayWall/src/main/java/de/tobias/playpad/trigger/VolumeTriggerItem.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/trigger/VolumeTriggerItem.java
rename to PlayWall/src/main/java/de/tobias/playpad/trigger/VolumeTriggerItem.java
diff --git a/PlayWall/src/de/tobias/playpad/trigger/VolumeTriggerItemFactory.java b/PlayWall/src/main/java/de/tobias/playpad/trigger/VolumeTriggerItemFactory.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/trigger/VolumeTriggerItemFactory.java
rename to PlayWall/src/main/java/de/tobias/playpad/trigger/VolumeTriggerItemFactory.java
diff --git a/PlayWall/src/de/tobias/playpad/update/PlayPadUpdater.java b/PlayWall/src/main/java/de/tobias/playpad/update/PlayPadUpdater.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/update/PlayPadUpdater.java
rename to PlayWall/src/main/java/de/tobias/playpad/update/PlayPadUpdater.java
diff --git a/PlayWall/src/de/tobias/playpad/update/Updates.java b/PlayWall/src/main/java/de/tobias/playpad/update/Updates.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/update/Updates.java
rename to PlayWall/src/main/java/de/tobias/playpad/update/Updates.java
diff --git a/PlayWall/src/de/tobias/playpad/util/ColorUtils.java b/PlayWall/src/main/java/de/tobias/playpad/util/ColorUtils.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/util/ColorUtils.java
rename to PlayWall/src/main/java/de/tobias/playpad/util/ColorUtils.java
diff --git a/PlayWall/src/de/tobias/playpad/util/UUIDSerializer.java b/PlayWall/src/main/java/de/tobias/playpad/util/UUIDSerializer.java
similarity index 82%
rename from PlayWall/src/de/tobias/playpad/util/UUIDSerializer.java
rename to PlayWall/src/main/java/de/tobias/playpad/util/UUIDSerializer.java
index d8ace8ff2227dd1c4812244da789d89774f4b2c4..bffb88bbf67cf1c82ab25cc163022a5fb4711f19 100644
--- a/PlayWall/src/de/tobias/playpad/util/UUIDSerializer.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/util/UUIDSerializer.java
@@ -19,7 +19,7 @@ public class UUIDSerializer implements UserDefaults.Serializer<UUID> {
}
@Override
- public Element set(Object o, Element element) {
- return element.addText(o.toString());
+ public void set(Object o, Element element) {
+ element.addText(o.toString());
}
}
diff --git a/PlayWall/src/de/tobias/playpad/view/ColorPickerView.java b/PlayWall/src/main/java/de/tobias/playpad/view/ColorPickerView.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/view/ColorPickerView.java
rename to PlayWall/src/main/java/de/tobias/playpad/view/ColorPickerView.java
index e80e737b0a5d4cfac3d87071f54c0fac1b66ccd4..b71d1e661e8553516d51c054c9ab465e58a2fbb1 100644
--- a/PlayWall/src/de/tobias/playpad/view/ColorPickerView.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/view/ColorPickerView.java
@@ -10,7 +10,7 @@ import java.util.function.Consumer;
public class ColorPickerView extends GridPane {
private Rectangle currentSelected;
-
+
public ColorPickerView(DisplayableColor startColor, DisplayableColor[] colors, Consumer<DisplayableColor> finish) {
double size = Math.sqrt(colors.length);
int iSize = (int) size;
diff --git a/PlayWall/src/de/tobias/playpad/view/EmptyPadView.java b/PlayWall/src/main/java/de/tobias/playpad/view/EmptyPadView.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/view/EmptyPadView.java
rename to PlayWall/src/main/java/de/tobias/playpad/view/EmptyPadView.java
diff --git a/PlayWall/src/de/tobias/playpad/view/FileDragOptionView.java b/PlayWall/src/main/java/de/tobias/playpad/view/FileDragOptionView.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/view/FileDragOptionView.java
rename to PlayWall/src/main/java/de/tobias/playpad/view/FileDragOptionView.java
diff --git a/PlayWall/src/de/tobias/playpad/view/MapperOverviewViewController.java b/PlayWall/src/main/java/de/tobias/playpad/view/MapperOverviewViewController.java
similarity index 98%
rename from PlayWall/src/de/tobias/playpad/view/MapperOverviewViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/view/MapperOverviewViewController.java
index 786e783410f226e0b45c9caf82ca51c348b1abca..679616f34b58711c9ff8cbd1876f326f35ac5d61 100644
--- a/PlayWall/src/de/tobias/playpad/view/MapperOverviewViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/view/MapperOverviewViewController.java
@@ -9,8 +9,8 @@ import de.tobias.playpad.action.mapper.MapperViewController;
import de.tobias.playpad.registry.NoSuchComponentException;
import de.tobias.playpad.registry.Registry;
import de.tobias.playpad.viewcontroller.BaseMapperOverviewViewController;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import javafx.scene.Parent;
import javafx.scene.control.Button;
import javafx.scene.control.ContentDisplay;
diff --git a/PlayWall/src/de/tobias/playpad/view/PadDragOptionView.java b/PlayWall/src/main/java/de/tobias/playpad/view/PadDragOptionView.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/view/PadDragOptionView.java
rename to PlayWall/src/main/java/de/tobias/playpad/view/PadDragOptionView.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/AuthViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/AuthViewController.java
similarity index 92%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/AuthViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/AuthViewController.java
index 7228a07b92ca771edfcb97122bf8ce92564f6f3c..b40d28c9150257eb6a59fc29a85580166a569615 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/AuthViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/AuthViewController.java
@@ -28,10 +28,14 @@ public class AuthViewController extends NVC {
boolean run(String username, String password) throws IOException;
}
- @FXML private TextField usernameTextField;
- @FXML private PasswordField passwordTextField;
- @FXML private Button loginButton;
- @FXML private Label infoLabel;
+ @FXML
+ private TextField usernameTextField;
+ @FXML
+ private PasswordField passwordTextField;
+ @FXML
+ private Button loginButton;
+ @FXML
+ private Label infoLabel;
private Session session;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/LaunchDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/LaunchDialog.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/LaunchDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/LaunchDialog.java
index 42dcb8cfc137239c2e63f8b42d5a5380354e9aa4..3843796cc36ab57e39439962a23ec159b3b0bba2 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/LaunchDialog.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/LaunchDialog.java
@@ -26,8 +26,8 @@ import de.tobias.utils.application.App;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.nui.NVC;
import de.tobias.utils.nui.NVCStage;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import de.tobias.utils.util.Localization;
import javafx.application.Platform;
import javafx.beans.value.ChangeListener;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/LoginViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/LoginViewController.java
similarity index 94%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/LoginViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/LoginViewController.java
index 74878c8a731c5371090691ba1140bd6a073dc421..5a2f90cd7f2262c024fd26c6d01bca11b753cbdf 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/LoginViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/LoginViewController.java
@@ -34,11 +34,15 @@ import static de.tobias.utils.util.Localization.getString;
*/
public class LoginViewController extends NVC implements SessionDelegate {
- @FXML private Label infoLabel;
- @FXML private ImageView imageView;
+ @FXML
+ private Label infoLabel;
+ @FXML
+ private ImageView imageView;
- @FXML private TextField usernameTextField;
- @FXML private PasswordField passwordTextField;
+ @FXML
+ private TextField usernameTextField;
+ @FXML
+ private PasswordField passwordTextField;
private Session session;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/actions/CartActionTypeViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/actions/CartActionTypeViewController.java
similarity index 97%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/actions/CartActionTypeViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/actions/CartActionTypeViewController.java
index 780b99ab022e10f495ec36a3e7fb7005dfb9ef93..674f26d0f0bece13dbafd1137de77e2997c798ae 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/actions/CartActionTypeViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/actions/CartActionTypeViewController.java
@@ -29,9 +29,12 @@ import java.util.List;
*/
public class CartActionTypeViewController extends NVC {
- @FXML private VBox buttonVbox;
- @FXML private GridPane gridPane;
- @FXML private VBox cartActionContainer;
+ @FXML
+ private VBox buttonVbox;
+ @FXML
+ private GridPane gridPane;
+ @FXML
+ private VBox cartActionContainer;
private Mapping mapping;
private IMappingTabViewController parentController;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/actions/CartActionViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/actions/CartActionViewController.java
similarity index 96%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/actions/CartActionViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/actions/CartActionViewController.java
index dee271e547897df241bb599de950dd0491f45790..87f1e2059e178448348b880a9ec8ff2e7715905e 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/actions/CartActionViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/actions/CartActionViewController.java
@@ -18,9 +18,11 @@ public class CartActionViewController extends NVC {
@FXML
private ComboBox<CartActionMode> controlMode;
- @FXML private CheckBox autoColorCheckbox;
+ @FXML
+ private CheckBox autoColorCheckbox;
- @FXML private VBox rootContainer;
+ @FXML
+ private VBox rootContainer;
private BaseMapperOverviewViewController baseMapperOverviewViewController;
private CartAction action;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/audio/TinySoundSettingsViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/audio/TinySoundSettingsViewController.java
similarity index 95%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/audio/TinySoundSettingsViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/audio/TinySoundSettingsViewController.java
index e186071c15b504210b429340d01594c0c14271b4..313639d2b4fdb8570d4aaa18fcea17160d3fce0c 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/audio/TinySoundSettingsViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/audio/TinySoundSettingsViewController.java
@@ -4,8 +4,8 @@ import de.tobias.playpad.PlayPadMain;
import de.tobias.playpad.audio.TinyAudioHandler;
import de.tobias.playpad.profile.Profile;
import de.tobias.playpad.viewcontroller.AudioHandlerViewController;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import de.tobias.utils.util.Worker;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
@@ -25,8 +25,10 @@ import java.util.stream.Collectors;
@Deprecated
public class TinySoundSettingsViewController extends AudioHandlerViewController implements Callback<ListView<Info>, ListCell<Info>> {
- @FXML private ComboBox<Info> soundCardComboBox;
- @FXML private Button testButton;
+ @FXML
+ private ComboBox<Info> soundCardComboBox;
+ @FXML
+ private Button testButton;
private boolean isChanged;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/DisplayableCell.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/DisplayableCell.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/cell/DisplayableCell.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/DisplayableCell.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/DisplayableTreeCell.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/DisplayableTreeCell.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/cell/DisplayableTreeCell.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/DisplayableTreeCell.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/EnumCell.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/EnumCell.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/cell/EnumCell.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/EnumCell.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/PageNameListCell.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/PageNameListCell.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/cell/PageNameListCell.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/PageNameListCell.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/PathMatchActionCell.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/PathMatchActionCell.java
similarity index 96%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/cell/PathMatchActionCell.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/PathMatchActionCell.java
index e1eb2d9caf9bd9dc000733f604731a7b3074cd3f..896613caa67d859381d9c0baa2a8711f078c7cd6 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/PathMatchActionCell.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/PathMatchActionCell.java
@@ -1,8 +1,8 @@
package de.tobias.playpad.viewcontroller.cell;
import de.tobias.playpad.viewcontroller.dialog.PathMatchDialog;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import javafx.event.EventHandler;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/ProjectCell.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/ProjectCell.java
similarity index 96%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/cell/ProjectCell.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/ProjectCell.java
index 8a36eef6b16901b5adcff4e180824c3e9298bca1..1d988e0b66392b253e260a09a98b9b3c53936999 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/ProjectCell.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/ProjectCell.java
@@ -6,8 +6,8 @@ import de.tobias.playpad.profile.ref.ProfileReference;
import de.tobias.playpad.project.ref.ProjectReference;
import de.tobias.playpad.server.ConnectionState;
import de.tobias.playpad.server.Server;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import javafx.geometry.Pos;
import javafx.scene.control.Label;
import javafx.scene.control.ListCell;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/UpdateCell.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/cell/UpdateCell.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/cell/UpdateCell.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java
similarity index 93%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java
index dfb02318c47613f42808e4f3fddaa85dfe52590c..c14acc778594587a25b37da608d3611f7281ddfd 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernCartDesignViewController.java
@@ -17,11 +17,15 @@ import java.util.function.Consumer;
public class ModernCartDesignViewController extends NVC {
- @FXML private Button backgroundColorButton;
- @FXML private Button playColorButton;
- @FXML private CheckBox warnAnimationCheckBox;
+ @FXML
+ private Button backgroundColorButton;
+ @FXML
+ private Button playColorButton;
+ @FXML
+ private CheckBox warnAnimationCheckBox;
- @FXML private Button resetButton;
+ @FXML
+ private Button resetButton;
private ModernCartDesign2 design;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/design/ModernGlobalDesignViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernGlobalDesignViewController.java
similarity index 92%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/design/ModernGlobalDesignViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernGlobalDesignViewController.java
index a273a091d827d2b4ce24e5fe90b03cb88428f9bc..d3031998c212456113bcc9e6200663f6cb733a36 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/design/ModernGlobalDesignViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernGlobalDesignViewController.java
@@ -19,15 +19,21 @@ import java.util.function.Consumer;
public class ModernGlobalDesignViewController extends NVC {
- @FXML private Button backgroundColorButton;
- @FXML private Button playColorButton;
+ @FXML
+ private Button backgroundColorButton;
+ @FXML
+ private Button playColorButton;
- @FXML private CheckBox warnAnimationCheckBox;
+ @FXML
+ private CheckBox warnAnimationCheckBox;
- @FXML private ComboBox<Integer> infoLabelFontSizeComboBox;
- @FXML private ComboBox<Integer> titleLabelFontSizeComboBox;
+ @FXML
+ private ComboBox<Integer> infoLabelFontSizeComboBox;
+ @FXML
+ private ComboBox<Integer> titleLabelFontSizeComboBox;
- @FXML private Button resetButton;
+ @FXML
+ private Button resetButton;
@FXML
private CheckBox flatDesignCheckbox;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/AboutDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/AboutDialog.java
similarity index 97%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/AboutDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/AboutDialog.java
index 4dcb24de23be60cda93062093d4f4d360e3b5b36..3d0057d7148d73139e6169a5f4c45171f6584eb4 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/AboutDialog.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/AboutDialog.java
@@ -10,8 +10,8 @@ import de.tobias.utils.application.ApplicationInfo;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.nui.NVC;
import de.tobias.utils.nui.NVCStage;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import de.tobias.utils.util.Localization;
import javafx.fxml.FXML;
import javafx.geometry.Insets;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/AutoUpdateDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/AutoUpdateDialog.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/AutoUpdateDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/AutoUpdateDialog.java
index 348a98b91f857838adb39eddfb164bb3c86644b4..8c47584072d59f8fd934de818632880b1409c1f0 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/AutoUpdateDialog.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/AutoUpdateDialog.java
@@ -30,7 +30,7 @@ public class AutoUpdateDialog extends AdvancedDialog {
setContent(Localization.getString(Strings.UI_Dialog_AutoUpdate_Content, builder.toString()));
setHeaderText(Localization.getString(Strings.UI_Dialog_AutoUpdate_Header));
setCheckboxText(Localization.getString(Strings.UI_Dialog_AutoUpdate_Checkbox));
-
+
setIcon(PlayPadMain.stageIcon);
ButtonType updateButton = new ButtonType(Localization.getString(Strings.UI_Dialog_AutoUpdate_Button_Update), ButtonData.APPLY);
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/ModernPluginViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/ModernPluginViewController.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/ModernPluginViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/ModernPluginViewController.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/PathMatchDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/PathMatchDialog.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/PathMatchDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/PathMatchDialog.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/PlayoutLogViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/PlayoutLogViewController.java
similarity index 98%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/PlayoutLogViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/PlayoutLogViewController.java
index a11e6812fda7ef304de52d8a980a49b17eb6a973..b840bf8a864438aa26b9d4b4581d047825c3d5dd 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/PlayoutLogViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/PlayoutLogViewController.java
@@ -14,8 +14,8 @@ import de.tobias.playpad.project.ProjectSettings;
import de.tobias.playpad.viewcontroller.main.MenuToolbarViewController;
import de.tobias.utils.nui.NVC;
import de.tobias.utils.nui.NVCStage;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import de.tobias.utils.util.Localization;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/PrintDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/PrintDialog.java
similarity index 96%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/PrintDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/PrintDialog.java
index 8a64936e1cd00d8f1fc2e144989d24da92663881..e4c3dad30b997b4900271e96846b4c4dd9632921 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/PrintDialog.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/PrintDialog.java
@@ -29,10 +29,14 @@ import javafx.stage.Window;
public class PrintDialog extends NVC {
- @FXML private WebView webView;
- @FXML private ComboBox<Integer> pageComboBox;
- @FXML private Button printButton;
- @FXML private Button cancelButton;
+ @FXML
+ private WebView webView;
+ @FXML
+ private ComboBox<Integer> pageComboBox;
+ @FXML
+ private Button printButton;
+ @FXML
+ private Button cancelButton;
private Project project;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/ProfileViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/ProfileViewController.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/ProfileViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/ProfileViewController.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/SaveDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/SaveDialog.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/SaveDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/SaveDialog.java
index 1248e78cfc0780780cc22a64f73c97bdfb1260e5..6a1e06da7a392c7bdfa4cbc21f0e790845371bc0 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/SaveDialog.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/SaveDialog.java
@@ -12,7 +12,7 @@ public class SaveDialog extends AdvancedDialog {
public SaveDialog(Window owner) {
super(owner);
-
+
setTitle(Localization.getString(Strings.UI_Dialog_Save_Title));
setContent(Localization.getString(Strings.UI_Dialog_Save_Content));
setHeaderText(Localization.getString(Strings.UI_Dialog_Save_Header));
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/UpdaterDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/UpdaterDialog.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/UpdaterDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/UpdaterDialog.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/profile/NewProfileDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/profile/NewProfileDialog.java
similarity index 96%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/profile/NewProfileDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/profile/NewProfileDialog.java
index 8eeae96550f2c39439397fa54056e084e11457c3..d1fb004483d0d8e7edd12c368a1f91d911ec4804 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/profile/NewProfileDialog.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/profile/NewProfileDialog.java
@@ -23,9 +23,12 @@ import java.util.Optional;
public class NewProfileDialog extends NVC {
- @FXML private TextField nameTextField;
- @FXML private Button finishButton;
- @FXML private Button cancelButton;
+ @FXML
+ private TextField nameTextField;
+ @FXML
+ private Button finishButton;
+ @FXML
+ private Button cancelButton;
private Profile profile;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/profile/ProfileChooseDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/profile/ProfileChooseDialog.java
similarity index 94%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/profile/ProfileChooseDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/profile/ProfileChooseDialog.java
index 55cfd30c6657401de75b9097994040e3344ae3a3..cc22200080317af5d0e62ad16c397184099b45b1 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/profile/ProfileChooseDialog.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/profile/ProfileChooseDialog.java
@@ -25,11 +25,15 @@ import java.util.Optional;
public class ProfileChooseDialog extends NVC {
- @FXML private ComboBox<ProfileReference> profileComboBox;
- @FXML private Button newProfileButton;
+ @FXML
+ private ComboBox<ProfileReference> profileComboBox;
+ @FXML
+ private Button newProfileButton;
- @FXML private Button finishButton;
- @FXML private Button cancelButton;
+ @FXML
+ private Button finishButton;
+ @FXML
+ private Button cancelButton;
private Profile profile;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/profile/ProfileDuplicateDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/profile/ProfileDuplicateDialog.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/profile/ProfileDuplicateDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/profile/ProfileDuplicateDialog.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectDeleteDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectDeleteDialog.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectDeleteDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectDeleteDialog.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectDuplicateDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectDuplicateDialog.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectDuplicateDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectDuplicateDialog.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectExportDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectExportDialog.java
similarity index 95%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectExportDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectExportDialog.java
index e1089df12b2a07d6b65ef143884e521171acabcd..7189b08c688f238f7f9405ca731dc47f0f130d22 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectExportDialog.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectExportDialog.java
@@ -11,9 +11,9 @@ import de.tobias.playpad.project.ProjectReader;
import de.tobias.playpad.project.export.ProjectExporter;
import de.tobias.playpad.project.export.ProjectExporterDelegate;
import de.tobias.playpad.project.ref.ProjectReference;
-import de.tobias.utils.nui.BusyView;
import de.tobias.utils.nui.NVC;
import de.tobias.utils.nui.NVCStage;
+import de.tobias.utils.nui.scene.BusyView;
import de.tobias.utils.util.Localization;
import de.tobias.utils.util.Worker;
import javafx.application.Platform;
@@ -35,11 +35,15 @@ import java.nio.file.Path;
public class ProjectExportDialog extends NVC implements ProjectExporterDelegate {
- @FXML private CheckBox profileCheckBox;
- @FXML private CheckBox mediaCheckBox;
+ @FXML
+ private CheckBox profileCheckBox;
+ @FXML
+ private CheckBox mediaCheckBox;
- @FXML private Button cancelButton;
- @FXML private Button saveButton;
+ @FXML
+ private Button cancelButton;
+ @FXML
+ private Button saveButton;
private BusyView busyView;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectImportDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectImportDialog.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectImportDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectImportDialog.java
index a48f792f36f29cabbc8edb0e743516b570f7f811..15eb6038d9670a93becc44c62c5faf6d1bff8706 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectImportDialog.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectImportDialog.java
@@ -14,9 +14,9 @@ import de.tobias.playpad.project.importer.ProjectImporter;
import de.tobias.playpad.project.importer.ProjectImporterDelegate;
import de.tobias.playpad.project.ref.ProjectReference;
import de.tobias.playpad.project.ref.ProjectReferenceManager;
-import de.tobias.utils.nui.BusyView;
import de.tobias.utils.nui.NVC;
import de.tobias.utils.nui.NVCStage;
+import de.tobias.utils.nui.scene.BusyView;
import de.tobias.utils.util.Localization;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectLoadDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectLoadDialog.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectLoadDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectLoadDialog.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectManagerDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectManagerDialog.java
similarity index 94%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectManagerDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectManagerDialog.java
index 907980aa0b279636a7a326c8e8e1e2ebf62e0e58..c3028d7aa7163c73e5ced9da12b2c2f80472e792 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectManagerDialog.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectManagerDialog.java
@@ -37,21 +37,32 @@ import java.util.Optional;
*/
public class ProjectManagerDialog extends NVC {
- @FXML private ListView<ProjectReference> projectList;
+ @FXML
+ private ListView<ProjectReference> projectList;
- @FXML private ComboBox<ProfileReference> profileCombobox;
- @FXML private TextField nameTextfield;
+ @FXML
+ private ComboBox<ProfileReference> profileCombobox;
+ @FXML
+ private TextField nameTextfield;
- @FXML private CheckBox syncCheckbox;
- @FXML private Button syncSettingsButton;
+ @FXML
+ private CheckBox syncCheckbox;
+ @FXML
+ private Button syncSettingsButton;
- @FXML private Button projectExportButton;
- @FXML private Button projectImportButton;
- @FXML private Button projectDuplicateButton;
- @FXML private Button projectDeleteButton;
+ @FXML
+ private Button projectExportButton;
+ @FXML
+ private Button projectImportButton;
+ @FXML
+ private Button projectDuplicateButton;
+ @FXML
+ private Button projectDeleteButton;
- @FXML private Button cancelButton;
- @FXML private Button openButton;
+ @FXML
+ private Button cancelButton;
+ @FXML
+ private Button openButton;
public ProjectManagerDialog(Window owner, Project currentProject) {
load("de/tobias/playpad/assets/dialog/project", "projectManagementDialog.fxml", PlayPadMain.getUiResourceBundle());
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectNewDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectNewDialog.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectNewDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectNewDialog.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectReaderDelegateImpl.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectReaderDelegateImpl.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/dialog/project/ProjectReaderDelegateImpl.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/dialog/project/ProjectReaderDelegateImpl.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/BasicMenuToolbarViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/BasicMenuToolbarViewController.java
similarity index 84%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/main/BasicMenuToolbarViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/BasicMenuToolbarViewController.java
index 1f54b8ad2dafd3535bc9f2a0cb9956276fd726f9..88b3276c6098b468f4090d3a74f955b187ccedd6 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/BasicMenuToolbarViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/BasicMenuToolbarViewController.java
@@ -5,8 +5,8 @@ import de.tobias.playpad.PlayPadPlugin;
import de.tobias.playpad.project.Project;
import de.tobias.playpad.settings.GlobalSettings;
import de.tobias.playpad.settings.keys.Key;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
@@ -22,17 +22,26 @@ import java.util.ResourceBundle;
public abstract class BasicMenuToolbarViewController extends MenuToolbarViewController implements EventHandler<ActionEvent> {
// Menu
- @FXML protected Label volumeUpLabel;
- @FXML protected HBox iconHbox;
-
- @FXML protected HBox pageHBox;
- @FXML protected HBox toolbarHBox;
- @FXML protected Menu recentOpenMenu;
- @FXML protected Slider volumeSlider;
- @FXML protected Label volumeDownLabel;
-
- @FXML private HBox notFoundContainer;
- @FXML private Label notFoundLabel;
+ @FXML
+ protected Label volumeUpLabel;
+ @FXML
+ protected HBox iconHbox;
+
+ @FXML
+ protected HBox pageHBox;
+ @FXML
+ protected HBox toolbarHBox;
+ @FXML
+ protected Menu recentOpenMenu;
+ @FXML
+ protected Slider volumeSlider;
+ @FXML
+ protected Label volumeDownLabel;
+
+ @FXML
+ private HBox notFoundContainer;
+ @FXML
+ private Label notFoundLabel;
protected Project openProject; // REFERENCE zu MainViewController
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java
similarity index 99%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java
index ef9f606ad53840ccfcb62dc17190e4df4284918a..d4f35ffcf2eca084674d0cc9b4f9d502d98699a6 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java
@@ -33,8 +33,8 @@ import de.tobias.playpad.viewcontroller.main.listener.LockedListener;
import de.tobias.playpad.viewcontroller.main.listener.VolumeChangeListener;
import de.tobias.utils.nui.NVC;
import de.tobias.utils.nui.NVCStage;
-import de.tobias.utils.ui.NotificationHandler;
-import de.tobias.utils.ui.scene.NotificationPane;
+import de.tobias.utils.nui.NotificationHandler;
+import de.tobias.utils.nui.scene.NotificationPane;
import de.tobias.utils.util.Localization;
import de.tobias.utils.util.OS;
import de.tobias.utils.util.OS.OSType;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/listener/LayoutChangedListener.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/listener/LayoutChangedListener.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/main/listener/LayoutChangedListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/listener/LayoutChangedListener.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/listener/LockedListener.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/listener/LockedListener.java
similarity index 92%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/main/listener/LockedListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/listener/LockedListener.java
index 2e25bd8afcf96a5f1a0e1de7d3daf2ee0becceb0..86d3cb26d23dc2ce97fe78acb27f31dce5487710 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/listener/LockedListener.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/listener/LockedListener.java
@@ -2,8 +2,8 @@ package de.tobias.playpad.viewcontroller.main.listener;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import de.tobias.playpad.viewcontroller.main.MenuToolbarViewController;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.scene.control.Label;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/listener/VolumeChangeListener.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/listener/VolumeChangeListener.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/main/listener/VolumeChangeListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/listener/VolumeChangeListener.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/mapper/KeyboardMapperInputDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/mapper/KeyboardMapperInputDialog.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/mapper/KeyboardMapperInputDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/mapper/KeyboardMapperInputDialog.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/mapper/KeyboardMapperViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/mapper/KeyboardMapperViewController.java
similarity index 93%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/mapper/KeyboardMapperViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/mapper/KeyboardMapperViewController.java
index 611dbe9ffc345c7657584c4f3070663a569109be..8df6a9f3431bcb3e7cdca67c817a9adf766bebb1 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/mapper/KeyboardMapperViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/mapper/KeyboardMapperViewController.java
@@ -14,8 +14,10 @@ import javafx.scene.control.Label;
public class KeyboardMapperViewController extends MapperViewController {
- @FXML private Label keyLabel;
- @FXML private Button mappingButton;
+ @FXML
+ private Label keyLabel;
+ @FXML
+ private Button mappingButton;
private KeyboardMapper mapper;
@@ -52,7 +54,7 @@ public class KeyboardMapperViewController extends MapperViewController {
alert.getButtonTypes().add(ButtonType.CANCEL);
alert.initOwner(getContainingWindow());
- boolean result = alert.showInputDialog();
+ boolean result = alert.showInputDialog();
setLabel();
return result;
}
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/mapper/MidiMapperViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/mapper/MidiMapperViewController.java
similarity index 97%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/mapper/MidiMapperViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/mapper/MidiMapperViewController.java
index c913a50b533009e8fa4ac1441ef0fa97e0681b88..dcdbf34ed5d0a9ec2849ea9df7ae2cfa2637a9dc 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/mapper/MidiMapperViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/mapper/MidiMapperViewController.java
@@ -31,10 +31,13 @@ import javax.sound.midi.MidiMessage;
public class MidiMapperViewController extends MapperViewController implements MidiListener {
- @FXML private Label midiInputKeyLabel;
- @FXML private Button midiInputRecordButton;
+ @FXML
+ private Label midiInputKeyLabel;
+ @FXML
+ private Button midiInputRecordButton;
- @FXML private VBox root;
+ @FXML
+ private VBox root;
private MidiMapper mapper;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/feedback/DoubleFeedbackViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/feedback/DoubleFeedbackViewController.java
similarity index 92%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/feedback/DoubleFeedbackViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/feedback/DoubleFeedbackViewController.java
index 4ddbbda1b70df1ec0c761c16c7941f5711da92d7..aa50281c4b7cc68605263d3ae92390ccb4553c60 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/feedback/DoubleFeedbackViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/feedback/DoubleFeedbackViewController.java
@@ -8,8 +8,8 @@ import de.tobias.playpad.action.mididevice.MidiDeviceImpl;
import de.tobias.playpad.midi.Midi;
import de.tobias.playpad.view.ColorPickerView;
import de.tobias.utils.nui.NVC;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.Node;
@@ -23,13 +23,19 @@ import org.controlsfx.control.PopOver.ArrowLocation;
public class DoubleFeedbackViewController extends NVC {
- @FXML private HBox defaultColorParent;
- @FXML private Button colorChooseDefaultButton;
- @FXML private Rectangle colorPreviewDefault;
+ @FXML
+ private HBox defaultColorParent;
+ @FXML
+ private Button colorChooseDefaultButton;
+ @FXML
+ private Rectangle colorPreviewDefault;
- @FXML private HBox eventColorParent;
- @FXML private Button colorChooseEventButton;
- @FXML private Rectangle colorPreviewEvent;
+ @FXML
+ private HBox eventColorParent;
+ @FXML
+ private Button colorChooseEventButton;
+ @FXML
+ private Rectangle colorPreviewEvent;
private PopOver colorChooser;
@@ -79,7 +85,7 @@ public class DoubleFeedbackViewController extends NVC {
} else if (event.getSource() == colorChooseEventButton) {
color = midiDeviceImpl.getColor(feedback.getValueForFeedbackMessage(FeedbackMessage.EVENT));
}
-
+
ColorPickerView colorView = new ColorPickerView(color, midiDeviceImpl.getColors(), item ->
{
colorChooser.hide();
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/feedback/SingleFeedbackViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/feedback/SingleFeedbackViewController.java
similarity index 93%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/feedback/SingleFeedbackViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/feedback/SingleFeedbackViewController.java
index 4cdaac401a68d186d6875e3519d3b32360938aa8..92dac417116cd36c21b96970ecedb75f69e098c4 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/feedback/SingleFeedbackViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/feedback/SingleFeedbackViewController.java
@@ -8,8 +8,8 @@ import de.tobias.playpad.action.mididevice.MidiDeviceImpl;
import de.tobias.playpad.midi.Midi;
import de.tobias.playpad.view.ColorPickerView;
import de.tobias.utils.nui.NVC;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.Node;
@@ -23,9 +23,12 @@ import org.controlsfx.control.PopOver.ArrowLocation;
public class SingleFeedbackViewController extends NVC {
- @FXML private HBox defaultColorParent;
- @FXML private Button colorChooseDefaultButton;
- @FXML private Rectangle colorPreviewDefault;
+ @FXML
+ private HBox defaultColorParent;
+ @FXML
+ private Button colorChooseDefaultButton;
+ @FXML
+ private Rectangle colorPreviewDefault;
private PopOver colorChooser;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java
similarity index 96%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java
index d21423b026fa526db47943e6e61c0ad8069d083d..00c8068843bce0c0fc910665a24a9ab3b667e1d2 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java
@@ -30,16 +30,19 @@ import java.util.List;
public class GlobalSettingsViewController extends NVC implements IGlobalSettingsViewController {
- @FXML private TabPane tabPane;
- @FXML private ToggleButton lockedButton;
- @FXML private Button finishButton;
+ @FXML
+ private TabPane tabPane;
+ @FXML
+ private ToggleButton lockedButton;
+ @FXML
+ private Button finishButton;
private List<GlobalSettingsTabViewController> tabs = new ArrayList<>();
private Runnable onFinish;
public GlobalSettingsViewController(Window owner, Runnable onFinish) {
- load("de/tobias/playpad/assets/view/option/global/", "globalSettingsView", PlayPadMain.getUiResourceBundle());
+ load("de/tobias/playpad/assets/view/option/global/", "globalSettingsView", PlayPadMain.getUiResourceBundle());
this.onFinish = onFinish;
NVCStage nvcStage = applyViewControllerToStage();
@@ -111,7 +114,7 @@ public class GlobalSettingsViewController extends NVC implements IGlobalSettings
/**
* Speichert alle Informationen.
- *
+ *
* @return <code>true</code>Alle Einstellungen sind Valid.
*/
private boolean onFinish() {
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/global/KeysConflictDialog.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/KeysConflictDialog.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/global/KeysConflictDialog.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/KeysConflictDialog.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/global/KeysTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/KeysTabViewController.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/global/KeysTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/KeysTabViewController.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java
similarity index 92%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java
index 78fed49a75fa599ffe2db7549e89e1fa959262dd..97b5f0acc5e6791e9362a47b178fac66fb38ce6c 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/global/UpdateTabViewController.java
@@ -27,18 +27,26 @@ import java.io.IOException;
public class UpdateTabViewController extends GlobalSettingsTabViewController {
- @FXML private Label currentVersionLabel;
+ @FXML
+ private Label currentVersionLabel;
- @FXML private CheckBox automaticSearchCheckBox;
- @FXML private Button manualSearchButton;
+ @FXML
+ private CheckBox automaticSearchCheckBox;
+ @FXML
+ private Button manualSearchButton;
- @FXML private ListView<Updatable> openUpdateList;
- @FXML private Button updateButton;
+ @FXML
+ private ListView<Updatable> openUpdateList;
+ @FXML
+ private Button updateButton;
- @FXML private ComboBox<UpdateChannel> updateChannelComboBox;
+ @FXML
+ private ComboBox<UpdateChannel> updateChannelComboBox;
- @FXML private Label infoCLabel;
- @FXML private Label infoELabel;
+ @FXML
+ private Label infoCLabel;
+ @FXML
+ private Label infoELabel;
// Placeholder for List
private ProgressIndicator progressIndecator;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/DesignPadTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/DesignPadTabViewController.java
similarity index 97%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/DesignPadTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/DesignPadTabViewController.java
index bf090d937003c07666b13f36858f4364cc781014..b0dfa5418b9ee6b57453c4a4d52906c82f176c08 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/DesignPadTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/DesignPadTabViewController.java
@@ -23,8 +23,10 @@ import java.util.List;
public class DesignPadTabViewController extends PadSettingsTabViewController {
- @FXML private VBox layoutContainer;
- @FXML private CheckBox enableLayoutCheckBox;
+ @FXML
+ private VBox layoutContainer;
+ @FXML
+ private CheckBox enableLayoutCheckBox;
private ModernCartDesignViewController layoutViewController;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/GeneralPadTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/GeneralPadTabViewController.java
similarity index 92%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/GeneralPadTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/GeneralPadTabViewController.java
index af842ea164001a571fc6994d212c65bbd1577526..175719deca431afaedffc41acf0c8fd3792f05d9 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/GeneralPadTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/GeneralPadTabViewController.java
@@ -17,14 +17,20 @@ import javafx.stage.Stage;
public class GeneralPadTabViewController extends PadSettingsTabViewController {
- @FXML private TextField titleTextField;
- @FXML private Slider volumeSlider;
- @FXML private CheckBox repeatCheckBox;
+ @FXML
+ private TextField titleTextField;
+ @FXML
+ private Slider volumeSlider;
+ @FXML
+ private CheckBox repeatCheckBox;
- @FXML private CheckBox customTimeDisplayCheckBox;
- @FXML private ComboBox<TimeMode> timeDisplayComboBox;
+ @FXML
+ private CheckBox customTimeDisplayCheckBox;
+ @FXML
+ private ComboBox<TimeMode> timeDisplayComboBox;
- @FXML private Button deleteButton;
+ @FXML
+ private Button deleteButton;
private Pad pad;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java
similarity index 98%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java
index 97c030b4e785b3d872c9d5d40556a602df8383a8..c41a52d2d99167b82961d1e298107ed32a27e4fb 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PadSettingsViewController.java
@@ -34,13 +34,15 @@ public class PadSettingsViewController extends NVC implements IPadSettingsViewCo
private Pad pad;
- @FXML private TabPane tabPane;
+ @FXML
+ private TabPane tabPane;
private List<PadSettingsTabViewController> tabs = new ArrayList<>();
private Control pathLookupButton;
private PathLookupListener pathLookupListener;
- @FXML private Button finishButton;
+ @FXML
+ private Button finishButton;
public PadSettingsViewController(Pad pad, Window owner) {
load("de/tobias/playpad/assets/view/option/pad/", "padSettingsView", PlayPadMain.getUiResourceBundle());
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PathLookupListener.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PathLookupListener.java
similarity index 97%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PathLookupListener.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PathLookupListener.java
index 5a8f43def3a439591eb08f2a541a02b064550d77..89489c16a7c067a5780070801961f57cd300bc1d 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PathLookupListener.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PathLookupListener.java
@@ -2,7 +2,7 @@ package de.tobias.playpad.viewcontroller.option.pad;
import de.tobias.playpad.PlayPadPlugin;
import de.tobias.playpad.Strings;
-import de.tobias.utils.ui.Alertable;
+import de.tobias.utils.nui.Alertable;
import de.tobias.utils.util.Localization;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java
similarity index 94%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java
index a774d6f8268d09f2790867969d58860a63c0bd7b..7e40e259b64cc17474de6f2994d0f9f729e20fe1 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java
@@ -16,12 +16,16 @@ import javafx.util.Duration;
public class PlayerPadTabViewController extends PadSettingsTabViewController {
- @FXML private CheckBox customFadeCheckBox;
- @FXML private VBox fadeContainer;
+ @FXML
+ private CheckBox customFadeCheckBox;
+ @FXML
+ private VBox fadeContainer;
private FadeViewController fadeViewController;
- @FXML private VBox warningFeedbackContainer;
- @FXML private CheckBox warningEnableCheckBox;
+ @FXML
+ private VBox warningFeedbackContainer;
+ @FXML
+ private CheckBox warningEnableCheckBox;
private WarningFeedbackViewController warningFeedbackViewController;
private Pad pad;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/TriggerPadTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/TriggerPadTabViewController.java
similarity index 93%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/TriggerPadTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/TriggerPadTabViewController.java
index 82c0702b958a4571bf7762c86bd40c88ba218042..91d91097f5c3f97f33b857f9b8c3a1e8761a52d1 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/TriggerPadTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/TriggerPadTabViewController.java
@@ -22,8 +22,10 @@ import java.util.HashMap;
public class TriggerPadTabViewController extends PadSettingsTabViewController implements ChangeListener<TreeItem<TriggerDisplayable>> {
- @FXML private TreeView<TriggerDisplayable> treeView;
- @FXML private VBox contentView;
+ @FXML
+ private TreeView<TriggerDisplayable> treeView;
+ @FXML
+ private VBox contentView;
private Pad pad;
@@ -55,7 +57,7 @@ public class TriggerPadTabViewController extends PadSettingsTabViewController im
@Override
public void changed(ObservableValue<? extends TreeItem<TriggerDisplayable>> observable, TreeItem<TriggerDisplayable> oldValue,
- TreeItem<TriggerDisplayable> newValue) {
+ TreeItem<TriggerDisplayable> newValue) {
contentView.getChildren().clear();
if (newValue != null) {
@@ -77,5 +79,6 @@ public class TriggerPadTabViewController extends PadSettingsTabViewController im
}
@Override
- public void saveSettings(Pad pad) {}
+ public void saveSettings(Pad pad) {
+ }
}
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java
similarity index 95%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java
index 1f96127e5856241f29fa001e7ac79424c1ca34dc..245450710c7e7dfd79725d431c2f72303f8672e5 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/CartTriggerViewController.java
@@ -20,8 +20,10 @@ import java.util.stream.Collectors;
public class CartTriggerViewController extends NVC {
- @FXML private ComboBox<PadStatus> statusComboBox;
- @FXML private CheckBox allCartsCheckbox;
+ @FXML
+ private ComboBox<PadStatus> statusComboBox;
+ @FXML
+ private CheckBox allCartsCheckbox;
private ProjectPreviewView projectPreviewView;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java
similarity index 94%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java
index 753c4252ce776c16a0b060f84551b5c431359232..dc7667f0bde5566bf15f35cbdbca130c087e1c0c 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerPointViewController.java
@@ -7,8 +7,8 @@ import de.tobias.playpad.tigger.TriggerItem;
import de.tobias.playpad.tigger.TriggerItemFactory;
import de.tobias.playpad.trigger.TriggerDisplayable;
import de.tobias.utils.nui.NVC;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
import javafx.scene.control.ContentDisplay;
@@ -20,8 +20,10 @@ import java.util.Set;
public class TriggerPointViewController extends NVC {
- @FXML private VBox itemView;
- @FXML private HBox buttonBox;
+ @FXML
+ private VBox itemView;
+ @FXML
+ private HBox buttonBox;
private TriggerDisplayable triggerWrapper;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerTimeViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerTimeViewController.java
similarity index 96%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerTimeViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerTimeViewController.java
index d315114e24f4d3b045f037579d1371ec34c3dbe6..c08fa6a05b43b9735422ff25193d89480f8c4d5e 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerTimeViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/TriggerTimeViewController.java
@@ -13,7 +13,8 @@ import java.util.Optional;
public class TriggerTimeViewController extends NVC {
- @FXML private TextField timeTextField;
+ @FXML
+ private TextField timeTextField;
private TriggerItem item;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/trigger/VolumeTriggerViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/VolumeTriggerViewController.java
similarity index 94%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/trigger/VolumeTriggerViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/VolumeTriggerViewController.java
index 92a0166fa904e50eb7917ef8ef4c0c31eb104daf..10ef25e7b4e132557c30e1ffb8bc8c0c87ea9408 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/trigger/VolumeTriggerViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/trigger/VolumeTriggerViewController.java
@@ -22,11 +22,15 @@ import java.util.stream.Collectors;
public class VolumeTriggerViewController extends NVC {
- @FXML private Slider volumeSlider;
- @FXML private Label volumeLabel;
+ @FXML
+ private Slider volumeSlider;
+ @FXML
+ private Label volumeLabel;
- @FXML private Slider durationSlider;
- @FXML private Label durationLabel;
+ @FXML
+ private Slider durationSlider;
+ @FXML
+ private Label durationLabel;
private ProjectPreviewView projectPreviewView;
private VolumeTriggerItem item;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/AudioTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/AudioTabViewController.java
similarity index 98%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/AudioTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/AudioTabViewController.java
index 8a94a8ff4a041bce3ecb79fc721b074840ef4e44..4b90274d3a8aa519f1661b9bd66673f45914f2b3 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/AudioTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/AudioTabViewController.java
@@ -16,8 +16,8 @@ import de.tobias.playpad.viewcontroller.dialog.project.ProjectLoadDialog;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import de.tobias.playpad.viewcontroller.option.IProfileReloadTask;
import de.tobias.playpad.viewcontroller.option.ProfileSettingsTabViewController;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import de.tobias.utils.util.Localization;
import javafx.fxml.FXML;
import javafx.geometry.Pos;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/DesignTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/DesignTabViewController.java
similarity index 97%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/DesignTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/DesignTabViewController.java
index 191226e624ebe61594b925712c233883446e4b72..f96f78b031bb52a1dc2d3af756d50d6308c5977b 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/DesignTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/DesignTabViewController.java
@@ -17,7 +17,8 @@ import javafx.scene.layout.VBox;
public class DesignTabViewController extends ProfileSettingsTabViewController implements IProfileReloadTask {
- @FXML private VBox layoutContainer;
+ @FXML
+ private VBox layoutContainer;
DesignTabViewController() {
load("de/tobias/playpad/assets/view/option/profile/", "layoutTab", PlayPadMain.getUiResourceBundle());
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/GeneralTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/GeneralTabViewController.java
similarity index 91%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/GeneralTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/GeneralTabViewController.java
index 4558bf568cbb280e9fd9bcba57d10f928f604de7..33a469c9ab78159af0754bc298e46250fb67ebef 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/GeneralTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/GeneralTabViewController.java
@@ -7,7 +7,7 @@ import de.tobias.playpad.settings.GlobalSettings;
import de.tobias.playpad.viewcontroller.option.GlobalSettingsTabViewController;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.application.container.PathType;
-import de.tobias.utils.ui.Alertable;
+import de.tobias.utils.nui.Alertable;
import de.tobias.utils.util.Localization;
import de.tobias.utils.util.NumberUtils;
import javafx.event.ActionEvent;
@@ -24,21 +24,33 @@ import java.nio.file.Paths;
public class GeneralTabViewController extends GlobalSettingsTabViewController {
- @FXML private CheckBox openLastDocumentCheckbox;
+ @FXML
+ private CheckBox openLastDocumentCheckbox;
- @FXML private CheckBox liveModeCheckBox;
+ @FXML
+ private CheckBox liveModeCheckBox;
- @FXML private TextField cacheTextField;
- @FXML private Label cacheSizeLabel;
+ @FXML
+ private TextField cacheTextField;
+ @FXML
+ private Label cacheSizeLabel;
- @FXML private RadioButton pageEnable;
- @FXML private RadioButton pageDisable;
- @FXML private RadioButton dragEnable;
- @FXML private RadioButton dragDisable;
- @FXML private RadioButton fileEnable;
- @FXML private RadioButton fileDisable;
- @FXML private RadioButton settingsEnable;
- @FXML private RadioButton settingsDisable;
+ @FXML
+ private RadioButton pageEnable;
+ @FXML
+ private RadioButton pageDisable;
+ @FXML
+ private RadioButton dragEnable;
+ @FXML
+ private RadioButton dragDisable;
+ @FXML
+ private RadioButton fileEnable;
+ @FXML
+ private RadioButton fileDisable;
+ @FXML
+ private RadioButton settingsEnable;
+ @FXML
+ private RadioButton settingsDisable;
private boolean changeSettings;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/PlayerTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/PlayerTabViewController.java
similarity index 93%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/PlayerTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/PlayerTabViewController.java
index cd3b201a1e03d8071ad87b2b8b209fede746a05d..1138419c7d98d3fe76a3d6ffc4edde08d158712f 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/PlayerTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/PlayerTabViewController.java
@@ -18,12 +18,16 @@ import javafx.scene.layout.VBox;
public class PlayerTabViewController extends ProfileSettingsTabViewController {
// Modus
- @FXML private CheckBox playerModus;
+ @FXML
+ private CheckBox playerModus;
// Player
- @FXML private VBox warningFeedbackContainer;
- @FXML private VBox fadeContainer;
- @FXML private ComboBox<TimeMode> timeDisplayComboBox;
+ @FXML
+ private VBox warningFeedbackContainer;
+ @FXML
+ private VBox fadeContainer;
+ @FXML
+ private ComboBox<TimeMode> timeDisplayComboBox;
PlayerTabViewController() {
load("de/tobias/playpad/assets/view/option/profile/", "playerTab", PlayPadMain.getUiResourceBundle());
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/ProfileSettingsViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/ProfileSettingsViewController.java
similarity index 98%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/ProfileSettingsViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/ProfileSettingsViewController.java
index e6fece1393cbd8cc93ca41b9bf8b14a75bdc3758..969712f7754f147794acfc067697e7d40d0bf358 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/ProfileSettingsViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/ProfileSettingsViewController.java
@@ -16,8 +16,8 @@ import de.tobias.playpad.viewcontroller.option.IProfileSettingsViewController;
import de.tobias.playpad.viewcontroller.option.ProfileSettingsTabViewController;
import de.tobias.utils.nui.NVC;
import de.tobias.utils.nui.NVCStage;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import de.tobias.utils.util.Localization;
import de.tobias.utils.util.Worker;
import javafx.event.ActionEvent;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/project/GeneralTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/project/GeneralTabViewController.java
similarity index 97%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/project/GeneralTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/project/GeneralTabViewController.java
index b7c28051a75cc574c3607add44c872201c23e9ac..afbe300ca8d8693721216b455b039a6ebd3e9b6f 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/project/GeneralTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/project/GeneralTabViewController.java
@@ -9,7 +9,7 @@ import de.tobias.playpad.project.ProjectSettings;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import de.tobias.playpad.viewcontroller.option.IProjectReloadTask;
import de.tobias.playpad.viewcontroller.option.ProjectSettingsTabViewController;
-import de.tobias.utils.ui.Alertable;
+import de.tobias.utils.nui.Alertable;
import de.tobias.utils.util.Localization;
import javafx.application.Platform;
import javafx.fxml.FXML;
@@ -37,11 +37,15 @@ public class GeneralTabViewController extends ProjectSettingsTabViewController i
private Screen mainWindowScreen;
private Alertable parentController; // Für Benachrichtungen
- @FXML private TextField columnTextField;
- @FXML private TextField rowTextField;
+ @FXML
+ private TextField columnTextField;
+ @FXML
+ private TextField rowTextField;
- @FXML private Label columnErrorLabel;
- @FXML private Label rowErrorLabel;
+ @FXML
+ private Label columnErrorLabel;
+ @FXML
+ private Label rowErrorLabel;
GeneralTabViewController(Screen currentScreen, Alertable parentController, boolean activePlayer) {
load("de/tobias/playpad/assets/view/option/project/", "generalTab", PlayPadMain.getUiResourceBundle());
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/project/PathsTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/project/PathsTabViewController.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/project/PathsTabViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/project/PathsTabViewController.java
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java
similarity index 97%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java
index f5ea29fa81faaa1cbbde2af00c7575b51e410329..86c1fa5b6a1c6953d09d64f68f6e439551a4ffb2 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/project/ProjectSettingsViewController.java
@@ -30,9 +30,12 @@ import java.util.List;
public class ProjectSettingsViewController extends NVC implements IProjectSettingsViewController {
- @FXML private TabPane tabPane;
- @FXML private ToggleButton lockedButton;
- @FXML private Button finishButton;
+ @FXML
+ private TabPane tabPane;
+ @FXML
+ private ToggleButton lockedButton;
+ @FXML
+ private Button finishButton;
private List<ProjectSettingsTabViewController> tabs = new ArrayList<>();
private Project project;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/settings/FadeViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/settings/FadeViewController.java
similarity index 87%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/settings/FadeViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/settings/FadeViewController.java
index 7b2d5d2f32f276df75c9c71d575d1c71508787af..bd047d57b178256c6efc26439d447fc591ba23ce 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/settings/FadeViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/settings/FadeViewController.java
@@ -13,15 +13,23 @@ import javafx.util.Duration;
public class FadeViewController extends NVC {
- @FXML private Slider fadeInSlider;
- @FXML private Slider fadeOutSlider;
- @FXML private Label fadeInLabel;
- @FXML private Label fadeOutLabel;
+ @FXML
+ private Slider fadeInSlider;
+ @FXML
+ private Slider fadeOutSlider;
+ @FXML
+ private Label fadeInLabel;
+ @FXML
+ private Label fadeOutLabel;
- @FXML private CheckBox fadeInStartCheckBox;
- @FXML private CheckBox fadeInPauseCheckBox;
- @FXML private CheckBox fadeOutPauseCheckBox;
- @FXML private CheckBox fadeOutStopCheckBox;
+ @FXML
+ private CheckBox fadeInStartCheckBox;
+ @FXML
+ private CheckBox fadeInPauseCheckBox;
+ @FXML
+ private CheckBox fadeOutPauseCheckBox;
+ @FXML
+ private CheckBox fadeOutStopCheckBox;
private Fade fade;
@@ -60,11 +68,11 @@ public class FadeViewController extends NVC {
fadeInSlider.setValue(fade.getFadeIn().toSeconds());
double displayedInTime = Math.round(fade.getFadeIn().toSeconds() * 10) / 10.0;
fadeInLabel.setText(Localization.getString(Strings.Standard_Time_Seconds, displayedInTime));
-
+
fadeOutSlider.setValue(fade.getFadeOut().toSeconds());
double displayedOutTime = Math.round(fade.getFadeOut().toSeconds() * 10) / 10.0;
fadeOutLabel.setText(Localization.getString(Strings.Standard_Time_Seconds, displayedOutTime));
-
+
fadeInStartCheckBox.setSelected(fade.isFadeInStart());
fadeInPauseCheckBox.setSelected(fade.isFadeInPause());
fadeOutPauseCheckBox.setSelected(fade.isFadeOutPause());
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/settings/WarningFeedbackViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/settings/WarningFeedbackViewController.java
similarity index 95%
rename from PlayWall/src/de/tobias/playpad/viewcontroller/settings/WarningFeedbackViewController.java
rename to PlayWall/src/main/java/de/tobias/playpad/viewcontroller/settings/WarningFeedbackViewController.java
index 309ce9accac7f272cca1a7743360cf181264852f..3a4760f9405f3cf0d26fd0688e60c66d855b5bb3 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/settings/WarningFeedbackViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/settings/WarningFeedbackViewController.java
@@ -14,8 +14,10 @@ import javafx.util.Duration;
public class WarningFeedbackViewController extends NVC {
- @FXML private Slider warningFeedbackTimeSlider;
- @FXML private Label warningFeedbackTimeLabel;
+ @FXML
+ private Slider warningFeedbackTimeSlider;
+ @FXML
+ private Label warningFeedbackTimeLabel;
public WarningFeedbackViewController() {
load("de/tobias/playpad/assets/settings/", "warningFeedbackSettingsView", PlayPadMain.getUiResourceBundle());
diff --git a/PlayWall/src/de/tobias/playpad/volume/GlobalVolume.java b/PlayWall/src/main/java/de/tobias/playpad/volume/GlobalVolume.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/volume/GlobalVolume.java
rename to PlayWall/src/main/java/de/tobias/playpad/volume/GlobalVolume.java
diff --git a/PlayWall/src/de/tobias/playpad/volume/PadVolume.java b/PlayWall/src/main/java/de/tobias/playpad/volume/PadVolume.java
similarity index 100%
rename from PlayWall/src/de/tobias/playpad/volume/PadVolume.java
rename to PlayWall/src/main/java/de/tobias/playpad/volume/PadVolume.java
diff --git a/PlayWall/src/params.txt b/PlayWall/src/main/java/params.txt
similarity index 100%
rename from PlayWall/src/params.txt
rename to PlayWall/src/main/java/params.txt
diff --git a/PlayWall/src/application.yml b/PlayWall/src/main/resources/config/application.yml
similarity index 100%
rename from PlayWall/src/application.yml
rename to PlayWall/src/main/resources/config/application.yml
diff --git a/PlayWall/src/main/resources/config/libLogger.yml b/PlayWall/src/main/resources/config/libLogger.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3c309583f9c0021ad159f12e2b777c4e1aa4ccac
--- /dev/null
+++ b/PlayWall/src/main/resources/config/libLogger.yml
@@ -0,0 +1,20 @@
+color:
+ enable: true
+ info: "GREEN"
+ warn: "YELLOW"
+ error: "RED"
+ time: "BLUE"
+ detail: "CYAN"
+ message: "RESET"
+
+dateFormatterPattern: "dd.MM.YY HH:mm:ss"
+
+defaultOutLevel: "DEBUG"
+defaultErrLevel: "ERROR"
+
+showShortPackageName: true
+showClassName: true
+showMethodName: true
+showLineNumber: true
+
+ignoreStandardStream: false
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/controlsfx_de_DE.properties b/PlayWall/src/main/resources/controlsfx_de_DE.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b5527885b41c5db4266d09631741beb45764cf2a
--- /dev/null
+++ b/PlayWall/src/main/resources/controlsfx_de_DE.properties
@@ -0,0 +1,55 @@
+### Dialogs ###
+dlg.ok.button=OK
+dlg.cancel.button=Abbruch
+dlg.yes.button=Ja
+dlg.no.button=Nein
+dlg.close.button=Schlie\uFFFDen
+dlg.detail.button.more=Show Details
+dlg.detail.button.less=Hide Details
+### Common Dialogs ###
+font.dlg.title=Select font
+font.dlg.header=Select font
+font.dlg.sample.text=Sample
+font.dlg.font.label=Font
+font.dlg.style.label=Style
+font.dlg.size.label=Size
+progress.dlg.title=Progress
+progress.dlg.header=Progress
+login.dlg.title=Login
+login.dlg.header=Enter user name and password
+login.dlg.user.caption=User Name
+login.dlg.pswd.caption=Password
+login.dlg.login.button=Login
+exception.dlg.title=Exception Details
+exception.dlg.header=Exception Details
+exception.dlg.label=The exception stacktrace was:
+exception.button.label=Open Exception
+### Wizard ###
+wizard.next.button=Weiter
+wizard.previous.button=Zur\uFFFDck
+### Property Sheet ###
+bean.property.change.error.title=Property Change Error
+bean.property.change.error.header=Change is not allowed
+bean.property.category.basic=Basic
+bean.property.category.expert=Expert
+property.sheet.search.field.prompt=Search
+property.sheet.group.mode.byname=By Name
+property.sheet.group.mode.bycategory=By Category
+### Spreadsheet View ###
+spreadsheet.view.menu.copy=Copy
+spreadsheet.view.menu.paste=Paste
+spreadsheet.view.menu.comment=Comment cell
+spreadsheet.view.menu.comment.top-left=top left
+spreadsheet.view.menu.comment.top-right=top right
+spreadsheet.view.menu.comment.bottom-right=bottom right
+spreadsheet.view.menu.comment.bottom-left=bottom left
+spreadsheet.column.menu.fix=Fix column
+spreadsheet.column.menu.unfix=Unfix column
+spreadsheet.verticalheader.menu.fix=Fix row
+spreadsheet.verticalheader.menu.unfix=Unfix row
+### Status Bar ###
+statusbar.ok=OK
+### List Selection View ###
+listSelectionView.header.source=Available
+listSelectionView.header.target=Selected
+
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/about.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/about.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..45f000d54fbdb479245d79ce176768fde5050757
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/about.fxml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.*?>
+<AnchorPane fx:id="rootPane" prefHeight="300.0" prefWidth="600.0"
+ style="-fx-background-radius: 10; -fx-border-radius: 10;" xmlns="http://javafx.com/javafx/8"
+ xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox alignment="CENTER_LEFT" spacing="14.0" style="-fx-base: #333333;" AnchorPane.bottomAnchor="0.0"
+ AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+ <children>
+ <ImageView fitHeight="200.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../gfx/Logo-large.png"/>
+ </image>
+ </ImageView>
+ <VBox alignment="CENTER_LEFT" spacing="7.0">
+ <children>
+ <Label styleClass="about-headline" text="Über PlayWall">
+ <VBox.margin>
+ <Insets bottom="14.0"/>
+ </VBox.margin>
+ </Label>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="75.0" text="Version:" textAlignment="RIGHT"/>
+ <Label fx:id="versionLabel" text="1.0.0"/>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="75.0" text="Autor:" textAlignment="RIGHT"/>
+ <Label fx:id="authorLabel" text="Tobias Ullerich"/>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="75.0" text="Grafiken:"
+ textAlignment="RIGHT"/>
+ <Label fx:id="graphicsLabel" text="Robert Goldmann"/>
+ </children>
+ </HBox>
+ <HBox fx:id="websiteContainer" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="75.0" text="Webseite" textAlignment="RIGHT"/>
+ </children>
+ </HBox>
+ <HBox fx:id="codeContainer" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="75.0" text="Code:" textAlignment="RIGHT"/>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="75.0" prefWidth="75.0" text="Libraries:"
+ textAlignment="RIGHT"/>
+ <Label fx:id="libsLabel" text="controlsfx" wrapText="true"/>
+ </children>
+ </HBox>
+ <Label maxWidth="1.7976931348623157E308"
+ text="Besonderen Dank an die treuen Betatester Stefan und Robert." wrapText="true">
+ <VBox.margin>
+ <Insets left="89.0"/>
+ </VBox.margin>
+ </Label>
+ </children>
+ </VBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+ </HBox>
+ </children>
+</AnchorPane>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/authDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/authDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..84578ea4cbfb640bf3f96024bbe2c127a7b641b9
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/authDialog.fxml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <Label text="%login.label.auth"/>
+ <HBox alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="100.0" prefWidth="100.0" text="%login.label.username"/>
+ <TextField fx:id="usernameTextField" HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="100.0" prefWidth="100.0" text="%login.label.password"/>
+ <PasswordField fx:id="passwordTextField" HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ <HBox maxWidth="1.7976931348623157E308" spacing="14.0" VBox.vgrow="ALWAYS">
+ <children>
+ <Label alignment="TOP_RIGHT" minWidth="100.0" prefWidth="100.0" text="%login.label.info"/>
+ <Label fx:id="infoLabel"/>
+ </children>
+ </HBox>
+ <Button fx:id="loginButton" maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#loginHandler"
+ text="%login.button.login" VBox.vgrow="ALWAYS"/>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/changelogDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/changelogDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..a912d1877794b2d64a75fddf29390366aaa5fb34
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/changelogDialog.fxml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<?import javafx.scene.web.WebView?>
+<WebView fx:id="contentView" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8"
+ xmlns:fx="http://javafx.com/fxml/1"/>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/errorSummaryDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/errorSummaryDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..4248b0af2c13ea11c7a98619c1ca323e9df30379
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/errorSummaryDialog.fxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0"
+ prefWidth="900.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <TableView fx:id="errorTable" layoutY="38.0" prefHeight="312.0" prefWidth="600.0" AnchorPane.bottomAnchor="50.0"
+ AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
+ <columns>
+ <TableColumn fx:id="padColumn" prefWidth="230.0" text="%errorSummary.column.cart"/>
+ <TableColumn fx:id="errorColumn" prefWidth="465.0" text="%errorSummary.column.des"/>
+ <TableColumn fx:id="fixColumn" prefWidth="200.0" text="%errorSummary.column.solution"/>
+ </columns>
+ </TableView>
+ <Label layoutX="14.0" layoutY="14.0" text="%errorSummary.label.headline"/>
+ <Button fx:id="closeButton" layoutX="587.0" layoutY="260.0" mnemonicParsing="false"
+ onAction="#closeButtonHandler" text="%errorSummary.button.close" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.rightAnchor="14.0"/>
+ </children>
+</AnchorPane>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/launchDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/launchDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..db99ca75790e5451b18bd8d2b9e60ee524cb1827
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/launchDialog.fxml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Font?>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="345.0"
+ prefWidth="640.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <VBox alignment="CENTER" layoutX="24.0" layoutY="5.0" spacing="7.0" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.leftAnchor="34.0" AnchorPane.topAnchor="14.0">
+ <children>
+ <ImageView fx:id="imageView" fitHeight="144.0" fitWidth="140.0" layoutX="80.0" layoutY="14.0"
+ pickOnBounds="true" preserveRatio="true"/>
+ <Label fx:id="infoLabel" alignment="CENTER" layoutX="24.0" layoutY="212.0" prefHeight="39.0"
+ prefWidth="310.0" AnchorPane.leftAnchor="24.0" AnchorPane.rightAnchor="266.0"
+ AnchorPane.topAnchor="212.0">
+ <font>
+ <Font size="25.0"/>
+ </font>
+ </Label>
+ <VBox layoutX="109.0" layoutY="259.0" spacing="14.0">
+ <children>
+ <Button fx:id="newProjectButton" layoutX="115.0" layoutY="259.0"
+ maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+ onAction="#newProjectButtonHandler" text="%launch.button.new" VBox.vgrow="ALWAYS"/>
+ <Button fx:id="importProject" layoutX="109.0" layoutY="292.0" maxWidth="1.7976931348623157E308"
+ mnemonicParsing="false" onAction="#importProjectButtonHandler"
+ text="%launch.button.import" VBox.vgrow="ALWAYS"/>
+ <Button fx:id="convertProjectButton" layoutX="109.0" layoutY="292.0"
+ maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+ onAction="#convertProjectButtonHandler" text="%launch.button.convert"
+ VBox.vgrow="ALWAYS"/>
+ </children>
+ </VBox>
+ </children>
+ </VBox>
+ <ListView id="projectList" fx:id="projectListView" fixedCellSize="40.0" layoutX="371.0" prefHeight="345.0"
+ prefWidth="269.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="371.0"
+ AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+ <HBox layoutX="494.0" layoutY="305.0" spacing="14.0" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.rightAnchor="14.0">
+ <children>
+ <Button fx:id="deleteButton" layoutX="494.0" layoutY="305.0" mnemonicParsing="false"
+ onAction="#deleteButtonHandler" text="%launch.button.delete"/>
+ <Button fx:id="openButton" layoutX="568.0" layoutY="305.0" mnemonicParsing="false"
+ onAction="#openButtonHandler" text="%launch.button.open" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.rightAnchor="14.0"/>
+ </children>
+ </HBox>
+ <HBox layoutX="-57.0" layoutY="295.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0">
+ <children>
+ <Label fx:id="cloudLabel" onMouseClicked="#cloudIconClicked"/>
+ </children>
+ </HBox>
+ </children>
+</AnchorPane>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/loginDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/loginDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..2518568b25d5a7c052c36d3a27ffa9f43c24a926
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/loginDialog.fxml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Font?>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="345.0"
+ prefWidth="640.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <VBox alignment="CENTER" layoutX="24.0" layoutY="5.0" prefWidth="250.0" spacing="7.0"
+ AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="34.0" AnchorPane.topAnchor="14.0">
+ <children>
+ <ImageView fx:id="imageView" fitHeight="144.0" fitWidth="140.0" layoutX="80.0" layoutY="14.0"
+ pickOnBounds="true" preserveRatio="true"/>
+ <Label fx:id="infoLabel" alignment="CENTER" layoutX="24.0" layoutY="212.0" prefHeight="39.0"
+ prefWidth="310.0" AnchorPane.leftAnchor="24.0" AnchorPane.rightAnchor="266.0"
+ AnchorPane.topAnchor="212.0">
+ <font>
+ <Font size="25.0"/>
+ </font>
+ </Label>
+ <VBox layoutX="109.0" layoutY="259.0" spacing="14.0">
+ <children>
+ <Button fx:id="importProfileButton" defaultButton="true" layoutX="109.0" layoutY="292.0"
+ maxWidth="1.7976931348623157E308" mnemonicParsing="false" onAction="#loginHandler"
+ text="%login.button.login" VBox.vgrow="ALWAYS"/>
+ <Button fx:id="importProfileButton1" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+ onAction="#registerHandler" text="%login.button.create"/>
+ </children>
+ </VBox>
+ </children>
+ </VBox>
+ <VBox alignment="CENTER" layoutX="388.0" layoutY="50.0" spacing="28.0" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.leftAnchor="300.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
+ <children>
+ <HBox alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="150.0" prefWidth="150.0"
+ text="%login.label.username"/>
+ <TextField fx:id="usernameTextField" HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="150.0" prefWidth="150.0"
+ text="%login.label.password"/>
+ <PasswordField fx:id="passwordTextField" HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ </children>
+</AnchorPane>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/newProfileDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/newProfileDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..468fe6e8b4dd6d4b0f3272aff58049450626795b
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/newProfileDialog.fxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="150.0" minWidth="400.0" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <Label text="%newProfile.label.info"/>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="100.0" prefWidth="100.0" text="%newProfile.label.name"/>
+ <TextField fx:id="nameTextField" minWidth="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ <Separator maxWidth="1.7976931348623157E308" valignment="BOTTOM"/>
+ <HBox alignment="BOTTOM_RIGHT" spacing="14.0">
+ <children>
+ <Button fx:id="cancelButton" mnemonicParsing="false" onAction="#cancelButtonHandler"
+ text="%newProfile.button.cancel"/>
+ <Button fx:id="finishButton" defaultButton="true" mnemonicParsing="false"
+ onAction="#finishButtonHandler" text="%newProfile.button.finish"/>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/newProjectDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/newProjectDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..4c959892b9d93547b639c2f3f11c3c281fe9fdff
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/newProjectDialog.fxml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="200.0" minWidth="500.0" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="100.0" prefWidth="100.0" text="%newProject.label.name"/>
+ <TextField fx:id="nameTextField" prefWidth="200.0" HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="100.0" prefWidth="100.0" text="%newProject.label.sync"/>
+ <CheckBox fx:id="syncCheckbox" maxWidth="1.7976931348623157E308" text="%newProject.checkbox.sync"
+ HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ <Separator prefWidth="200.0"/>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="100.0" prefWidth="100.0" text="%newProject.label.profile"
+ HBox.hgrow="NEVER"/>
+ <ComboBox fx:id="profileComboBox" maxWidth="1.7976931348623157E308" minWidth="200.0" prefWidth="200.0"
+ HBox.hgrow="ALWAYS"/>
+ <Button fx:id="newProfileButton" mnemonicParsing="false" onAction="#newProfileButtonHandler"
+ prefWidth="130.0" text="%newProject.button.newProfile"/>
+ </children>
+ </HBox>
+ <HBox prefWidth="500.0" VBox.vgrow="ALWAYS">
+ <children>
+ <Label alignment="TOP_LEFT" text="%profile.label.info" textAlignment="JUSTIFY" wrapText="true"
+ HBox.hgrow="ALWAYS">
+ <padding>
+ <Insets left="114.0"/>
+ </padding>
+ </Label>
+ </children>
+ </HBox>
+ <Separator valignment="BOTTOM" VBox.vgrow="ALWAYS"/>
+ <HBox alignment="BOTTOM_RIGHT" spacing="14.0">
+ <children>
+ <Button fx:id="cnacelButton" mnemonicParsing="false" onAction="#cancelButtonHandler" prefWidth="130.0"
+ text="%newProject.button.cancel"/>
+ <Button fx:id="finishButton" defaultButton="true" mnemonicParsing="false"
+ onAction="#finishButtonHandler" prefWidth="130.0" text="%newProject.button.finish"/>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/notFoundDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/notFoundDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..b2eef3cd1e8d96314a72bee36ded45d927360212
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/notFoundDialog.fxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <Label text="Dateienverknüpfung:" underline="true"/>
+ <TableView fx:id="table" editable="true" VBox.vgrow="ALWAYS">
+ <columns>
+ <TableColumn fx:id="selectColumn" prefWidth="75.0" text="Auswahl"/>
+ <TableColumn fx:id="filenameColumn" minWidth="200.0" prefWidth="75.0" text="Dateiname"/>
+ <TableColumn fx:id="localPathColumn" minWidth="300.0" prefWidth="75.0" text="Lokaler Pfad"/>
+ <TableColumn fx:id="actionColumn" prefWidth="75.0" text="Aktionen"/>
+ </columns>
+ </TableView>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label fx:id="statusLabel" maxWidth="1.7976931348623157E308" text="Label" HBox.hgrow="ALWAYS"/>
+ <Button fx:id="cancelButton" mnemonicParsing="false" onAction="#cancelHandler" text="Abbrechen"/>
+ <Button fx:id="finishButton" mnemonicParsing="false" onAction="#finishHandler" text="Übernehmen"/>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/playoutLogDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/playoutLogDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..018321ac305f98f31af170a6d4ada8cf1754d6cc
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/playoutLogDialog.fxml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <Label styleClass="headline" text="PlayOut Log"/>
+ <HBox spacing="14.0">
+ <children>
+ <TextField fx:id="nameTextField" maxWidth="1.7976931348623157E308" prefWidth="300.0" promptText="Name"
+ HBox.hgrow="ALWAYS"/>
+ <Button fx:id="startButton" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+ onAction="#startButtonHandler" prefWidth="100.0" text="Starten" HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ <HBox maxWidth="1.7976931348623157E308" spacing="14.0" VBox.vgrow="ALWAYS">
+ <children>
+ <ListView fx:id="logList" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="300.0"
+ HBox.hgrow="ALWAYS"/>
+ <VBox maxWidth="1.7976931348623157E308" spacing="14.0" HBox.hgrow="ALWAYS">
+ <children>
+ <Button fx:id="exportButton" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+ onAction="#exportButtonHandler" prefWidth="100.0" text="Export..." VBox.vgrow="ALWAYS"/>
+ <Button fx:id="deleteButton" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+ onAction="#deleteButtonHandler" prefWidth="100.0" text="Löschen..."
+ VBox.vgrow="ALWAYS"/>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ <HBox alignment="TOP_RIGHT">
+ <children>
+ <Button fx:id="finishButton" defaultButton="true" mnemonicParsing="false"
+ onAction="#finishButtonHandler" text="Fertig"/>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/profileChooseDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/profileChooseDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..72b229cd6e606f8fb4b437a32ba38bbe137ad75e
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/profileChooseDialog.fxml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" spacing="14.0" xmlns="http://javafx.com/javafx/8"
+ xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="100.0" prefWidth="100.0" text="%newProject.label.profile"
+ HBox.hgrow="NEVER"/>
+ <ComboBox fx:id="profileComboBox" maxWidth="1.7976931348623157E308" minWidth="200.0" prefWidth="200.0"
+ HBox.hgrow="ALWAYS"/>
+ <Button fx:id="newProfileButton" mnemonicParsing="false" onAction="#newProfileButtonHandler"
+ prefWidth="130.0" text="%newProject.button.newProfile"/>
+ </children>
+ </HBox>
+ <HBox prefHeight="70.0" prefWidth="500.0" VBox.vgrow="ALWAYS">
+ <children>
+ <Label alignment="TOP_LEFT" text="%profileChoose.label.info" wrapText="true" HBox.hgrow="ALWAYS">
+ <padding>
+ <Insets left="114.0"/>
+ </padding>
+ </Label>
+ </children>
+ </HBox>
+ <Separator valignment="BOTTOM" VBox.vgrow="ALWAYS"/>
+ <HBox alignment="BOTTOM_RIGHT" spacing="14.0">
+ <children>
+ <Button fx:id="cnacelButton" mnemonicParsing="false" onAction="#cancelButtonHandler" prefWidth="130.0"
+ text="%newProject.button.cancel"/>
+ <Button fx:id="finishButton" defaultButton="true" mnemonicParsing="false"
+ onAction="#finishButtonHandler" prefWidth="130.0" text="%profileChoose.button.finish"/>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/profileSettingsView.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/profileSettingsView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..ed711e2a41f36a6cce2a3effc3a28d524517bad0
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/profileSettingsView.fxml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<HBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <ListView fx:id="profileList" layoutX="14.0" layoutY="14.0" prefHeight="376.0" prefWidth="200.0"
+ AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+ <VBox spacing="14.0" HBox.hgrow="ALWAYS">
+ <children>
+ <Label styleClass="headline" text="%profile.label.headline"/>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="214.0" layoutY="22.0" prefWidth="100.0"
+ text="%profile.label.name"/>
+ <TextField fx:id="nameTextField" layoutX="272.0" layoutY="17.0" HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ <Label alignment="TOP_LEFT" prefHeight="112.0" prefWidth="277.0" text="%profile.label.info"
+ wrapText="true"/>
+ <VBox spacing="14.0" VBox.vgrow="ALWAYS">
+ <children>
+ <Button fx:id="newButton" layoutX="236.0" layoutY="253.0" maxWidth="1.7976931348623157E308"
+ mnemonicParsing="false" onAction="#newButtonHandler" text="%profile.button.new"
+ VBox.vgrow="ALWAYS"/>
+ <Button fx:id="duplicateButton" layoutX="236.0" layoutY="289.0"
+ maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+ onAction="#duplicateButtonHandler" text="%profile.button.duplicate"
+ VBox.vgrow="ALWAYS"/>
+ <Button fx:id="deleteButton" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+ onAction="#deleteButtonHandler" text="%profile.button.delete" VBox.vgrow="ALWAYS"/>
+ </children>
+ </VBox>
+ <HBox>
+ <children>
+ <Pane maxHeight="1.7976931348623157E308" HBox.hgrow="ALWAYS"/>
+ <Button fx:id="chooseButton" mnemonicParsing="false" onAction="#chooseButtonHandler"
+ text="%profile.button.choose"/>
+ </children>
+ </HBox>
+ </children>
+ <HBox.margin>
+ <Insets bottom="14.0" right="14.0" top="14.0"/>
+ </HBox.margin>
+ </VBox>
+ </children>
+</HBox>
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/exportDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/exportDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..6c48c6795e3c1aef55ee51b27125f3110a7dc5a6
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/exportDialog.fxml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<StackPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <VBox spacing="14.0">
+ <children>
+ <VBox layoutX="14.0" layoutY="14.0" spacing="14.0" AnchorPane.leftAnchor="14.0"
+ AnchorPane.topAnchor="14.0">
+ <children>
+ <Label layoutX="14.0" layoutY="14.0" text="%project.export.label.headline"/>
+ <CheckBox fx:id="profileCheckBox" layoutX="29.0" layoutY="42.0" mnemonicParsing="false"
+ text="%project.export.checkbox.profile"/>
+ <CheckBox fx:id="mediaCheckBox" layoutX="29.0" layoutY="69.0" mnemonicParsing="false"
+ text="%project.export.checkbox.media"/>
+ </children>
+ </VBox>
+ <HBox alignment="BOTTOM_RIGHT" layoutX="457.0" layoutY="102.0" spacing="14.0"
+ AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="14.0" VBox.vgrow="ALWAYS">
+ <children>
+ <Button fx:id="cancelButton" layoutX="457.0" layoutY="102.0" mnemonicParsing="false"
+ onAction="#cancelButtonHandler" text="%project.export.button.cancel"/>
+ <Button fx:id="saveButton" layoutX="528.0" layoutY="102.0" mnemonicParsing="false"
+ onAction="#saveButtonHandler" text="%project.export.button.save"/>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+ </VBox>
+ </children>
+</StackPane>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/importDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/importDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..511c4f4d13e32ac02bb0173ff32ddfb7118c9648
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/importDialog.fxml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="400.0" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <VBox spacing="14.0">
+ <children>
+ <Label text="%project.import.label.project" underline="true"/>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="100.0" text="%project.import.label.name"/>
+ <TextField fx:id="projectNameTextField"/>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="100.0" text="%project.import.label.sync"/>
+ <CheckBox fx:id="syncCheckbox" mnemonicParsing="false" text="%project.import.checkbox.sync"/>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ <Separator prefWidth="200.0"/>
+ <VBox fx:id="profileSection" spacing="14.0">
+ <children>
+ <Label text="%project.import.label.profile" underline="true"/>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <CheckBox fx:id="profileImportCheckbox" mnemonicParsing="false"
+ text="%project.import.checkbox.profile">
+ <HBox.margin>
+ <Insets left="114.0"/>
+ </HBox.margin>
+ </CheckBox>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="100.0" text="%project.import.label.name"/>
+ <TextField fx:id="profileNameTextField"/>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ <Separator prefWidth="200.0"/>
+ <VBox fx:id="mediaSection" spacing="14.0">
+ <children>
+ <Label text="%project.import.label.media" underline="true"/>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <CheckBox fx:id="mediaImportCheckbox" mnemonicParsing="false"
+ text="%project.import.checkbox.media">
+ <HBox.margin>
+ <Insets left="114.0"/>
+ </HBox.margin>
+ </CheckBox>
+ </children>
+ </HBox>
+ <VBox spacing="14.0">
+ <children>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="100.0" text="%project.import.label.path"/>
+ <Button fx:id="mediaPathButton" mnemonicParsing="false" onAction="#mediaPathHandler"
+ text="%project.import.button.choose"/>
+ </children>
+ </HBox>
+ <Label fx:id="mediaPathLabel" minWidth="100.0" textOverrun="CENTER_ELLIPSIS">
+ <VBox.margin>
+ <Insets left="114.0"/>
+ </VBox.margin>
+ </Label>
+ </children>
+ </VBox>
+ </children>
+ </VBox>
+ <Separator prefWidth="200.0"/>
+ <HBox alignment="BOTTOM_RIGHT" spacing="14.0">
+ <children>
+ <Button fx:id="cancelButton" mnemonicParsing="false" onAction="#cancelHandler"
+ text="%project.import.button.cancel"/>
+ <Button fx:id="importButton" mnemonicParsing="false" onAction="#importHandler"
+ text="%project.import.button.import"/>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/loadDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/loadDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..fc9bf37a6577f3deb83ef9d981de8ef80d0b6c5d
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/loadDialog.fxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ProgressBar?>
+<?import javafx.scene.layout.VBox?>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="400.0" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <Label fx:id="statusLabel" text="Label"/>
+ <ProgressBar fx:id="progressbar" maxWidth="1.7976931348623157E308" progress="0.0"/>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/openDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/openDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..372dab1c7d409422536dac58856a80e1f91fdc9d
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/openDialog.fxml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <AnchorPane fx:id="rootNode" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
+ minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" AnchorPane.bottomAnchor="0.0"
+ AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+ <children>
+ <ListView fx:id="projectList" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0"
+ AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+ <VBox layoutX="200.0" prefHeight="200.0" prefWidth="100.0" spacing="14.0" AnchorPane.bottomAnchor="0.0"
+ AnchorPane.leftAnchor="200.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+ <children>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label text="%project.label.name"/>
+ <TextField fx:id="nameTextField" HBox.hgrow="ALWAYS"/>
+ <Button fx:id="renameButton" mnemonicParsing="false" onAction="#renameButtonHandler"
+ text="%project.button.rename"/>
+ </children>
+ </HBox>
+ <Separator prefWidth="200.0"/>
+ <HBox spacing="14.0">
+ <children>
+ <VBox spacing="14.0">
+ <children>
+ <Label text="%project.label.profile"/>
+ <Label text="%project.label.lastModified"/>
+ </children>
+ </VBox>
+ <VBox spacing="14.0">
+ <children>
+ <Label fx:id="profileLabel" text="Default"/>
+ <Label fx:id="dateLabel" text="20. Dez 2015 19:45"/>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ <HBox spacing="14.0" VBox.vgrow="ALWAYS">
+ <children>
+ <VBox spacing="14.0" VBox.vgrow="ALWAYS">
+ <children>
+ <Button fx:id="newButton" maxWidth="1.7976931348623157E308"
+ mnemonicParsing="false" onAction="#newButtonHandler"
+ text="%project.button.new" VBox.vgrow="ALWAYS"/>
+ <Button fx:id="duplicateButton" maxWidth="1.7976931348623157E308"
+ mnemonicParsing="false" onAction="#duplicateButtonHandler"
+ text="%project.button.duplicate" VBox.vgrow="ALWAYS"/>
+ <Button fx:id="deleteButton" maxWidth="1.7976931348623157E308"
+ mnemonicParsing="false" onAction="#deleteButtonHandler"
+ text="%project.button.delete" VBox.vgrow="ALWAYS"/>
+ </children>
+ </VBox>
+ <VBox spacing="14.0">
+ <children>
+ <Button fx:id="exportButton" maxWidth="1.7976931348623157E308"
+ mnemonicParsing="false" onAction="#exportButtonHandler"
+ text="%project.button.export" VBox.vgrow="ALWAYS"/>
+ <Button fx:id="importButton" maxWidth="1.7976931348623157E308"
+ mnemonicParsing="false" onAction="#importButtonHandler"
+ text="%project.button.import" VBox.vgrow="ALWAYS"/>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ <Label text="%project.label.export" wrapText="true"/>
+ <Separator prefWidth="200.0"/>
+ <HBox alignment="TOP_RIGHT" spacing="14.0">
+ <children>
+ <Button fx:id="cancelButton" mnemonicParsing="false" onAction="#cancelButtonHandler"
+ text="%project.button.cancel"/>
+ <Button fx:id="openButton" mnemonicParsing="false" onAction="#openButtonHandler"
+ text="%project.button.finish"/>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+ </VBox>
+ </children>
+ </AnchorPane>
+ </children>
+</AnchorPane>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/printDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/printDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..802e8d10f08d824d1f7262c9ee80372f5d6fbec1
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/printDialog.fxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.web.WebView?>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
+ prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <WebView fx:id="webView" prefHeight="348.0" prefWidth="600.0" AnchorPane.bottomAnchor="52.0"
+ AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+ <HBox alignment="CENTER_LEFT" layoutX="14.0" layoutY="360.0" spacing="14.0" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.leftAnchor="14.0">
+ <children>
+ <Label layoutX="14.0" layoutY="365.0" text="%print.label.page"/>
+ <ComboBox fx:id="pageComboBox" layoutX="94.0" layoutY="360.0" prefWidth="150.0"/>
+ </children>
+ </HBox>
+ <HBox layoutX="463.0" layoutY="360.0" spacing="14.0" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.rightAnchor="14.0">
+ <children>
+ <Button fx:id="cancelButton" layoutX="463.0" layoutY="360.0" mnemonicParsing="false"
+ onAction="#cancelButtonHandler" text="%print.button.cancel"/>
+ <Button fx:id="printButton" layoutX="528.0" layoutY="360.0" mnemonicParsing="false"
+ onAction="#printButtonHandler" text="%print.button.print"/>
+ </children>
+ </HBox>
+ </children>
+</AnchorPane>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/projectManagementDialog.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/projectManagementDialog.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..d452d09f6acc1dcc6a0db1d2eb6ef347cf2b5e1f
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/dialog/project/projectManagementDialog.fxml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <ListView fx:id="projectList"/>
+ <VBox spacing="14.0" HBox.hgrow="ALWAYS">
+ <children>
+ <Label text="%project.label.details" underline="true"/>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="100.0" prefWidth="100.0" text="%project.label.name"/>
+ <TextField fx:id="nameTextfield" maxWidth="200.0" HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="100.0" prefWidth="100.0"
+ text="%project.label.profile"/>
+ <ComboBox fx:id="profileCombobox" maxWidth="200.0" HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ <Separator prefWidth="200.0"/>
+ <Label text="%project.label.cloud" underline="true"/>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="100.0" prefWidth="100.0"
+ text="%project.label.status"/>
+ <CheckBox fx:id="syncCheckbox" maxWidth="1.7976931348623157E308" mnemonicParsing="false"
+ text="%project.checkbox.sync" HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ <HBox>
+ <children>
+ <Button fx:id="syncSettingsButton" mnemonicParsing="false" onAction="#syncSettingsHandler"
+ prefWidth="200.0" text="%project.button.sync" HBox.hgrow="ALWAYS">
+ <HBox.margin>
+ <Insets left="114.0"/>
+ </HBox.margin>
+ </Button>
+ </children>
+ </HBox>
+ <Separator prefWidth="200.0"/>
+ <Label text="%project.label.management" underline="true"/>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="100.0" prefWidth="100.0" text="%project.label.share">
+ <HBox.margin>
+ <Insets top="3.0"/>
+ </HBox.margin>
+ </Label>
+ <VBox spacing="14.0" HBox.hgrow="ALWAYS">
+ <children>
+ <Button fx:id="projectExportButton" mnemonicParsing="false"
+ onAction="#projectExportHandler" prefWidth="200.0"
+ text="%project.button.export"/>
+ <Button fx:id="projectImportButton" mnemonicParsing="false"
+ onAction="#projectImportHandler" prefWidth="200.0"
+ text="%project.button.import"/>
+ <Button fx:id="projectDuplicateButton" mnemonicParsing="false"
+ onAction="#projectDuplicateHandler" prefWidth="200.0"
+ text="%project.button.duplicate"/>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="100.0" prefWidth="100.0"
+ text="%project.label.delete"/>
+ <Button fx:id="projectDeleteButton" mnemonicParsing="false" onAction="#projectDeleteHandler"
+ prefWidth="200.0" text="%project.button.delete" HBox.hgrow="ALWAYS"/>
+ </children>
+ </HBox>
+ <Separator prefWidth="200.0"/>
+ <HBox spacing="14.0">
+ <children>
+ <Label minWidth="100.0"/>
+ <Button fx:id="cancelButton" mnemonicParsing="false" onAction="#cancelHandler" prefWidth="93.0"
+ text="%project.button.cancel"/>
+ <Button fx:id="openButton" mnemonicParsing="false" onAction="#openHandler" prefWidth="93.0"
+ text="%project.button.open"/>
+ </children>
+ </HBox>
+ </children>
+ <HBox.margin>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </HBox.margin>
+ </VBox>
+ </children>
+</HBox>
diff --git a/PluginNativeAudio/src/de/tobias/playpad/assets/Test-Sound.wav b/PlayWall/src/main/resources/de/tobias/playpad/assets/files/Test-Sound.wav
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/assets/Test-Sound.wav
rename to PlayWall/src/main/resources/de/tobias/playpad/assets/files/Test-Sound.wav
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/files/class_obj.png b/PlayWall/src/main/resources/de/tobias/playpad/assets/files/class_obj.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc915da4420060b4ea9984fc662935f10f19449a
Binary files /dev/null and b/PlayWall/src/main/resources/de/tobias/playpad/assets/files/class_obj.png differ
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/files/dialogDnD.png b/PlayWall/src/main/resources/de/tobias/playpad/assets/files/dialogDnD.png
new file mode 100644
index 0000000000000000000000000000000000000000..79a1e57c0fabf8751169b46cd0be117ca457adad
Binary files /dev/null and b/PlayWall/src/main/resources/de/tobias/playpad/assets/files/dialogDnD.png differ
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/files/dialogDnD.pxm b/PlayWall/src/main/resources/de/tobias/playpad/assets/files/dialogDnD.pxm
new file mode 100644
index 0000000000000000000000000000000000000000..34238c749b4b88804485d74eb87307a03d2588e6
Binary files /dev/null and b/PlayWall/src/main/resources/de/tobias/playpad/assets/files/dialogDnD.pxm differ
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/files/enum_obj.png b/PlayWall/src/main/resources/de/tobias/playpad/assets/files/enum_obj.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2b5d8345058a26e8ffb4262277543bce417535b
Binary files /dev/null and b/PlayWall/src/main/resources/de/tobias/playpad/assets/files/enum_obj.png differ
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/gfx/Logo-3D.png b/PlayWall/src/main/resources/de/tobias/playpad/assets/gfx/Logo-3D.png
new file mode 100644
index 0000000000000000000000000000000000000000..72f27b72860359c87fa1f3917d4fa996a8c5c66b
Binary files /dev/null and b/PlayWall/src/main/resources/de/tobias/playpad/assets/gfx/Logo-3D.png differ
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/gfx/Logo-large.png b/PlayWall/src/main/resources/de/tobias/playpad/assets/gfx/Logo-large.png
new file mode 100755
index 0000000000000000000000000000000000000000..eaefe5012f62822c47593d9a5205ffec9b14f412
Binary files /dev/null and b/PlayWall/src/main/resources/de/tobias/playpad/assets/gfx/Logo-large.png differ
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/lang/_de.properties b/PlayWall/src/main/resources/de/tobias/playpad/assets/lang/_de.properties
new file mode 100755
index 0000000000000000000000000000000000000000..a7299229a485cc25020bb83e08551cecb16b0dea
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/lang/_de.properties
@@ -0,0 +1,258 @@
+# Hier sind Sachen, die dynamisch im Code verwendet werden. Also wenn eine spezielle Aktionen ist. Beispielsweise Fehlermeldung und Hinweise. Die Sachen sind aber trotzdem in der UI.
+#Kommentare befinden sich immer -->\u00DCBER<-- dem jeweiligen Eintrag
+# Standard - File
+Standard.File.Save=Gespeichert
+Standard.Copy={} - Kopie
+Standard.Time.Seconds={} sek
+Standard.Time.Volume={} %
+# File - Filter
+File.Filter.ZIP=Archiv
+File.Filter.Media=Medien
+File.Filter.Preset=Vorlagen
+# Timemode - Enum
+Pad.TimeMode.PLAYED=Abgelaufene Zeit
+Pad.TimeMode.REST=Verbleibende Zeit
+Pad.TimeMode.BOTH=Abgelaufende Zeit / Gesamtzeit
+# UI - Window - Titles
+UI.Dialog.Launch.Title=Projekt w\u00E4hlen...
+UI.Dialog.Login.Title=Anmeldung
+UI.Window.Main.Title=Play Wall [Projekt: {} - Profil: {}]
+UI.Window.Settings.Title=Einstellungen - {}
+UI.Window.ProjectSettings.Title=Projekteinstellungen
+UI.Window.GlobalSettings.Title=Programmeinstellungen
+UI.Window.PadSettings.Title=Kacheleinstellungen - {} | {}
+UI.Window.PadSettings.Title.Empty=Kacheleinstellungen - {}
+UI.Dialog.ProjectExport.Title=Projekt exportieren
+UI.Dialog.ProjectImport.Title=Projekt importieren
+UI.Dialog.NotFound.Title=Dateiverkn\u00FCpfung
+UI.Dialog.NewProfile.Title=Neues Profil
+UI.Dialog.NewProject.Title=Neues Projekt
+UI.Dialog.ChooseProfile.Title=Profil w\u00E4hlen
+UI.Dialog.ProjectManager.Title=Projektverwaltung
+UI.Dialog.Plugins.Title=Erweiterungen
+UI.Dialog.Print.Title=Drucken
+UI.Dialog.Profile.Title=Profilverwaltung
+UI.Dialog.PlayoutLog.Title=PlayoutLog
+# UI - Standard
+UI.Standard.DoNotShow=Nicht mehr anzeigen
+# UI - Layout - Classic - Theme - Enum
+UI.Layout.Classic.Theme.DARK=Dunkel
+UI.Layout.Classic.Theme.TWILIGHT=Dunkelblau (Twilight)
+UI.Layout.Classic.Theme.LIGHT=Hell
+# UI - Window - Main
+UI.Window.Main.CloseRequest=Es wird gerade noch Musik abgespielt. M\u00F6chten Sie PlayWall trotzdem beenden?
+UI.Window.Main.SaveRequest=M\u00F6chten Sie die \u00C4nderungen speichern?
+UI.Window.Main.PageButton=Seite {}
+# UI - Dialog - Launch
+UI.Dialog.Launch.Info={} - {}
+# UI - Dialog - ProjectLoad
+UI.Dialof.ProjectLoad.StartProject=Das Projekt wird geladen.
+UI.Dialof.ProjectLoad.StartPad=Die Datei '{}' wird geladen.
+# UI Window - Settings
+UI.Window.Settings.Gen.Title=Allgemein
+UI.Window.Settings.Gen.CacheSize=Gr\u00F6\u00DFe: {}B
+UI.Window.Settings.Gen.Wait=Die \u00C4nderungen werden \u00FCbernommen. Das kann einen kurzen Moment dauern.
+UI.Window.Settings.Mapping.Title=Mapping
+UI.Window.Settings.Midi.Title=Midi
+UI.Window.Settings.Layout.Title=Layout
+UI.Window.Settings.Player.Title=Player
+UI.Window.Settings.Audio.Title=Audio
+UI.Window.Settings.Updates.Title=Aktualisierung
+UI.Window.Settings.Keys.Title=Tastenkombinationen
+UI.Window.Settings.Paths.Title=Ordner
+# UI - Settings - Keys
+UI.Settings.Keys.Conflict.Header=Tastenkombination bereits verwendet
+UI.Settings.Keys.Conflict.Content=Diese Tastenkombination wird bereits verwendet f\u00FCr: \n{}
+# UI - Dialog - NewProfile
+UI.Dialog.NewProfile.Content=Geben Sie einen Namen f\u00FCr das neue Profil ein:
+# UI - Dialog - NewProject
+UI.Dialog.NewProject.Content=Geben Sie einen Namen f\u00FCr das neue Projekt ein:
+UI.Dialog.NewProject.MediaPath=Sie m\u00FCssen erst einen Ordner f\u00FCr die Mediendateien festlegen, bevor das Projekt erstellt werden kann.
+# UI - Dialog - Import
+UI.Dialog.Import.ReplaceProfile.Content=Es gibt bereits eine Profil mit dem Namen {}. Bitte geben Sie einen anderen Namen ein.
+UI.Dialog.Import.ReplaceProfile.Skip=Profil nicht importieren
+UI.Dialog.Import.ReplaceProfile.Rename=Umbenennen
+UI.Dialog.Import.ReplaceProfile.ReplaceContent=Es gibt bereits ein Profil mit dem Namen {}.\nBitte geben Sie einen anderen Namen ein.
+UI.Dialog.Import.ReplaceProject.ReplaceContent=Es gibt bereits ein Projekt mit dem Namen {}.\nBitte geben Sie einen anderen Namen ein.
+UI.Dialog.Import.ReplaceMedia.Content=M\u00F6chten Sie die Mediendaten von diesem Projekt importieren?
+UI.Dialog.Import.ReplaceMedia.Copy=Ja
+UI.Dialog.Import.ReplaceMedia.Skip=Nein
+# UI - Dialog - ProjectManager
+UI.Dialog.ProjectManager.Delete.Header=Projekt wirklich l\u00F6schen?
+UI.Dialog.ProjectManager.Delete.Content=M\u00F6chten Sie das Projekt "{}" auf allen Ger\u00E4ten unwiederbringlich l\u00F6schen?
+# UI - Dialog - Project Convert
+UI.Dialog.Project.Convert.Header=Altes Projekt importieren
+UI.Dialog.Project.Convert.Content=W\u00E4hlen Sie ein altes Projekt zum importieren aus:
+# UI - Dialog - Profile
+UI.Dialog.Profile.Delete.Content=Sind Sie sicher, dass Sie das Profil {} l\u00F6schen m\u00F6chten?
+# UI - Dialog - Info
+UI.Dialog.About.Graphics=Robert Goldmann
+UI.Dialog.About.Libraries=ControlsFX (8.40.10), dom4j (1.6.1), snakeyaml (1.11), guava (15.0), gagawa (1.0.1), TinySound (1.1.1), JLayer (1.0.1), JSPF (1.0.2), json-smart (1.2).
+UI.Dialog.About.Website=playwall.thecodelabs.de
+UI.Dialog.About.Code=thecodelabs.de/PlayWall/PlayWallDesktop
+# UI - Dialog - Feedback
+UI.Dialog.Feedback.Content=Der Fehlerbericht wird \u00DCbermittelt, dies kann einen Augenblick dauern. Ihre Nummer wird am Ende angezeigt.
+# UI - Placeholder
+UI.Placeholder.Project=Keine Projekte vorhanden
+UI.Placeholder.Preset=Keine Vorlagen vorhanden
+UI.Placeholder.Plugins=Keine Erweiterungen vorhanden
+UI.Placeholder.Updates=Es sind keine Aktualisierungen verf\u00FCgbar
+# Info - MIDI
+Info.Midi.Device.Connected=Midi-Ger\u00E4t erkannt ({})
+# Info - Settings
+Info.Settings.ResetWarning=Die Einstellungen wurden zur\u00FCckgesetzt.
+Info.Settings.CacheDelete={} Datei(en) wurden gel\u00F6scht.
+# Info - Print
+Info.Print.Header={} - {}
+# Error - Standard
+Error.Standard.Gen=Es ist ein Fehler aufgetreten. Bitte versuchen Sie es sp\u00E4ter erneut. ({})
+Error.Standard.NameInUse=Der Name {} ist bereits vorhanden. Bitte w\u00E4hlen Sie einen anderen Namen.
+# Error - Settings
+Error.Settings.CacheSize=Die Gr\u00F6\u00DFe des Cache kann nicht bestimmt werden. ({})
+Error.Settings.CacheClear=Beim L\u00F6schen des Caches ist ein Fehler aufgetreten. ({})
+# Error - Profile
+Error.Profile.Create=Das Profil konnte aufgrund eines Fehlers nicht erstellt werden. ({})
+Error.Profile.NotFound=Das Profil konnte nicht geladen werden, da die ben\u00F6tigten Dateien fehlen. W\u00E4hlen Sie eine anderes Profile aus und \u00F6ffnen Sie das Projekt erneut. ({})
+Error.Profile.Save=Das Profil konnte aufgrund eines Fehlers nicht gespeichert werden. ({})
+Error.Profile.Delete=Das Projekt konnte nicht gel\u00F6scht werden. ({})
+# Error - Preset
+Error.Preset.Import=Es ist ein Fehler beim Importieren der Vorlage aufgetreten. ({})
+Error.Preset.Export=Die Vorlage konnte nicht exportiert werden. ({})
+# Error - Project
+Error.Project.Create=Das Projekt konnte nicht erstellt werden. ({})
+Error.Project.Convert=Das alte Projekt konnte nicht in das neue Format gewandelt werden. ({})
+Error.Project.NotFound=Das Projekt {} konnte nicht ge\u00F6ffnet werden, da die Projektdatei nicht gefunden wurde. ({})
+Error.Project.Open=Das Projekt {} konnte nicht ge\u00F6ffnet werden. ({})
+Error.Project.Save=Das Projekt {} konnte nicht gespeichert werden. ({})
+Error.Project.Rename=Das Projekt konnte nicht umbenannt werden. ({})
+Error.Project.Delete=Das Projekt konnte nicht gel\u00F6scht werden. ({})
+Error.Project.Export=Das Projekt {} konnte nicht exportiert werden. ({})
+Error.Project.Import=Das Projekt konnte nicht importiert werden.
+Error.Project.MediaPath=Der neue Ordner darf kein Unterodner des alten Medienordners sein.
+Error.Project.PageCount=Sie k\u00F6nnen nicht mehr als 8 Seiten erstellen.
+Error.Project.Sync.Change=Es ist ein Fehler aufgetreten. Versuchen Sie es sp\u00E4ter noch ein mal. ({})
+# Error - Pad - Enum
+Error.Pad.FILE_NOT_FOUND=Die Datei {} konnte nicht gefunden werden.
+Error.Pad.FILE_FORMAT_NOT_SUPPORTED=Die Datei {} ist nicht kompatibel.
+Error.Pad.CONVERT_NOT_SUPPORTED=Die Datei {} kann nicht umgewandelt werden. W\u00E4hlen Sie ein anderes Format zum Import aus.
+Error.Pad.UNKOWN=Es ist ein unbekannter Fehler aufgetreten. {}
+Error.Pad.UNKOWN_CONTENT_TYPE=Die Kachel {} konnte nicht geladen werden.
+# Error - Midi
+Error.Midi.Settings.Unknown=F\u00FCr die ausgew\u00E4hlte Seite sind keine Midi Einstellungen aktiv. Gehen Sie in die Einstellungen, um Midi zu aktivieren.
+Error.Midi.Device.Busy=Das Midi-Ger\u00E4t wird bereits durch ein anderes Programm verwendet. ({})
+Error.Midi.Device.Unavailable=Das Midi-Ger\u00E4t {} konnte nicht gefunden werden.
+Error.Midi.Record.Fail=Die gedr\u00FCckte Taste wird bereits verwendet.
+Error.Midi.Send=Der Midi Befehl konnte nicht gesendet werden. ({})
+# Error - Plugins
+Error.Plugins.Missing=Es wurden im Projekt Erweiterungen verwendet, welche momentan nicht installiert sind. Sie k\u00F6nnen das Projekt dennoch \u00F6ffnen, es kann aber zu Fehlern dabei kommen, wenn Sie folgende Erweiterungen nicht installiert haben.
+# Error - Screen
+Error.Screen.TooMuch=Maxiamle Anzahl der Kacheln {}
+Error.Screen.TooLess=Minmale Anzahl der Kacheln {}
+#Mapper
+Mapper.Keyboard.Name=Tastatur
+Mapper.Midi.Name=Midi
+Mapper.Keyboard.toString=Tastatur {}
+Mapper.Midi.toString=Midi {}
+# Info - Mapper
+# Das ist Midi und Tastatur gemeinsam
+Info.Mapper.PressKey=Dr\u00FCcken Sie eine Taste auf dem Ger\u00E4t.
+#UI - Settings - Alerts
+UI.Settings.Alert.NewKeyShortcut.Text=Dr\u00FCcken Sie bitte die gew\u00FCnschte Tastenkombination. \nDieses kann aus Buchstaben, Ziffern und/oder den F-Tasten bestehen.
+# UI - Window - PadSettings
+UI.Window.PadSettings.General.Title=Allgemein
+UI.Window.PadSettings.Player.Title=Player
+UI.Window.PadSettings.Layout.Title=Layout
+UI.Window.PadSettings.Trigger.Title=Trigger
+# Actions
+Action.Cart.toString=Kachel {}
+Action.Page.toString=Seite {}
+Action.Navigate.toString={}
+Action.Cart.Name=Kacheln
+Action.Stop.Name=Stop
+Action.Page.Name=Seiten
+Action.Navigate.Name=Navigation
+#Content
+Content.Empty=
+Content.Audio.Name=Audio
+# NavigationType - Enum
+NavigationType.PREVIOUS=Vorherige Seite
+NavigationType.NEXT=N\u00E4chste Seite
+# CartAction - Enum
+CartAction.Mode.PLAY_STOP=Play/Stop
+CartAction.Mode.PLAY_PAUSE=Play/Pause
+CartAction.Mode.PLAY_HOLD=Play/Hold
+CartAction.Mode.PLAY_PLAY=Play/Play
+#UI - Dialog - AutoUpdate
+UI.Dialog.AutoUpdate.Header=Aktualisierung
+UI.Dialog.AutoUpdate.Content=Es sind Aktualisierungen verf\u00FCgbar. M\u00F6chten Sie diese jetzt installieren?\n{}
+UI.Dialog.AutoUpdate.Title=Aktualisierung
+UI.Dialog.AutoUpdate.Checkbox=Diese Aktualisierung nicht mehr anzeigen.
+UI.Dialog.AutoUpdate.Button.Update=Jetzt aktualisieren
+UI.Dialog.AutoUpdate.Button.Cancel=Jetzt nicht aktualisieren
+#UI - Dialog - Save
+UI.Dialog.Save.Header=Speichern
+UI.Dialog.Save.Content=M\u00F6chten Sie das Projekt speichern?
+UI.Dialog.Save.Title=Speichern
+UI.Dialog.Save.Checkbox=Immer automatisch speichern und diesen Dialog nicht mehr anzeigen.
+UI.Dialog.Save.Button.Yes=Ja
+UI.Dialog.Save.Button.No=Nein
+UI.Dialog.Save.Button.Cancel=Abbrechen
+# Update Channel - BaseName
+UpdateChannel.STABLE=Stabil
+UpdateChannel.BETA=Beta
+# Error - Layout
+Error.Layout.Load=Es gab einen Fehler beim Laden des Layouts ({})
+# UI - Dialog - Update
+UI.Dialog.Update.Cell={}: Installiert: {} - Neu: {}
+UI.Dialog.Update.Info=Die Aktualisierung wird vorbereitet. Bitte schlie\u00DFen Sie nicht das Programm. \nDieser Vorgang kann wenige Minuten dauern.
+UI.Window.Settings.Updates.CurrentVersion={} (Build {})
+# Layout
+Layout.Modern.Name=Modern
+Layout.Classic.Name=Klassisch
+# Trigger
+TriggerPoint.toString={} ({})
+Trigger.Cart.Name=Kacheln
+Trigger.Volume.Name=Lautst\u00E4rke
+# TriggerPoint - Enum
+TriggerPoint.START=Start
+TriggerPoint.EOF_STOP=Ende/Stop
+# Drag and Drop Mode
+DnDMode.Replace=Ersetzen
+DnDMode.Duplicate=Duplizieren
+DnDMode.Move=Tauschen
+# Main Layout
+MainLayout.Desktop=Desktopmodus
+MainLayout.Touch=Touchmodus
+# Suche
+Search.Button=Suchen
+Search.Placeholder=Suche
+Search.Alert.NoMatches=Keine Treffer gefunden.
+# UI - Dialog - Page - Delete
+UI.Dialog.Page.Delete.Header=Seite l\u00F6schen
+UI.Dialog.Page.Delete.Content=M\u00F6chten Sie die Seite unwiederbringlich l\u00F6schen?
+# UI - Dialog - Name - Delete
+UI.Dialog.Page.Name.Header=Seite umbenennen
+UI.Dialog.Page.Name.Content=Geben Sie einen Namen f\u00FCr die Seite ein.
+# UI - Dialog - PathMatch
+UI.Dialog.PathMatch.Status={} fehlende Pfade
+# Tooltips
+Tooltip.PlayButton=Wiedergabe
+Tooltip.DragButton=Kacheln verschieben
+Tooltip.PageButton=Seiten bearbeiten
+Tooltip.ColorButton=Kacheln einf\u00E4rben
+Tooltip.Page.LeftMove=Nach links verschieben
+Tooltip.Page.RightMove=Nach rechts verschieben
+Tooltip.Page.Rename=Umbenennen
+Tooltip.Page.Clone=Duplizieren
+Tooltip.Page.Delete=L\u00F6schen
+# Audio Features
+EQUALIZER=Equalizer:
+SOUNDCARD=Soundkarte:
+#AudioHandler
+AudioHandler.JavaFX=JavaFX
+AudioHandler.TinySound=TinySound
+# Server
+Server.Connected=Mit dem Server verbunden.
+Server.Connection_Lost=NICHT mit dem Server verbunden.
+Server.Disconnected=Anmeldung erforderlich.
+Auth.Logout=Alle Onlineprojekte sind nicht mehr lokal verf\u00FCgbar. \nPlayWall wird beendet.
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/lang/ui_de.properties b/PlayWall/src/main/resources/de/tobias/playpad/assets/lang/ui_de.properties
new file mode 100755
index 0000000000000000000000000000000000000000..7bf7cffc962fcc1584409b6e5f1536c1a9c6bed2
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/lang/ui_de.properties
@@ -0,0 +1,216 @@
+#Sprachdatei f\u00FCr die Benutzeroberfl\u00E4che
+#Kommentare befinden sich immer -->\u00DCBER<-- dem jeweiligen Eintrag
+main.menu.file=Datei
+main.menu.option=Optionen
+main.menu.view=Ansicht
+main.menu.info=Info
+main.menu.extension=Erweitert
+main.menu.help=Hilfe
+main.menuitem.new=Neues Projekt...
+main.menuitem.project=Projekte verwalten...
+main.menuitem.save=Projekt speichern...
+main.menuitem.recentFiles=Zuletzt verwendete Projekte
+main.menuitem.profile=Profile verwalten...
+main.menuitem.print=Drucken...
+main.menuitem.logout=Logout...
+main.menuitem.onTop=Fenster im Vordergrund
+main.menuitem.editmode=Modus
+main.menuitem.play=Wiedergabe
+main.menuitem.drag=Kacheln verschieben
+main.menuitem.page=Seiten bearbeiten
+main.menuitem.color=Kacheln einf\u00E4rben
+main.menuitem.notfound=Dateiverkn\u00FCpfung...
+main.menuitem.log=Playout Log...
+main.menuitem.plugins=Erweiterungen...
+main.menuitem.projectSettings=Projekteinstellungen...
+main.menuitem.profileSettings=Profileinstellungen...
+main.menuitem.globalSettings=Programmeinstellungen...
+main.menuitem.about=\u00DCber Play Wall...
+main.menuitem.changelog=Changelog anzeigen...
+main.menuitem.website=Webseite anzeigen...
+main.menuitem.fullScreen=Vollbild
+main.menuitem.searchPad=Kachel suchen...
+main.label.live=Live
+settings.gen.label.behaviour=Programmstart:
+settings.gen.checkbox.openLastDocument=Automatisch zuletzt geladenes Projekt \u00F6ffnen.
+settings.gen.label.view=Ansicht:
+settings.gen.label.columns=Anzahl der Spalten:
+settings.gen.label.rows=Anzahl der Reihen:
+settings.gen.label.liveMode=Live Modus:
+settings.gen.checkbox.liveMode=Aktivieren
+settings.gen.label.liveMode.settings=Einstellungen \u00E4ndern:
+settings.gen.label.liveMode.media=Mediadateien \u00E4ndern:
+settings.gen.label.liveMode.dragPads=Kacheln verschieben:
+settings.gen.label.liveMode.pageChange=Seite wechseln:
+settings.gen.radio.liveMode.enable=Verbieten
+settings.gen.radio.liveMode.disable=Erlauben
+settings.gen.label.liveModeInfo=Der Live Modus verhindert ausgew\u00E4hlte Aktionen w\u00E4hrend der Wiedergabe.
+settings.gen.warning.button.reset=Hinweismeldungen zur\u00FCcksetzen
+settings.gen.cache.label=Cachespeicher:
+settings.gen.cache.button.choose=W\u00E4hlen
+settings.gen.cache.button.reset=Cache leeren
+settings.gen.cache.label.info=Wenn Sie als Audioausgabetyp "Java Audiostream" gew\u00E4hlt haben, werden s\u00E4mtliche MP3-Dateien in eine WAV-Dateien umgewandelt. Diese wird dann in den oben angegebenen Ordner abgelegt. Sollten Sie viele Dateien aus Ihrem Projekt gel\u00F6scht haben, k\u00F6nnen Sie den Cache leeren, um den ben\u00F6tigten Speicherplatz zu verringern. Ben\u00F6tigte Dateien werden automatisch neu umgewandelt, falls sie nicht (mehr) existieren.
+settings.mapping.label.mapping=Mapping:
+settings.mapping.button.edit=Bearbeiten...
+settings.mapping.button.edit.new=Neu...
+settings.mapping.button.edit.rename=Umbenennen...
+settings.mapping.button.edit.delete=L\u00F6schen...
+settings.mapping.button.edit.import=Importieren...
+settings.mapping.button.edit.export=Exportieren...
+settings.mapping.button.edit.duplicate=Duplizieren...
+settings.midi.label.midiDeviceImpl=Midi-Ger\u00E4te:
+settings.player.label.modus=Wiedergabemodus:
+settings.player.checkbox.modus=Mehrere Player gleichzeitig wiedergeben
+settings.player.label.warning=Warnhinweise:
+settings.player.label.fade=Ein-/Ausblenden:
+settings.player.label.fadeIn=Einblenden (in s):
+settings.player.label.fadeOut=Ausblenden (in s):
+settings.player.label.startIn=... nach Start
+settings.player.label.pauseIn=... bei Pause
+settings.player.label.pauseOut=... bei Pause
+settings.player.label.stopOut=... bei Stop/EoF
+settings.player.label.fadeInfo=Wird beim Ein- oder Ausblenden die Dauer auf 0 gesetzt, so findet keine \u00DCberblendung statt. Wenn die Datei zu Ende ist, findet kein Ausblenden statt.
+settings.player.label.timeDisplay=Zeitanzeige:
+settings.update.label.current=Installierte Version:
+settings.update.label.search=Nach Updates suchen:
+settings.update.label.available=Verf\u00FCgbare Updates:
+settings.update.button.search=Jetzt suchen
+settings.update.button.install=Aktualisieren und neu starten
+settings.update.label.channel=Update-Kanal:
+settings.update.label.infoC=Programm
+settings.update.label.infoE=Erweiterung
+settings.keys.label.headline=Tastenkombinationen
+settings.keys.label.name=Name:
+settings.keys.label.shortcut=Tastenkombination:
+settings.keys.button.change=\u00C4ndern
+settings.keys.button.delete=L\u00F6schen
+settings.keys.table.name=Name
+settings.keys.table.shortcut=Tastenkombination
+settings.keys.textfield.search=Suchen...
+settings.paths.label.media=Mediendateien:
+settings.paths.button.choose=W\u00E4hlen...
+settings.paths.checkbox.mediaActive=Mediendateien beim Import in den Medienordner kopieren
+settings.button.finish=Fertig
+settings.checkbox.activate=Aktivieren
+layout.label.programmLayout=Programmlayout:
+layout.label.customLayout=Eigenes Layout:
+layout.label.baseColor=Akzentfarbe:
+layout.label.background=Hintergrund:
+layout.label.playground=Hintergrund w\u00E4hrend Wiedergabe:
+layout.label.fadeColor=Hintergrund w\u00E4hrend Ausblenden:
+layout.label.warnColor=Warnhinweis:
+layout.label.color=Farbe:
+layout.label.fontSize=Schriftgr\u00F6\u00DFe:
+layout.label.infoLabel=Kopfzeile:
+layout.label.titleLabel=Titel:
+layout.label.animation=Animationen:
+layout.label.warnAnimation=Warnhinweise
+layout.button.reset=Zur\u00FCcksetzen
+layout.label.option=Optionen:
+layout.checkbox.flat=Flat Design
+midi.label.key=Taste (Midi):
+midi.button.new=\u00C4ndern
+keyboard.label.key=Taste (Tastatur):
+keyboard.button.new=\u00C4ndern
+padSettings.button.delete=L\u00F6schen
+padSettings.button.path=Pfad zeigen
+padSettings.gen.label.title=Titel:
+padSettings.gen.label.volume=Lautst\u00E4rke:
+padSettings.gen.label.timeDisplay=Zeitanzeige:
+padSettings.gen.checkbox.customSettings=Eigene Einstellungen
+padSettings.checkbox.loop=Wiederholen
+padSettings.button.finish=Fertig
+padSettings.player.label.warning=Warnhinweise:
+padSettings.player.label.fade=Ein-/Ausblenden:
+padSettings.layout.label.custom=Eigenes Layout:
+padSettings.layout.checkbox.custom=Aktiviert
+project.label.details=Projektinformationen:
+project.label.name=Name:
+project.label.profile=Profil:
+project.label.cloud=Cloud:
+project.label.status=
+project.checkbox.sync=Synchronisation aktivieren
+project.button.sync=Cloud-Einstellungen....
+project.label.management=Verwaltung:
+project.label.share=
+project.button.export=Projekt exportieren...
+project.button.import=Projekt importieren...
+project.button.duplicate=Projekt duplizieren...
+project.label.delete=
+project.button.delete=Projekt l\u00F6schen...
+project.button.cancel=Abbrechen
+project.button.open=\u00D6ffnen
+project.export.label.headline=Projekt exportieren:
+project.export.checkbox.profile=Aktuell verwendetes Profil exportieren
+project.export.checkbox.media=Aktuell verwendete Medieninhalte exportieren
+project.export.button.cancel=Abbrechen
+project.export.button.save=Exportieren
+project.import.label.project=Projekt:
+project.import.label.profile=Profil:
+project.import.label.media=Medien:
+project.import.label.name=Name:
+project.import.label.path=Mediendateien:
+project.import.label.sync=
+project.import.checkbox.sync=Cloud-Sychronisation aktivieren
+project.import.checkbox.profile=Profil importieren
+project.import.checkbox.media=Medien importieren
+project.import.button.choose=Ordner ausw\u00E4hlen...
+project.import.button.cancel=Abbrechen
+project.import.button.import=Importieren
+launch.button.import=Projekt importieren
+launch.button.convert=Projekt aus Version 6.1 importieren
+launch.button.new=Neues Projekt
+launch.button.open=\u00D6ffnen
+launch.button.delete=L\u00F6schen
+login.label.auth=Authentifizierung erforderlich
+login.button.login=Anmelden
+login.button.create=Account erstellen
+login.label.username=E-Mail:
+login.label.password=Passwort:
+login.label.info=Hinweis:
+profile.label.name=Name:
+profile.label.info=Ein Profil umfasst alle Einstellungen des Programmes, beispielsweise das Aussehen, die Midi-Einstellungen oder die Audioeinstellungen. Sie k\u00F6nnen jederzeit f\u00FCr ein Projekt das Profil wechseln.
+profile.label.headline=Einstellungen:
+profile.button.new=Neu
+profile.button.delete=L\u00F6schen
+profile.button.duplicate=Duplizieren
+profile.button.choose=Profil w\u00E4hlen
+warning.label.time=Warnhinweis ab Restdauer: (Sek)
+print.label.page=Seite:
+print.button.cancel=Abbrechen
+print.button.print=Drucken
+settings.audio.type=Ausgabetype w\u00E4hlen:
+newProject.label.name=Name:
+newProject.label.sync=
+newProject.checkbox.sync=Cloud-Synchronisation aktivieren
+newProject.label.profile=Profil:
+newProject.button.newProfile=Neues Profil...
+newProject.button.finish=Projekt erstellen
+newProject.button.cancel=Abbrechen
+newProfile.label.name=Name:
+newProfile.label.info=Geben Sie den Namen f\u00FCr das neue Profile ein.
+newProfile.button.finish=Profil erstellen
+newProfile.button.cancel=Abbrechen
+profileChoose.label.info=Das verwendete Profil wurde nicht gefunden.\nBitte w\u00E4hlen Sie ein anderes Profil aus, welches verwendet werden soll.
+profileChoose.button.finish=Profil w\u00E4hlen
+doubleFeedback.label.colorEvent=Eventfarbe:
+doubleFeedback.label.colorDefault=Standardfarbe:
+cartAction.label.headline=Einstellungen zur Kachel:
+cartAction.label.type=Typ:
+cartAction.label.autoColor=Feedback-Farbe wie Layout:
+cartAction.checkbox.autoColor=Aktivieren
+action.mapper.headline=Einstellungen zum Mapping:
+errorSummary.label.headline=Fehlerzusammenfassung:
+errorSummary.column.cart=Kachel
+errorSummary.column.des=Fehlerbeschreibung
+errorSummary.column.solution=L\u00F6sungsvorschl\u00E4ge
+errorSummary.button.close=Schlie\u00DFen
+tinysound.label.soundcard=Soundkarte:
+triggertime.label.time=Zeit vom Trigger: (Sek)
+carttrigger.label.action=Aktion f\u00FCr Kacheln:
+carttrigger.label.carts=Kacheln:
+carttrigger.checkbox.all=Alle anderen Kacheln
+carttrigger.label.add.placeholder=Hinzuf\u00FCgen (Name der Kachel)
+carttrigger.button.add=Hinzuf\u00FCgen
+volumetrigger.label.volume=Lautst\u00E4rke:
+volumetrigger.label.duration=\u00DCberblenddauer:
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/modern_style.css b/PlayWall/src/main/resources/de/tobias/playpad/assets/modern_style.css
new file mode 100644
index 0000000000000000000000000000000000000000..a0295f485ea5244b3df9cf7e280f6520b5218fce
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/modern_style.css
@@ -0,0 +1,144 @@
+.root {
+ -fx-base: rgb(30, 30, 30);
+}
+
+.deleteButton {
+ -fx-background-color: transparent;
+ -fx-padding: 0;
+}
+
+.pad:drag {
+ -fx-opacity: 0.8;
+}
+
+.text-field:error {
+ -fx-text-box-border: red;
+ -fx-focus-color: red;
+}
+
+.live-label {
+ -fx-text-fill: red !important;
+}
+
+.pad {
+ -fx-background-radius: 10px;
+
+ -fx-border-color: rgb(20, 20, 20);
+ -fx-border-width: 2px;
+ -fx-border-radius: 8px;
+
+ -fx-padding: 5 10 5 10;
+}
+
+.pad-root {
+ -fx-spacing: 4px;
+}
+
+.pad-button-box {
+ -fx-spacing: 0px;
+}
+
+.pad-grid {
+ -fx-background-color: rgb(60, 60, 60);
+
+ -fx-hgap: 6px;
+ -fx-vgap: 6px;
+
+ -fx-padding: 6px;
+}
+
+.pad-info {
+ -fx-text-fill: white;
+ -fx-font-size: 15px;
+}
+
+.pad-button {
+ -fx-background-color: transparent;
+ -fx-border-color: transparent;
+}
+
+.pad-button:hover {
+ -fx-background-color: transparent;
+ -fx-border-width: 1px;
+ -fx-border-color: rgb(30, 30, 30, 0.5);
+ -fx-border-radius: 10px;
+}
+
+.pad-button:pressed {
+ -fx-background-color: transparent;
+ -fx-border-width: 1px;
+ -fx-border-color: black;
+ -fx-border-radius: 10px;
+}
+
+.pad-button:selected {
+ -fx-background-color: transparent;
+ -fx-border-width: 1px;
+ -fx-border-color: black;
+ -fx-border-radius: 10px;
+}
+
+.pad-notfound {
+ -fx-text-fill: red !important;
+}
+
+.fonticon-notfound:pressed {
+ -fx-text-fill: lightgray;
+}
+
+/* Needed ? */
+.font-icon:selected {
+ -fx-text-fill: red;
+}
+
+.fonticon {
+ -fx-text-fill: white;
+ -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.5), 4, 0.1, 1, 1);
+}
+
+/*Old Progress Bar*/
+/*.pad-playbar .bar {*/
+/*-fx-background-color: white;*/
+/*-fx-padding: 0.5em;*/
+/**/
+/*-fx-background-radius: 10px; */
+/*}*/
+
+/*.pad-playbar .track { */
+/*-fx-base: black;*/
+/*-fx-background-radius: 10px; */
+/*}*/
+
+/*.pad-playbar {*/
+/*-fx-background-radius: 10px;*/
+/*-fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.5), 8, 0.5, 2, 2);*/
+/*}*/
+
+.progress-bar > .bar {
+ -fx-background-insets: 1 1 1 1;
+ -fx-padding: 0.30em;
+}
+
+.tool-bar {
+ -fx-base: rgb(60, 60, 60);
+}
+
+.menu-bar {
+ -fx-base: rgb(60, 60, 60);
+}
+
+.current-page-button {
+ -fx-base: lightgray;
+}
+
+.slider .thumb {
+ -fx-base: white;
+}
+
+.volume-item {
+ -fx-text-fill: white !important;
+}
+
+.progress-indicator .percentage {
+ -fx-fill: white;
+}
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/settings/fadeView.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/settings/fadeView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..41b62886108419caa49806c4e3d2b6b21080ad40
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/settings/fadeView.fxml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox prefWidth="500.0" spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="14.0" layoutY="19.0" prefWidth="150.0"
+ text="%settings.player.label.fadeIn" textAlignment="RIGHT"/>
+ <VBox spacing="14.0" HBox.hgrow="ALWAYS">
+ <children>
+ <HBox spacing="14.0">
+ <children>
+ <Slider fx:id="fadeInSlider" blockIncrement="0.1" majorTickUnit="1.0" max="10.0"
+ maxWidth="1.7976931348623157E308" minorTickCount="9" showTickLabels="true"
+ showTickMarks="true" snapToTicks="true" HBox.hgrow="ALWAYS"/>
+ <Label fx:id="fadeInLabel" prefWidth="75.0"/>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <CheckBox fx:id="fadeInStartCheckBox" mnemonicParsing="false"
+ text="%settings.player.label.startIn"/>
+ <CheckBox fx:id="fadeInPauseCheckBox" mnemonicParsing="false"
+ text="%settings.player.label.pauseIn"/>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="14.0" layoutY="53.0" prefWidth="150.0"
+ text="%settings.player.label.fadeOut" textAlignment="RIGHT"/>
+ <VBox spacing="14.0" HBox.hgrow="ALWAYS">
+ <children>
+ <HBox spacing="14.0">
+ <children>
+ <Slider fx:id="fadeOutSlider" blockIncrement="0.1" majorTickUnit="1.0" max="10.0"
+ maxWidth="1.7976931348623157E308" minorTickCount="9" showTickLabels="true"
+ showTickMarks="true" snapToTicks="true" HBox.hgrow="ALWAYS"/>
+ <Label fx:id="fadeOutLabel" prefWidth="75.0"/>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <CheckBox fx:id="fadeOutPauseCheckBox" mnemonicParsing="false"
+ text="%settings.player.label.pauseOut"/>
+ <CheckBox fx:id="fadeOutStopCheckBox" mnemonicParsing="false"
+ text="%settings.player.label.stopOut"/>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ <Label maxWidth="1.7976931348623157E308" text="%settings.player.label.fadeInfo" wrapText="true"
+ VBox.vgrow="ALWAYS">
+ <VBox.margin>
+ <Insets left="164.0"/>
+ </VBox.margin>
+ </Label>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/settings/warningFeedbackSettingsView.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/settings/warningFeedbackSettingsView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..115ed50e46fbf3987e97541afe8bd1782b246400
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/settings/warningFeedbackSettingsView.fxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Slider?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="14.0" layoutY="14.0" prefWidth="150.0"
+ text="%warning.label.time" textAlignment="RIGHT" wrapText="true" AnchorPane.leftAnchor="14.0"/>
+ <Slider fx:id="warningFeedbackTimeSlider" blockIncrement="0.1" majorTickUnit="1.0" max="10.0"
+ minorTickCount="9" showTickLabels="true" showTickMarks="true" snapToTicks="true" value="5.0"
+ HBox.hgrow="ALWAYS"/>
+ <Label fx:id="warningFeedbackTimeLabel" prefWidth="75.0"/>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/style.css b/PlayWall/src/main/resources/de/tobias/playpad/assets/style.css
new file mode 100644
index 0000000000000000000000000000000000000000..a413e0b0b09f343ba8c67dbcfe57178906ccca58
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/style.css
@@ -0,0 +1,46 @@
+.text-field:error {
+ -fx-text-box-border: red;
+ -fx-focus-color: red;
+}
+
+.color-view-item {
+ -fx-stroke: black;
+ -fx-stroke-width: 2;
+ -fx-arc-height: 7.5;
+ -fx-arc-width: 7.5;
+}
+
+.color-view-item:hover {
+ -fx-stroke: DARKRED;
+}
+
+.color-view-item:pressed {
+ -fx-stroke: RED;
+}
+
+.dnd-file-option {
+ -fx-text-fill: white;
+}
+
+.dnd-file-option:drag {
+ -fx-text-fill: white;
+ -fx-border-width: 2px;
+ -fx-border-color: white;
+ -fx-border-radius: 10px;
+}
+
+.plugin-headline {
+ -fx-font-size: 20px;
+}
+
+.headline {
+ -fx-font-size: 16px;
+ -fx-font-weight: bold;
+}
+
+/*About Dialog*/
+.about-headline {
+ -fx-underline: true;
+ -fx-font-size: 30px;
+ -fx-font-weight: bold;
+}
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/style/Dark.css b/PlayWall/src/main/resources/de/tobias/playpad/assets/style/Dark.css
new file mode 100644
index 0000000000000000000000000000000000000000..95e178eca7dec2dd3675548eac349efeb06db41a
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/style/Dark.css
@@ -0,0 +1,97 @@
+.root {
+ -fx-base: rgb(40, 40, 40);
+ -fx-background: rgb(40, 40, 40);
+ -fx-control-inner-background: rgb(45, 45, 45);
+}
+
+.tab {
+ -fx-background-color: linear-gradient(to top, -fx-base, derive(-fx-base, 50%));
+}
+
+.tab:selected {
+ -fx-background-color: linear-gradient(to bottom, -fx-base, derive(-fx-base, 50%));
+}
+
+.menu-bar {
+ -fx-background-color: linear-gradient(to bottom, -fx-base, derive(-fx-base, 15%));
+}
+
+.menu:hover,
+.menu-item:hover,
+.menu:showing,
+.menu-item:focused,
+.list-view .list-cell:selected,
+.combo-box-popup .list-view .list-cell:filled:selected,
+.combo-box-popup .list-view .list-cell:filled:selected:hover,
+.combo-box-popup .list-view .list-cell:filled:hover {
+ -fx-background-color: rgb(70, 70, 70);
+ -fx-text-fill: white;
+}
+
+.tool-bar:horizontal {
+ -fx-background-color: linear-gradient(to bottom, derive(-fx-base, +20%), derive(-fx-base, +0%));
+ -fx-border: 1px 0px 1px 0px;
+ -fx-border-color: black;
+}
+
+.button {
+ -fx-base: black;
+}
+
+.button:hover {
+ -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
+ -fx-color: -fx-hover-base;
+}
+
+.table-view {
+ -fx-table-cell-border-color: derive(-fx-base, +10%);
+ -fx-table-header-border-color: derive(-fx-base, +20%);
+}
+
+.fonticon {
+ -fx-text-fill: red;
+}
+
+.label {
+ -fx-text-fill: white;
+ -fx-fill: white;
+}
+
+.pad-playbar {
+ -fx-accent: #ff0000ff;
+}
+
+.pad:play {
+ -fx-background-color: #aa5555bb;
+}
+
+.pad:warn {
+ -fx-background-color: #cc0000bb;
+}
+
+.pad:fade {
+ -fx-background-color: #99bb88bb;
+}
+
+.current-page-button {
+ -fx-base: lightgray;
+}
+
+/*Notification Bar*/
+.notification-pane.dark .notification-bar > .pane {
+ -fx-background-color: linear-gradient(#D6D6D6, #CCCCCC 37%, #ABABAB);
+ -fx-padding: 0 7 0 7;
+}
+
+.notification-pane.top .notification-bar > .pane {
+ -fx-background-insets: 0 0 0 0, 0 0 1 0, 0 0 2 0;
+}
+
+.notification-pane.bottom .notification-bar > .pane {
+ -fx-background-insets: 0 0 0 0, 1 0 0 0, 2 0 0 0;
+}
+
+.notification-pane .notification-bar > .pane .label {
+ -fx-font-size: 1.166667em; /*15px;*/
+ -fx-text-fill: #292929;
+}
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/style/Light.css b/PlayWall/src/main/resources/de/tobias/playpad/assets/style/Light.css
new file mode 100644
index 0000000000000000000000000000000000000000..44f1804847c45095ef91814c02d7f2dea8aa46da
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/style/Light.css
@@ -0,0 +1,73 @@
+.root {
+ /*-fx-base: rgb(40, 40, 40);*/
+ /*-fx-background: rgb(40, 40, 40);*/
+ /*-fx-control-inner-background: rgb(45, 45, 45);*/
+}
+
+.menu-bar {
+ -fx-background-color: linear-gradient(to bottom, -fx-base, derive(-fx-base, 15%));
+}
+
+.menu:hover,
+.menu-item:hover,
+.menu:showing,
+.menu-item:focused,
+.list-view .list-cell:selected,
+.combo-box-popup .list-view .list-cell:filled:selected,
+.combo-box-popup .list-view .list-cell:filled:selected:hover,
+.combo-box-popup .list-view .list-cell:filled:hover {
+ -fx-background-color: rgb(200, 200, 200);
+ -fx-text-fill: white;
+}
+
+.tool-bar:horizontal {
+ -fx-border: 1px 0px 1px 0px;
+ -fx-border-color: black;
+}
+
+.button:hover {
+ -fx-color: -fx-hover-base;
+}
+
+.table-view {
+ -fx-table-cell-border-color: derive(-fx-base, +10%);
+ -fx-table-header-border-color: derive(-fx-base, +20%);
+}
+
+.split-pane:horizontal > * > .split-pane-divider {
+ -fx-border-color: transparent -fx-base transparent -fx-base;
+ -fx-background-color: transparent, derive(-fx-base, 20%);
+ -fx-background-insets: 0, 0 1 0 1;
+}
+
+.fonticon {
+ -fx-text-fill: black;
+}
+
+.label {
+ -fx-text-fill: black;
+}
+
+.progress-bar {
+ -fx-accent: black;
+}
+
+.notification-pane.dark .notification-bar > .pane .label {
+ -fx-text-fill: #ebebeb;
+}
+
+.pad:play {
+ -fx-background-color: #aa5555bb;
+}
+
+.pad:warn {
+ -fx-background-color: #cc0000bb;
+}
+
+.pad:fade {
+ -fx-background-color: #ff9933bb;
+}
+
+.current-page-button {
+ -fx-base: lightgray;
+}
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/style/Twilight.css b/PlayWall/src/main/resources/de/tobias/playpad/assets/style/Twilight.css
new file mode 100644
index 0000000000000000000000000000000000000000..4959dfe3067a0517c7dcffe9b491cc764dc30bdd
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/style/Twilight.css
@@ -0,0 +1,95 @@
+.root {
+ -fx-base: rgb(40, 40, 50);
+ -fx-background: rgb(40, 40, 50);
+ -fx-control-inner-background: rgb(40, 40, 50);
+}
+
+.tab {
+ -fx-background-color: linear-gradient(to top, -fx-base, derive(-fx-base, 30%));
+}
+
+.tab:selected {
+ -fx-background-color: linear-gradient(to bottom, -fx-base, derive(-fx-base, 30%));
+}
+
+.menu-bar {
+ -fx-background-color: linear-gradient(to top, -fx-base, derive(-fx-base, 30%));
+}
+
+.menu:hover,
+.menu-item:hover,
+.menu:showing,
+.menu-item:focused,
+.list-view .list-cell:selected,
+.combo-box-popup .list-view .list-cell:filled:selected,
+.combo-box-popup .list-view .list-cell:filled:selected:hover,
+.combo-box-popup .list-view .list-cell:filled:hover {
+ -fx-background-color: rgb(70, 70, 90);
+ -fx-text-fill: white;
+}
+
+.tool-bar:horizontal {
+ -fx-background-color: linear-gradient(to bottom, derive(-fx-base, +20%), derive(-fx-base, +0%));
+}
+
+.button {
+ -fx-base: rgb(20, 20, 30);
+}
+
+.button:hover {
+ -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
+ -fx-color: -fx-hover-base;
+}
+
+.table-view {
+ -fx-table-cell-border-color: derive(-fx-base, +10%);
+ -fx-table-header-border-color: derive(-fx-base, +20%);
+}
+
+.fonticon {
+ -fx-text-fill: white;
+}
+
+.label {
+ -fx-text-fill: white;
+ -fx-fill: white;
+}
+
+.pad-playbar {
+ -fx-accent: white;
+}
+
+.pad:play {
+ -fx-background-color: #aa5555bb;
+}
+
+.pad:warn {
+ -fx-background-color: #cc0000bb;
+}
+
+.pad:fade {
+ -fx-background-color: #999988bb;
+}
+
+.current-page-button {
+ -fx-base: lightgray;
+}
+
+/*Notification Bar*/
+.notification-pane.dark .notification-bar > .pane {
+ -fx-background-color: linear-gradient(#D6D6D6, #CCCCCC 37%, #ABABAB);
+ -fx-padding: 0 7 0 7;
+}
+
+.notification-pane.top .notification-bar > .pane {
+ -fx-background-insets: 0 0 0 0, 0 0 1 0, 0 0 2 0;
+}
+
+.notification-pane.bottom .notification-bar > .pane {
+ -fx-background-insets: 0 0 0 0, 1 0 0 0, 2 0 0 0;
+}
+
+.notification-pane .notification-bar > .pane .label {
+ -fx-font-size: 1.166667em; /*15px;*/
+ -fx-text-fill: #292929;
+}
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/style/launchDialog_style.css b/PlayWall/src/main/resources/de/tobias/playpad/assets/style/launchDialog_style.css
new file mode 100644
index 0000000000000000000000000000000000000000..36dd7fd0d60d4bb04868350c03f8f6a5a4d6b665
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/style/launchDialog_style.css
@@ -0,0 +1,80 @@
+/*projectList */
+#list .list-cell {
+ -fx-skin: "com.sun.javafx.scene.control.skin.ListCellSkin";
+ -fx-background-color: -fx-base;
+ -fx-padding: 10px;
+ -fx-text-fill: -fx-text-inner-color;
+ -fx-opacity: 1;
+}
+
+#list .list-cell:filled {
+ /*-fx-background-color: derive(-fx-control-inner-background,-5%);*/
+ -fx-border-width: 0px 0px 1px 0px;
+ -fx-border-color: #00000044;
+}
+
+#list .list-view:focused .list-cell:focused {
+ -fx-background-color: derive(-fx-hover-base, +50%);
+ -fx-background-insets: 0, 1, 2;
+}
+
+#list .list-view:focused .list-cell:focused:odd {
+ -fx-background-color: derive(-fx-hover-base, +50%);
+ -fx-background-insets: 0, 1, 2;
+}
+
+/* When the list-cell is selected and focused */
+#list .list-view:focused .list-cell:filled:focused:selected {
+ -fx-background-color: derive(-fx-hover-base, +50%);
+ -fx-background-insets: 0, 1, 2;
+ -fx-background: -fx-base;
+ -fx-text-fill: -fx-selection-bar-text;
+}
+
+#list .list-view:focused .list-cell:filled:selected, #list .list-view:focused .list-cell:filled:selected:hover {
+ -fx-background: -fx-base;
+ -fx-background-color: derive(-fx-hover-base, +50%);
+ -fx-text-fill: -fx-selection-bar-text;
+}
+
+#list .list-view:focused .list-cell:filled:focused:selected:hover {
+ -fx-background: -fx-base;
+ -fx-background-color: derive(-fx-hover-base, +50%);
+ -fx-background-insets: 0, 1, 2;
+ -fx-text-fill: -fx-selection-bar-text;
+}
+
+/* When the ListView is _not_ focused, we show alternate selection colors */
+#list .list-cell:filled:selected:focused, #list .list-cell:filled:selected, .list-view:horizontal .list-cell:filled:selected {
+ -fx-background-color: lightgray;
+ -fx-text-fill: -fx-selection-bar-text;
+}
+
+#list .list-cell:filled:selected:focused:disabled, #list .list-cell:filled:selected:disabled {
+ -fx-opacity: -fx-disabled-opacity;
+}
+
+#list .list-cell:filled:hover {
+ -fx-background-color: -fx-hover-base;
+ -fx-text-fill: -fx-text-inner-color;
+}
+
+#list .list-view:focused .list-cell:filled:focused:hover {
+ -fx-background-color: derive(-fx-hover-base, +50%);
+
+ -fx-background-insets: 0, 1, 2;
+ -fx-text-fill: -fx-text-inner-color;
+}
+
+#list .list-view:horizontal .list-cell:filled:selected, #list .list-view:horizontal .list-cell:filled:selected:hover {
+ -fx-background-color: derive(-fx-hover-base, +50%);
+}
+
+.projectname {
+ -fx-font-size: 13px;
+}
+
+.profilename {
+ -fx-font-size: 10px;
+ -fx-text-fill: gray;
+}
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/style/touch.css b/PlayWall/src/main/resources/de/tobias/playpad/assets/style/touch.css
new file mode 100644
index 0000000000000000000000000000000000000000..8551c58afecf0ae631d8d45c63f83c3c41c56d2f
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/style/touch.css
@@ -0,0 +1,25 @@
+.menu .label {
+ -fx-font-size: 25px;
+ -fx-padding: 10px;
+}
+
+.label {
+ -fx-font-size: 20px;
+}
+
+.button {
+ -fx-font-size: 20px;
+}
+
+.slider .track {
+ -fx-pref-height: 15;
+}
+
+.slider:vertical .track {
+ -fx-pref-width: 20;
+}
+
+.slider .thumb {
+ -fx-pref-height: 30;
+ -fx-pref-width: 30;
+}
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/actions/cartAction.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/actions/cartAction.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..8e86b7a2056ec4857dd1e3932499737d3002e01d
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/actions/cartAction.fxml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox fx:id="rootContainer" maxWidth="1.7976931348623157E308" spacing="14.0" VBox.vgrow="ALWAYS"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <Label text="%cartAction.label.headline" underline="true"/>
+ <VBox fx:id="settingsView">
+ <children>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="150.0" text="%cartAction.label.type"/>
+ <ComboBox fx:id="controlMode" prefWidth="150.0"/>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ <VBox fx:id="settingsView1">
+ <children>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" minWidth="150.0" text="%cartAction.label.autoColor"/>
+ <CheckBox fx:id="autoColorCheckbox" mnemonicParsing="false"
+ text="%cartAction.checkbox.autoColor"/>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/actions/cartActions.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/actions/cartActions.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..acfea77cad6d3a6887e609a09e29dbe31ea7c34f
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/actions/cartActions.fxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.layout.*?>
+<VBox fx:id="buttonVbox" spacing="7.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <GridPane fx:id="gridPane" alignment="CENTER" hgap="7.0" maxHeight="-Infinity" maxWidth="1.7976931348623157E308"
+ minHeight="-Infinity" minWidth="-Infinity" vgap="7.0" VBox.vgrow="NEVER">
+ <columnConstraints>
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+ </columnConstraints>
+ <rowConstraints>
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+ </rowConstraints>
+ <VBox.margin>
+ <Insets/>
+ </VBox.margin>
+ </GridPane>
+ <Separator prefWidth="200.0"/>
+ <VBox fx:id="cartActionContainer" minHeight="20.0"/>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/audio/clipSettings.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/audio/clipSettings.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..902680c370d564ea19764c647843b181e939a88b
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/audio/clipSettings.fxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<HBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="14.0" layoutY="19.0" maxHeight="1.7976931348623157E308"
+ prefWidth="150.0" text="%tinysound.label.soundcard"/>
+ <ComboBox fx:id="soundCardComboBox" layoutX="118.0" layoutY="14.0" prefHeight="26.0" prefWidth="241.0"/>
+ <Button fx:id="testButton" layoutX="372.0" layoutY="14.0" mnemonicParsing="false"
+ onAction="#testButtonHandler"/>
+ </children>
+</HBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/audio/tinySoundSettings.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/audio/tinySoundSettings.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..c52a5222d7ea4aa039054c722581ee69329807e6
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/audio/tinySoundSettings.fxml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.layout.HBox?>
+<HBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <ComboBox fx:id="soundCardComboBox" layoutX="118.0" layoutY="14.0" prefHeight="26.0" prefWidth="241.0"/>
+ <Button fx:id="testButton" layoutX="372.0" layoutY="14.0" mnemonicParsing="false"
+ onAction="#testButtonHandler"/>
+ </children>
+</HBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/dialogs/pluginView.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/dialogs/pluginView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..669f1037f7eb20068076497a1d9b6f67319c8748
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/dialogs/pluginView.fxml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
+ prefWidth="600.0" spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <VBox minWidth="200.0" spacing="14.0">
+ <children>
+ <TextField fx:id="searchField" promptText="Suche...">
+ <VBox.margin>
+ <Insets/>
+ </VBox.margin>
+ </TextField>
+ <ListView fx:id="pluginList"/>
+ </children>
+ <HBox.margin>
+ <Insets/>
+ </HBox.margin>
+ </VBox>
+ <VBox spacing="14.0">
+ <children>
+ <Label fx:id="pluginHeadlineLabel" styleClass="plugin-headline" text="Headline"/>
+ <Button fx:id="pluginInstallButton" mnemonicParsing="false" onAction="#pluginInstallHandler"
+ text="Installieren"/>
+ <Label fx:id="pluginVersionLabel" text="Aktuelle Version: 1.4.2"/>
+ <Label fx:id="pluginInfoLabel" wrapText="true"/>
+ </children>
+ </VBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</HBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/main/desktop/header.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/main/desktop/header.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..6030f40d1d7119f987f6e305a42a988cd4ec38b7
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/main/desktop/header.fxml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.input.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Font?>
+<VBox maxHeight="-Infinity" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <MenuBar fx:id="menuBar" prefHeight="29.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8"
+ xmlns:fx="http://javafx.com/fxml/1">
+ <menus>
+ <Menu mnemonicParsing="false" text="%main.menu.file">
+ <items>
+ <MenuItem fx:id="newProjectMenuItem" mnemonicParsing="false" onAction="#newDocumentHandler"
+ text="%main.menuitem.new">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="N" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <Menu fx:id="recentOpenMenu" mnemonicParsing="false" text="%main.menuitem.recentFiles"/>
+ <MenuItem fx:id="openProjectMenuItem" mnemonicParsing="false" onAction="#openDocumentHandler"
+ text="%main.menuitem.project">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="O" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <MenuItem fx:id="saveProjectMenuItem" mnemonicParsing="false" onAction="#saveMenuHandler"
+ text="%main.menuitem.save">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="S" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ <MenuItem fx:id="profileMenu" mnemonicParsing="false" onAction="#profileMenuHandler"
+ text="%main.menuitem.profile"/>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ <MenuItem fx:id="printProjectMenuItem" mnemonicParsing="false" onAction="#printMenuHandler"
+ text="%main.menuitem.print">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="P" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ <MenuItem fx:id="logoutMenuItem" mnemonicParsing="false" onAction="#logoutMenuHandler"
+ text="%main.menuitem.logout"/>
+ </items>
+ </Menu>
+ <Menu mnemonicParsing="false" text="%main.menu.option">
+ <items>
+ <Menu mnemonicParsing="false" text="%main.menuitem.editmode">
+ <items>
+ <MenuItem fx:id="playMenu" mnemonicParsing="false" onAction="#playMenuHandler"
+ text="%main.menuitem.play">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="H" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <MenuItem fx:id="dragMenu" mnemonicParsing="false" onAction="#dragMenuHandler"
+ text="%main.menuitem.drag">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="J" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <MenuItem fx:id="pageMenu" mnemonicParsing="false" onAction="#pageMenuHandler"
+ text="%main.menuitem.page">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="K" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <MenuItem fx:id="colorMenu" mnemonicParsing="false" onAction="#colorMenuHandler"
+ text="%main.menuitem.color">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="L" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ </items>
+ </Menu>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ <MenuItem fx:id="notFoundMenu" mnemonicParsing="false" onAction="#notFoundMenuHandler"
+ text="%main.menuitem.notfound">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="E" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <MenuItem fx:id="logMenuItem" mnemonicParsing="false" onAction="#logMenuItemHandler"
+ text="%main.menuitem.log"/>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ <MenuItem fx:id="pluginMenu" mnemonicParsing="false" onAction="#pluginMenuItemHandler"
+ text="%main.menuitem.plugins"/>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ <MenuItem fx:id="projectSettingsMenuItem" mnemonicParsing="false"
+ onAction="#projectSettingsHandler" text="%main.menuitem.projectSettings"/>
+ <MenuItem fx:id="profileSettingsMenuItem" mnemonicParsing="false"
+ onAction="#profileSettingsHandler" text="%main.menuitem.profileSettings">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="COMMA" control="UP" meta="UP" shift="UP"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ <MenuItem fx:id="globalSettingsMenuItem" mnemonicParsing="false"
+ onAction="#globalSettingsHandler" text="%main.menuitem.globalSettings">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="COMMA" control="UP" meta="UP" shift="DOWN"
+ shortcut="DOWN"/>
+ </accelerator>
+ </MenuItem>
+ </items>
+ </Menu>
+ <Menu fx:id="layoutMenu" mnemonicParsing="false" text="%main.menu.view">
+ <items>
+ <CheckMenuItem fx:id="alwaysOnTopItem" mnemonicParsing="false"
+ onAction="#alwaysOnTopItemHandler" text="%main.menuitem.onTop"/>
+ <CheckMenuItem fx:id="fullScreenMenuItem" mnemonicParsing="false"
+ onAction="#fullScreenMenuItemHandler" text="%main.menuitem.fullScreen">
+ <accelerator>
+ <KeyCodeCombination alt="UP" code="F" control="UP" meta="UP" shift="DOWN"
+ shortcut="DOWN"/>
+ </accelerator>
+ </CheckMenuItem>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ <MenuItem fx:id="searchPadMenuItem" mnemonicParsing="false" onAction="#searchPadHandler"
+ text="%main.menuitem.searchPad"/>
+ <SeparatorMenuItem mnemonicParsing="false"/>
+ </items>
+ </Menu>
+ <Menu fx:id="extensionMenu" mnemonicParsing="false" text="%main.menu.extension"/>
+ <Menu fx:id="infoMenu" mnemonicParsing="false" text="%main.menu.info">
+ <items>
+ <MenuItem mnemonicParsing="false" onAction="#aboutMenuHandler" text="%main.menuitem.about"/>
+ <MenuItem mnemonicParsing="false" onAction="#showChangelogMenuHandler"
+ text="%main.menuitem.changelog"/>
+ <MenuItem mnemonicParsing="false" onAction="#visiteWebsiteMenuHandler"
+ text="%main.menuitem.website"/>
+ </items>
+ </Menu>
+ </menus>
+ </MenuBar>
+ <HBox fx:id="toolbarHBox" alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" spacing="14.0"
+ styleClass="tool-bar">
+ <children>
+ <HBox fx:id="pageHBox" alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" spacing="14.0"
+ HBox.hgrow="ALWAYS"/>
+ <HBox fx:id="notFoundContainer" alignment="CENTER" spacing="14.0">
+ <children>
+ <Label fx:id="notFoundLabel"/>
+ </children>
+ </HBox>
+ <HBox fx:id="iconHbox" alignment="CENTER" spacing="7.0">
+ <children>
+ <Label fx:id="liveLabel" text="%main.label.live" textFill="RED">
+ <font>
+ <Font size="26.0"/>
+ </font>
+ </Label>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER" spacing="7.0" HBox.hgrow="NEVER">
+ <children>
+ <Label fx:id="volumeDownLabel">
+ <font>
+ <Font size="24.0"/>
+ </font>
+ </Label>
+ <Slider fx:id="volumeSlider" focusTraversable="false" max="1.0"/>
+ <Label fx:id="volumeUpLabel">
+ <font>
+ <Font size="24.0"/>
+ </font>
+ </Label>
+ </children>
+ </HBox>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/main/mainView.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/main/mainView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..44d82853537fbd0b52eab490d1245d4bde6d4051
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/main/mainView.fxml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.layout.*?>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
+ prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <VBox layoutX="-0.7071067690849304" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+ AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+ <children>
+ <VBox fx:id="headerBox"/>
+ <AnchorPane fx:id="gridContainer" VBox.vgrow="ALWAYS">
+ <children>
+ <GridPane fx:id="padGridPane" gridLinesVisible="true" maxHeight="1.7976931348623157E308"
+ maxWidth="1.7976931348623157E308" AnchorPane.bottomAnchor="0.0"
+ AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
+ VBox.vgrow="ALWAYS">
+ </GridPane>
+ </children>
+ </AnchorPane>
+ </children>
+ </VBox>
+ </children>
+</AnchorPane>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/main/touch/header.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/main/touch/header.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..bad919d0a6186e1cc771b59739effc788171ce02
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/main/touch/header.fxml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Font?>
+<HBox fx:id="toolbarHBox" alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" prefHeight="28.0" prefWidth="586.0"
+ spacing="14.0" styleClass="tool-bar" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox fx:id="pageHBox" alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" spacing="14.0"
+ HBox.hgrow="ALWAYS"/>
+ <HBox fx:id="notFoundContainer" alignment="CENTER" spacing="7.0">
+ <children>
+ <Label fx:id="notFoundLabel"/>
+ </children>
+ </HBox>
+ <HBox fx:id="iconHbox" alignment="CENTER" spacing="14.0">
+ <children>
+ <Label fx:id="liveLabel" text="%main.label.live" textFill="RED">
+ <font>
+ <Font size="26.0"/>
+ </font>
+ </Label>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER" spacing="7.0" HBox.hgrow="NEVER">
+ <children>
+ <Label fx:id="volumeDownLabel">
+ <font>
+ <Font size="24.0"/>
+ </font>
+ </Label>
+ <Slider fx:id="volumeSlider" focusTraversable="false" max="1.0" prefWidth="200.0"/>
+ <Label fx:id="volumeUpLabel">
+ <font>
+ <Font size="24.0"/>
+ </font>
+ </Label>
+ <Button fx:id="closeButton" focusTraversable="false" mnemonicParsing="false"
+ onAction="#closeMenuItemHandler" text="X"/>
+ </children>
+ </HBox>
+ </children>
+</HBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/mapper/keyboard.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/mapper/keyboard.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..1d275287c2b95e1819576ab6b3299141a911995d
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/mapper/keyboard.fxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%keyboard.label.key"/>
+ <Label fx:id="keyLabel" prefWidth="68.0" text="KEY"/>
+ <Button fx:id="mappingButton" mnemonicParsing="false" onAction="#mappingButtonHandler" prefWidth="68.0"
+ text="%keyboard.button.new"/>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/mapper/midi.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/mapper/midi.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..8a87a276b07b376733ff9a500ca5c0cc9774a075
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/mapper/midi.fxml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.*?>
+<VBox fx:id="root" spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox alignment="CENTER_LEFT" spacing="14.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
+ AnchorPane.topAnchor="0.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="18.0" layoutY="76.0" prefWidth="150.0" text="%midi.label.key"/>
+ <Label fx:id="midiInputKeyLabel" prefWidth="68.0"/>
+ <Button fx:id="midiInputRecordButton" layoutX="167.0" layoutY="71.0" maxWidth="1.7976931348623157E308"
+ mnemonicParsing="false" onAction="#midiInputRecordButtonHandler" prefWidth="68.0"
+ text="%midi.button.new"/>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/feedback/doubleFeedback.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/feedback/doubleFeedback.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..e079bbaf4e5a8c939e6a5b9f2cc29a7175663332
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/feedback/doubleFeedback.fxml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.shape.Rectangle?>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox fx:id="defaultColorParent" maxWidth="1.7976931348623157E308" spacing="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" layoutX="24.0" layoutY="237.0" maxHeight="1.7976931348623157E308"
+ prefWidth="150.0" text="%doubleFeedback.label.colorDefault"/>
+ <StackPane layoutX="122.0" layoutY="232.0" maxWidth="1.7976931348623157E308" prefWidth="150.0"
+ HBox.hgrow="ALWAYS">
+ <children>
+ <Rectangle fx:id="colorPreviewDefault" arcHeight="5.0" arcWidth="5.0" fill="DODGERBLUE"
+ height="26.0" layoutX="122.0" layoutY="272.0" stroke="BLACK" strokeType="INSIDE"
+ width="128.0" StackPane.alignment="CENTER_LEFT"/>
+ <Button fx:id="colorChooseDefaultButton" alignment="CENTER_RIGHT" layoutX="122.0"
+ layoutY="232.0" maxWidth="150.0" mnemonicParsing="false"
+ onAction="#colorChooseButtonHandler" prefWidth="150.0"
+ style="-fx-background-color: transparent;" StackPane.alignment="CENTER_LEFT"/>
+ </children>
+ </StackPane>
+ </children>
+ </HBox>
+ <HBox fx:id="eventColorParent" spacing="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" layoutX="24.0" layoutY="237.0" maxHeight="1.7976931348623157E308"
+ prefWidth="150.0" text="%doubleFeedback.label.colorEvent"/>
+ <StackPane layoutX="122.0" layoutY="232.0" maxWidth="1.7976931348623157E308" prefWidth="150.0"
+ HBox.hgrow="ALWAYS">
+ <children>
+ <Rectangle fx:id="colorPreviewEvent" arcHeight="5.0" arcWidth="5.0" fill="DODGERBLUE"
+ height="26.0" layoutX="122.0" layoutY="272.0" stroke="BLACK" strokeType="INSIDE"
+ width="128.0" StackPane.alignment="CENTER_LEFT"/>
+ <Button fx:id="colorChooseEventButton" alignment="CENTER_RIGHT" layoutX="122.0" layoutY="232.0"
+ maxWidth="150.0" mnemonicParsing="false" onAction="#colorChooseButtonHandler"
+ prefWidth="150.0" style="-fx-background-color: transparent;"
+ StackPane.alignment="CENTER_LEFT"/>
+ </children>
+ </StackPane>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/feedback/singleFeedback.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/feedback/singleFeedback.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..8562170777ecc5e76b32d0a945b912939f35edc3
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/feedback/singleFeedback.fxml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.shape.Rectangle?>
+<VBox fx:id="root" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox fx:id="defaultColorParent" alignment="CENTER_LEFT" maxWidth="1.7976931348623157E308" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="24.0" layoutY="237.0" prefWidth="150.0"
+ text="%doubleFeedback.label.colorDefault"/>
+ <StackPane layoutX="122.0" layoutY="232.0" maxWidth="1.7976931348623157E308" prefWidth="150.0"
+ HBox.hgrow="ALWAYS">
+ <children>
+ <Rectangle fx:id="colorPreviewDefault" arcHeight="5.0" arcWidth="5.0" fill="DODGERBLUE"
+ height="26.0" layoutX="122.0" layoutY="272.0" stroke="BLACK" strokeType="INSIDE"
+ width="128.0" StackPane.alignment="CENTER_LEFT"/>
+ <Button fx:id="colorChooseDefaultButton" alignment="CENTER_RIGHT" layoutX="122.0"
+ layoutY="232.0" maxWidth="150.0" mnemonicParsing="false"
+ onAction="#colorChooseButtonHandler" prefWidth="150.0"
+ style="-fx-background-color: transparent;" StackPane.alignment="CENTER_LEFT"/>
+ </children>
+ </StackPane>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/global/generalTab.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/global/generalTab.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..4e22ed2761ce9224465d7bb48721f063528b547f
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/global/generalTab.fxml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox prefWidth="800.0" spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" maxWidth="1.7976931348623157E308" prefWidth="150.0"
+ text="%settings.gen.label.behaviour"/>
+ <CheckBox fx:id="openLastDocumentCheckbox" layoutX="30.0" layoutY="269.0" mnemonicParsing="false"
+ text="%settings.gen.checkbox.openLastDocument" AnchorPane.leftAnchor="30.0"
+ AnchorPane.topAnchor="269.0"/>
+ </children>
+ </HBox>
+ <Separator prefWidth="200.0"/>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" maxWidth="1.7976931348623157E308" prefWidth="150.0"
+ text="%settings.gen.label.liveMode"/>
+ <CheckBox fx:id="liveModeCheckBox" layoutX="30.0" layoutY="269.0" mnemonicParsing="false"
+ text="%settings.gen.checkbox.liveMode" AnchorPane.leftAnchor="30.0"
+ AnchorPane.topAnchor="269.0"/>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <Label prefWidth="150.0" text="%settings.gen.label.liveMode.pageChange"/>
+ <RadioButton fx:id="pageEnable" mnemonicParsing="false" prefWidth="125.0"
+ text="%settings.gen.radio.liveMode.enable"/>
+ <RadioButton fx:id="pageDisable" mnemonicParsing="false" prefWidth="100.0"
+ text="%settings.gen.radio.liveMode.disable"/>
+ </children>
+ <VBox.margin>
+ <Insets left="164.0"/>
+ </VBox.margin>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <Label prefWidth="150.0" text="%settings.gen.label.liveMode.dragPads"/>
+ <RadioButton fx:id="dragEnable" mnemonicParsing="false" prefWidth="125.0"
+ text="%settings.gen.radio.liveMode.enable"/>
+ <RadioButton fx:id="dragDisable" mnemonicParsing="false" prefWidth="100.0"
+ text="%settings.gen.radio.liveMode.disable"/>
+ </children>
+ <VBox.margin>
+ <Insets left="164.0"/>
+ </VBox.margin>
+ </HBox>
+ <HBox spacing="14.0">
+ <VBox.margin>
+ <Insets left="164.0"/>
+ </VBox.margin>
+ <children>
+ <Label prefWidth="150.0" text="%settings.gen.label.liveMode.media"/>
+ <RadioButton fx:id="fileEnable" mnemonicParsing="false" prefWidth="125.0"
+ text="%settings.gen.radio.liveMode.enable"/>
+ <RadioButton fx:id="fileDisable" mnemonicParsing="false" prefWidth="100.0"
+ text="%settings.gen.radio.liveMode.disable"/>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <VBox.margin>
+ <Insets left="164.0"/>
+ </VBox.margin>
+ <children>
+ <Label prefWidth="150.0" text="%settings.gen.label.liveMode.settings"/>
+ <RadioButton fx:id="settingsEnable" mnemonicParsing="false" prefWidth="125.0"
+ text="%settings.gen.radio.liveMode.enable"/>
+ <RadioButton fx:id="settingsDisable" mnemonicParsing="false" prefWidth="100.0"
+ text="%settings.gen.radio.liveMode.disable"/>
+ </children>
+ </HBox>
+ <Label text="%settings.gen.label.liveModeInfo" wrapText="true">
+ <VBox.margin>
+ <Insets left="164.0"/>
+ </VBox.margin>
+ </Label>
+ <Separator prefWidth="200.0"/>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" maxHeight="1.7976931348623157E308" prefWidth="150.0"
+ text="%settings.gen.cache.label"/>
+ <TextField fx:id="cacheTextField" promptText="C:\Users\Max\Cache" HBox.hgrow="ALWAYS"/>
+ <Button mnemonicParsing="false" onAction="#cacheChooseHandler"
+ text="%settings.gen.cache.button.choose"/>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label prefWidth="150.0"/>
+ <Button mnemonicParsing="false" onAction="#cacheResetButtonHandler"
+ text="%settings.gen.cache.button.reset"/>
+ <Label fx:id="cacheSizeLabel" text="Label"/>
+ </children>
+ </HBox>
+ <Label text="%settings.gen.cache.label.info" wrapText="true">
+ <VBox.margin>
+ <Insets left="164.0"/>
+ </VBox.margin>
+ </Label>
+ <Separator prefWidth="200.0"/>
+ <Button alignment="TOP_LEFT" mnemonicParsing="false" onAction="#resetDialogs"
+ text="%settings.gen.warning.button.reset">
+ <VBox.margin>
+ <Insets left="164.0"/>
+ </VBox.margin>
+ </Button>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/global/globalSettingsView.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/global/globalSettingsView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..36a55b1be9c765968e10bc368d989c03bfc11744
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/global/globalSettingsView.fxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TabPane?>
+<?import javafx.scene.layout.*?>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="592.0"
+ prefWidth="645.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <TabPane fx:id="tabPane" prefHeight="348.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE"
+ AnchorPane.bottomAnchor="52.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
+ AnchorPane.topAnchor="0.0"/>
+ <Button fx:id="finishButton" layoutX="508.0" layoutY="360.0" mnemonicParsing="false"
+ onAction="#finishButtonHandler" text="%settings.button.finish" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.rightAnchor="14.0"/>
+ </children>
+</AnchorPane>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/global/keysTab.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/global/keysTab.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..24e016486b09e52873ae4324bc7ccb204dabe766
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/global/keysTab.fxml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity"
+ spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <Label text="%settings.keys.label.headline" underline="true"/>
+ <TextField fx:id="searchTextField" promptText="%settings.keys.textfield.search"/>
+ <TableView fx:id="table" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
+ <columns>
+ <TableColumn fx:id="nameTableColumn" editable="false" prefWidth="378.0"
+ text="%settings.keys.table.name"/>
+ <TableColumn fx:id="shortcutTableColumn" editable="false" minWidth="0.0" prefWidth="139.0"
+ text="%settings.keys.table.shortcut"/>
+ </columns>
+ </TableView>
+ <Separator prefWidth="200.0"/>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%settings.keys.label.name"/>
+ <Label fx:id="nameLabel"/>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%settings.keys.label.shortcut"/>
+ <Label fx:id="shortcutLabel" prefWidth="150.0"/>
+ <Button fx:id="newShortcutButton" mnemonicParsing="false" onAction="#newShortcutButtonHandler"
+ text="%settings.keys.button.change"/>
+ <Button fx:id="deleteButton" mnemonicParsing="false" onAction="#deleteHandler"
+ text="%settings.keys.button.delete"/>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/global/updateTab.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/global/updateTab.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..c025b61b05a1371fb627e67e85a771114b8ea624
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/global/updateTab.fxml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox layoutX="14.0" layoutY="14.0" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="14.0" layoutY="14.0" prefWidth="150.0"
+ text="%settings.update.label.current"/>
+ <Label fx:id="currentVersionLabel" layoutX="175.0" layoutY="14.0" text="5.0.1 (stable)"/>
+ </children>
+ </HBox>
+ <Separator prefWidth="200.0"/>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="106.0" layoutY="183.0" prefWidth="150.0"
+ text="%settings.update.label.search"/>
+ <CheckBox fx:id="automaticSearchCheckBox" layoutX="275.0" layoutY="183.0" mnemonicParsing="false"
+ text="Automatisch"/>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%settings.update.label.channel"/>
+ <ComboBox fx:id="updateChannelComboBox" prefWidth="150.0"/>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="106.0" layoutY="222.0" prefWidth="150.0"/>
+ <Button fx:id="manualSearchButton" layoutX="275.0" layoutY="217.0" mnemonicParsing="false"
+ onAction="#manualSearchHandler" text="%settings.update.button.search"/>
+ </children>
+ </HBox>
+ <Separator prefWidth="200.0"/>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%settings.update.label.available"/>
+ <VBox spacing="14.0" HBox.hgrow="ALWAYS">
+ <children>
+ <ListView fx:id="openUpdateList" prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS"/>
+ <HBox spacing="14.0">
+ <children>
+ <Label fx:id="infoCLabel" text="%settings.update.label.infoC"/>
+ <Label fx:id="infoELabel" text="%settings.update.label.infoE"/>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ <HBox alignment="TOP_RIGHT">
+ <children>
+ <Button fx:id="updateButton" mnemonicParsing="false" onAction="#updateHandler"
+ text="%settings.update.button.install"/>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/layout/modernLayoutCart.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/layout/modernLayoutCart.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..4d04cebaf30b25384418f7e4a68364c3af1681bd
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/layout/modernLayoutCart.fxml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox spacing="14.0">
+ <children>
+ <VBox alignment="BOTTOM_LEFT" prefWidth="150.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%layout.label.color"
+ VBox.vgrow="ALWAYS">
+ <VBox.margin>
+ <Insets bottom="5.0"/>
+ </VBox.margin>
+ </Label>
+ </children>
+ </VBox>
+ <VBox layoutX="110.0" layoutY="8.0" maxWidth="1.7976931348623157E308" prefWidth="125.0" spacing="14.0">
+ <children>
+ <Label alignment="BOTTOM_LEFT" layoutX="110.0" layoutY="8.0" prefHeight="60.0" prefWidth="150.0"
+ text="%layout.label.background" wrapText="true" VBox.vgrow="ALWAYS"/>
+ <Button fx:id="backgroundColorButton" focusTraversable="false" mnemonicParsing="false"
+ onAction="#backgroundColorButtonHandler" prefWidth="150.0"/>
+ </children>
+ </VBox>
+ <VBox layoutX="243.0" layoutY="8.0" maxWidth="1.7976931348623157E308" prefWidth="125.0" spacing="14.0">
+ <children>
+ <Label alignment="BOTTOM_LEFT" layoutX="243.0" layoutY="8.0" prefHeight="60.0" prefWidth="150.0"
+ text="%layout.label.playground" wrapText="true" VBox.vgrow="ALWAYS"/>
+ <Button fx:id="playColorButton" focusTraversable="false" mnemonicParsing="false"
+ onAction="#playColorButtonHandler" prefWidth="150.0"/>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ <Button fx:id="resetButton" mnemonicParsing="false" onAction="#resetButtonHandler" text="%layout.button.reset">
+ <VBox.margin>
+ <Insets left="164.0"/>
+ </VBox.margin>
+ </Button>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/layout/modernLayoutGlobal.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/layout/modernLayoutGlobal.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..f894e0de6559263040b81482ca70b51d308740d0
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/layout/modernLayoutGlobal.fxml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox prefHeight="100.0" prefWidth="517.0" spacing="14.0">
+ <children>
+ <VBox alignment="BOTTOM_LEFT" prefWidth="150.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%layout.label.color"
+ VBox.vgrow="ALWAYS">
+ <VBox.margin>
+ <Insets bottom="5.0"/>
+ </VBox.margin>
+ </Label>
+ </children>
+ </VBox>
+ <VBox layoutX="110.0" layoutY="8.0" maxWidth="1.7976931348623157E308" prefWidth="150.0" spacing="14.0">
+ <children>
+ <Label alignment="BOTTOM_LEFT" layoutX="110.0" layoutY="8.0" prefHeight="60.0" prefWidth="150.0"
+ text="%layout.label.background" wrapText="true" VBox.vgrow="ALWAYS"/>
+ <Button fx:id="backgroundColorButton" focusTraversable="false" mnemonicParsing="false"
+ onAction="#backgroundColorButtonHandler" prefWidth="150.0"/>
+ </children>
+ </VBox>
+ <VBox layoutX="243.0" layoutY="8.0" maxWidth="1.7976931348623157E308" prefWidth="150.0" spacing="14.0">
+ <children>
+ <Label alignment="BOTTOM_LEFT" layoutX="243.0" layoutY="8.0" prefHeight="60.0" prefWidth="150.0"
+ text="%layout.label.playground" wrapText="true" VBox.vgrow="ALWAYS"/>
+ <Button fx:id="playColorButton" focusTraversable="false" mnemonicParsing="false"
+ onAction="#playColorButtonHandler" prefWidth="150.0"/>
+ </children>
+ </VBox>
+ <VBox maxWidth="1.7976931348623157E308" prefWidth="150.0" spacing="14.0">
+ <children>
+ <Label alignment="BOTTOM_LEFT" layoutX="243.0" layoutY="8.0" prefHeight="60.0" prefWidth="150.0"
+ text="%layout.label.animation" wrapText="true" VBox.vgrow="ALWAYS"/>
+ <CheckBox fx:id="warnAnimationCheckBox" mnemonicParsing="false"
+ text="%layout.label.warnAnimation"/>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ <Separator prefHeight="3.0" prefWidth="600.0"/>
+ <HBox spacing="14.0">
+ <children>
+ <VBox alignment="BOTTOM_LEFT" layoutX="26.0" layoutY="184.0" prefWidth="150.0" spacing="23.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="26.0" layoutY="224.0" prefWidth="150.0"
+ text="%layout.label.fontSize" AnchorPane.leftAnchor="26.0"/>
+ </children>
+ <HBox.margin>
+ <Insets bottom="7.0"/>
+ </HBox.margin>
+ </VBox>
+ <VBox layoutX="109.0" layoutY="154.0" maxWidth="1.7976931348623157E308" prefWidth="150.0"
+ spacing="14.0">
+ <children>
+ <Label alignment="TOP_CENTER" layoutX="109.0" layoutY="154.0" maxWidth="1.7976931348623157E308"
+ text="%layout.label.infoLabel" VBox.vgrow="ALWAYS"/>
+ <ComboBox fx:id="infoLabelFontSizeComboBox" editable="true" prefWidth="150.0"/>
+ </children>
+ </VBox>
+ <VBox layoutX="243.0" layoutY="154.0" maxWidth="1.7976931348623157E308" prefWidth="150.0"
+ spacing="14.0">
+ <children>
+ <Label alignment="TOP_CENTER" layoutX="243.0" layoutY="154.0" maxWidth="1.7976931348623157E308"
+ text="%layout.label.titleLabel" AnchorPane.leftAnchor="243.0" VBox.vgrow="ALWAYS"/>
+ <ComboBox fx:id="titleLabelFontSizeComboBox" editable="true" prefWidth="150.0"/>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ <Button fx:id="resetButton" mnemonicParsing="false" onAction="#resetButtonHandler" text="%layout.button.reset">
+ <VBox.margin>
+ <Insets left="164.0"/>
+ </VBox.margin>
+ </Button>
+ <Separator prefWidth="200.0"/>
+ <HBox prefWidth="517.0" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%layout.label.option"/>
+ <CheckBox fx:id="flatDesignCheckbox" mnemonicParsing="false" text="%layout.checkbox.flat"/>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/generalTab.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/generalTab.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..bbbfc204f67a81ad39794136484871888554f9a3
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/generalTab.fxml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <VBox layoutX="14.0" layoutY="14.0" spacing="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0"
+ AnchorPane.topAnchor="14.0">
+ <children>
+ <HBox alignment="CENTER_LEFT" layoutX="14.0" layoutY="14.0" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="14.0" layoutY="19.0" prefWidth="150.0"
+ text="%padSettings.gen.label.title" AnchorPane.leftAnchor="14.0"/>
+ <TextField fx:id="titleTextField" layoutX="125.0" layoutY="14.0" prefWidth="250.0"
+ AnchorPane.leftAnchor="127.0"/>
+ <VBox HBox.hgrow="ALWAYS"/>
+ <Button fx:id="deleteButton" mnemonicParsing="false" onAction="#deleteButtonHandler"
+ text="%padSettings.button.delete"/>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" layoutX="14.0" layoutY="48.0" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="14.0" layoutY="50.0" prefWidth="150.0"
+ text="%padSettings.gen.label.volume" AnchorPane.leftAnchor="14.0"/>
+ <Slider fx:id="volumeSlider" layoutX="122.0" layoutY="54.0" prefWidth="250.0"
+ showTickLabels="true" showTickMarks="true" snapToTicks="true" value="100.0"
+ AnchorPane.leftAnchor="127.0"/>
+ <VBox HBox.hgrow="ALWAYS"/>
+ <CheckBox fx:id="repeatCheckBox" mnemonicParsing="false" text="%padSettings.checkbox.loop"/>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER_LEFT" layoutX="14.0" layoutY="84.0" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="14.0" layoutY="89.0" prefWidth="150.0"
+ text="%padSettings.gen.label.timeDisplay" AnchorPane.leftAnchor="14.0"/>
+ <ComboBox fx:id="timeDisplayComboBox" layoutX="127.0" layoutY="84.0" prefWidth="250.0"
+ AnchorPane.leftAnchor="127.0"/>
+ <VBox HBox.hgrow="ALWAYS"/>
+ <CheckBox fx:id="customTimeDisplayCheckBox" layoutX="406.0" layoutY="88.0"
+ mnemonicParsing="false" text="%padSettings.gen.checkbox.customSettings"/>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/layoutTab.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/layoutTab.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..fa3222571bdfb80064b4638bb51585ef124bc1aa
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/layoutTab.fxml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.*?>
+<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox layoutX="14.0" layoutY="13.0" spacing="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0"
+ AnchorPane.topAnchor="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="14.0" layoutY="14.0" prefWidth="150.0"
+ text="%padSettings.layout.label.custom"/>
+ <CheckBox fx:id="enableLayoutCheckBox" layoutX="127.0" layoutY="13.0" mnemonicParsing="false"
+ text="%padSettings.layout.checkbox.custom"/>
+ </children>
+ <VBox.margin>
+ <Insets/>
+ </VBox.margin>
+ </HBox>
+ <VBox fx:id="layoutContainer" prefHeight="200.0" prefWidth="100.0"/>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/padSettingsView.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/padSettingsView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..19958994d240d6a927756e5c3e5aa527f77f1e3a
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/padSettingsView.fxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TabPane?>
+<?import javafx.scene.layout.*?>
+<AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <TabPane fx:id="tabPane" prefHeight="484.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE"
+ AnchorPane.bottomAnchor="53.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
+ AnchorPane.topAnchor="0.0"/>
+ <Button fx:id="finishButton" defaultButton="true" layoutX="534.0" layoutY="497.0" mnemonicParsing="false"
+ onAction="#finishButtonHandler" text="%padSettings.button.finish" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.rightAnchor="14.0"/>
+ </children>
+</AnchorPane>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/playerTab.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/playerTab.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..fc2fb7abdbd2a309beca248e8132eb15856d8715
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/playerTab.fxml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <VBox spacing="14.0">
+ <children>
+ <HBox layoutX="14.0" layoutY="253.0" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%padSettings.player.label.fade"
+ textAlignment="RIGHT"/>
+ <CheckBox fx:id="customFadeCheckBox" mnemonicParsing="false"
+ text="%padSettings.gen.checkbox.customSettings"/>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ <VBox fx:id="fadeContainer" minHeight="20.0"/>
+ <Separator prefWidth="200.0"/>
+ <VBox layoutX="14.0" layoutY="139.0" spacing="14.0">
+ <children>
+ <HBox layoutX="14.0" layoutY="139.0" spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%padSettings.player.label.warning"
+ textAlignment="RIGHT"/>
+ <CheckBox fx:id="warningEnableCheckBox" mnemonicParsing="false"
+ text="%padSettings.gen.checkbox.customSettings"/>
+ </children>
+ </HBox>
+ <VBox fx:id="warningFeedbackContainer" minHeight="25.0"/>
+ </children>
+ </VBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/trigger/cartTrigger.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/trigger/cartTrigger.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..a8ccf6f16eaf0d1ec504e5d35908867def090ca4
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/trigger/cartTrigger.fxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" maxHeight="1.7976931348623157E308" prefWidth="150.0"
+ text="%carttrigger.label.action"/>
+ <ComboBox fx:id="statusComboBox" prefWidth="150.0"/>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="TOP_RIGHT" maxHeight="1.7976931348623157E308" prefWidth="150.0"
+ text="%carttrigger.label.carts"/>
+ <VBox spacing="14.0">
+ <children>
+ <CheckBox fx:id="allCartsCheckbox" mnemonicParsing="false" text="%carttrigger.checkbox.all"/>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/trigger/triggerPoint.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/trigger/triggerPoint.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..79555b8abd21171068b99905fad94220d6a8bfa6
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/trigger/triggerPoint.fxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <ScrollPane fitToWidth="true" maxWidth="1.7976931348623157E308" prefViewportHeight="20.0"
+ prefViewportWidth="100.0" style="-fx-background-color: transparent;" VBox.vgrow="ALWAYS">
+ <content>
+ <VBox fx:id="itemView" minHeight="20.0" minWidth="100.0" spacing="14.0"/>
+ </content>
+ </ScrollPane>
+ <HBox fx:id="buttonBox" minHeight="10.0" spacing="14.0"/>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/trigger/triggerTime.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/trigger/triggerTime.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..a8d6d456552d07285400d4b99ae123097e668f78
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/trigger/triggerTime.fxml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <Label alignment="BASELINE_RIGHT" maxHeight="1.7976931348623157E308" prefWidth="150.0"
+ text="%triggertime.label.time"/>
+ <TextField fx:id="timeTextField" prefWidth="150.0"/>
+ </children>
+</HBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/trigger/volumeTrigger.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/trigger/volumeTrigger.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..237af2bdc2440dbbb361ebf833b6c75ffcf92db4
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/trigger/volumeTrigger.fxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" prefWidth="150.0" text="%volumetrigger.label.volume"/>
+ <Slider fx:id="volumeSlider" blockIncrement="5.0" majorTickUnit="20.0" prefWidth="100.0"
+ showTickLabels="true" showTickMarks="true" value="50.0" HBox.hgrow="ALWAYS"/>
+ <Label fx:id="volumeLabel" prefWidth="50.0" text="Label"/>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" maxHeight="1.7976931348623157E308" prefWidth="150.0"
+ text="%volumetrigger.label.duration"/>
+ <Slider fx:id="durationSlider" blockIncrement="5.0" majorTickUnit="1.0" max="5.0" minorTickCount="1"
+ prefWidth="100.0" showTickLabels="true" showTickMarks="true" value="2.5" HBox.hgrow="ALWAYS"/>
+ <Label fx:id="durationLabel" prefWidth="50.0" text="Label"/>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/triggerTab.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/triggerTab.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..9bbaabf3648a6326a4b5cbcab8a80cc209bdace8
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/pad/triggerTab.fxml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.TreeView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<HBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <TreeView fx:id="treeView" prefWidth="150.0" showRoot="false"/>
+ <VBox fx:id="contentView" minWidth="100.0" HBox.hgrow="ALWAYS">
+ <HBox.margin>
+ <Insets left="14.0" right="14.0" top="14.0"/>
+ </HBox.margin>
+ </VBox>
+ </children>
+</HBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/audioTab.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/audioTab.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..07d777e49b30deea2b7fa9820d4fa9c5b7e18715
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/audioTab.fxml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox layoutX="14.0" layoutY="14.0" spacing="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" layoutX="14.0" layoutY="19.0" maxHeight="1.7976931348623157E308"
+ prefWidth="150.0" text="%settings.audio.type"/>
+ <ComboBox fx:id="audioTypeComboBox" layoutX="156.0" layoutY="14.0" prefHeight="26.0" prefWidth="226.0"/>
+ </children>
+ </HBox>
+ <VBox fx:id="options" prefHeight="200.0" prefWidth="100.0" spacing="14.0"/>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/layoutTab.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/layoutTab.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..b1fa127fff8d55595cd9738bc8eccca2599470dd
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/layoutTab.fxml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.layout.VBox?>
+<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <VBox fx:id="layoutContainer" maxWidth="1.7976931348623157E308" prefHeight="20.0" VBox.vgrow="ALWAYS"/>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/mapping.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/mapping.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..28e2eac28e61ff26daaf9cbdd99e56b77eeacbde
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/mapping.fxml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox layoutX="14.0" layoutY="14.0" spacing="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" layoutX="14.0" layoutY="19.0" maxHeight="1.7976931348623157E308"
+ prefWidth="150.0" text="%settings.mapping.label.mapping"/>
+ <ComboBox fx:id="mappingComboBox" layoutX="100.0" layoutY="14.0" prefWidth="150.0"/>
+ <MenuButton mnemonicParsing="false" text="%settings.mapping.button.edit">
+ <items>
+ <MenuItem fx:id="mappingNewButton" mnemonicParsing="false" onAction="#mappingNewHandler"
+ text="%settings.mapping.button.edit.new"/>
+ <MenuItem fx:id="mappingRenameButton" mnemonicParsing="false" onAction="#mappingRenameHandler"
+ text="%settings.mapping.button.edit.rename"/>
+ <MenuItem fx:id="mappingDeleteButton" mnemonicParsing="false" onAction="#mappingDeleteHandler"
+ text="%settings.mapping.button.edit.delete"/>
+ <MenuItem fx:id="mappingDuplicateButton" mnemonicParsing="false"
+ onAction="#mappingDuplicateHandler" text="%settings.mapping.button.edit.duplicate"/>
+ <MenuItem fx:id="mappingImportButton" mnemonicParsing="false" onAction="#mappingImportHandler"
+ text="%settings.mapping.button.edit.import"/>
+ <MenuItem fx:id="mappingExportButton" mnemonicParsing="false" onAction="#mappingExportHandler"
+ text="%settings.mapping.button.edit.export"/>
+ </items>
+ </MenuButton>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%settings.midi.label.midiDeviceImpl">
+ <HBox.margin>
+ <Insets top="4.0"/>
+ </HBox.margin>
+ </Label>
+ <HBox maxWidth="1.7976931348623157E308" spacing="14.0" HBox.hgrow="ALWAYS">
+ <children>
+ <ComboBox fx:id="deviceComboBox" onAction="#deviceHandler" prefWidth="150.0"/>
+ <CheckBox fx:id="midiActiveCheckBox" mnemonicParsing="false" text="%settings.checkbox.activate">
+ <padding>
+ <Insets top="5.0"/>
+ </padding>
+ <HBox.margin>
+ <Insets top="4.0"/>
+ </HBox.margin>
+ </CheckBox>
+ </children>
+ </HBox>
+ </children>
+ </HBox>
+ <HBox layoutY="50.0" spacing="14.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
+ AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="50.0" VBox.vgrow="ALWAYS">
+ <children>
+ <TreeView fx:id="treeView" prefHeight="400.0" prefWidth="200.0" showRoot="false"
+ AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="50.0"/>
+ <ScrollPane fitToWidth="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
+ style="-fx-background-color: transparent;" HBox.hgrow="ALWAYS">
+ <content>
+ <VBox fx:id="detailView" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
+ spacing="14.0"/>
+ </content>
+ </ScrollPane>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/playerTab.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/playerTab.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..ffa4d71ac37343a7d57c4971373c53b81726ddb0
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/playerTab.fxml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" prefWidth="150.0" text="%settings.player.label.modus"/>
+ <CheckBox fx:id="playerModus" layoutX="150.0" mnemonicParsing="false"
+ text="%settings.player.checkbox.modus"/>
+ </children>
+ </HBox>
+ <Separator prefWidth="200.0"/>
+ <Label text="%settings.player.label.fade" underline="true"/>
+ <VBox fx:id="fadeContainer" minHeight="20.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"/>
+ <Separator prefWidth="200.0"/>
+ <Label text="%settings.player.label.warning" underline="true"/>
+ <VBox fx:id="warningFeedbackContainer" minHeight="25.0"/>
+ <Separator layoutY="91.0" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"/>
+ <HBox alignment="CENTER_LEFT" layoutX="14.0" layoutY="105.0" spacing="14.0" AnchorPane.leftAnchor="14.0"
+ AnchorPane.rightAnchor="14.0">
+ <children>
+ <Label alignment="CENTER_RIGHT" layoutX="14.0" layoutY="110.0" minWidth="150.0" prefWidth="150.0"
+ text="%settings.player.label.timeDisplay"/>
+ <ComboBox fx:id="timeDisplayComboBox" layoutX="104.0" layoutY="105.0" prefHeight="26.0"
+ prefWidth="254.0"/>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/settingsView.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/settingsView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..47f316038bc692415b55602e69df5d2a39d76fe1
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/profile/settingsView.fxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TabPane?>
+<?import javafx.scene.control.ToggleButton?>
+<?import javafx.scene.layout.*?>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="592.0"
+ prefWidth="645.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <TabPane fx:id="tabPane" prefHeight="348.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE"
+ AnchorPane.bottomAnchor="52.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
+ AnchorPane.topAnchor="0.0"/>
+ <Button fx:id="finishButton" layoutX="508.0" layoutY="360.0" mnemonicParsing="false"
+ onAction="#finishButtonHandler" text="%settings.button.finish" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.rightAnchor="14.0"/>
+ <ToggleButton fx:id="lockedButton" mnemonicParsing="false" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.leftAnchor="14.0"/>
+ </children>
+</AnchorPane>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/project/generalTab.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/project/generalTab.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..9cc285203b8a293b7862eac675711900eb689aa4
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/project/generalTab.fxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<VBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <Label text="%settings.gen.label.view" underline="true"/>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" layoutX="20.0" layoutY="68.0" maxHeight="1.7976931348623157E308"
+ prefWidth="150.0" text="%settings.gen.label.columns"/>
+ <TextField fx:id="columnTextField" prefWidth="50.0"/>
+ <Label fx:id="columnErrorLabel" maxHeight="1.7976931348623157E308" text="Label"/>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" layoutX="18.0" layoutY="96.0" maxHeight="1.7976931348623157E308"
+ prefWidth="150.0" text="%settings.gen.label.rows"/>
+ <TextField fx:id="rowTextField" prefWidth="50.0"/>
+ <Label fx:id="rowErrorLabel" maxHeight="1.7976931348623157E308" text="Label"/>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/project/pathTab.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/project/pathTab.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..c17892c39e07be497bee02af5a357687e110abe0
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/project/pathTab.fxml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.*?>
+<VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" spacing="14.0"
+ xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox alignment="CENTER_LEFT" spacing="14.0">
+ <children>
+ <Label prefWidth="150.0" text="%settings.paths.label.media"/>
+ <TextField fx:id="mediaPathTextField" editable="false" HBox.hgrow="ALWAYS"/>
+ <Button fx:id="mediaPathChooseButton" mnemonicParsing="false" onAction="#mediaPathChooseHandler"
+ text="%settings.paths.button.choose"/>
+ </children>
+ </HBox>
+ <HBox spacing="14.0">
+ <children>
+ <CheckBox fx:id="useMediaPath" mnemonicParsing="false" text="%settings.paths.checkbox.mediaActive">
+ <HBox.margin>
+ <Insets left="164.0"/>
+ </HBox.margin>
+ </CheckBox>
+ </children>
+ </HBox>
+ </children>
+ <padding>
+ <Insets bottom="14.0" left="14.0" right="14.0" top="14.0"/>
+ </padding>
+</VBox>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/project/projectSettingsView.fxml b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/project/projectSettingsView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..36a55b1be9c765968e10bc368d989c03bfc11744
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/assets/view/option/project/projectSettingsView.fxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TabPane?>
+<?import javafx.scene.layout.*?>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="592.0"
+ prefWidth="645.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <TabPane fx:id="tabPane" prefHeight="348.0" prefWidth="600.0" tabClosingPolicy="UNAVAILABLE"
+ AnchorPane.bottomAnchor="52.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
+ AnchorPane.topAnchor="0.0"/>
+ <Button fx:id="finishButton" layoutX="508.0" layoutY="360.0" mnemonicParsing="false"
+ onAction="#finishButtonHandler" text="%settings.button.finish" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.rightAnchor="14.0"/>
+ </children>
+</AnchorPane>
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/components/Actions.xml b/PlayWall/src/main/resources/de/tobias/playpad/components/Actions.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3e1ec4e764b6a892a172d3729248581cccfcc164
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/components/Actions.xml
@@ -0,0 +1,15 @@
+<Actions>
+ <Component id="CART" name="Action.Cart.Name" icon="TH" class="de.tobias.utils.nui.icon.FontAwesomeType" size="11">
+ de.tobias.playpad.action.factory.CartActionFactory
+ </Component>
+ <Component id="PAGE" name="Action.Page.Name" icon="FILE_TEXT" class="de.tobias.utils.nui.icon.FontAwesomeType"
+ size="11">de.tobias.playpad.action.factory.PageActionFactory
+ </Component>
+ <Component id="NAVIGATE" name="Action.Navigate.Name" icon="NAVIGATION"
+ class="de.tobias.utils.nui.icon.MaterialDesignIcon" size="11">
+ de.tobias.playpad.action.factory.NavigateActionFactory
+ </Component>
+ <Component id="STOP" name="Action.Stop.Name" icon="STOP" class="de.tobias.utils.nui.icon.MaterialDesignIcon"
+ size="11">de.tobias.playpad.action.factory.StopActionFactory
+ </Component>
+</Actions>
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/components/AudioHandler.xml b/PlayWall/src/main/resources/de/tobias/playpad/components/AudioHandler.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cbe95639e7f043827437589d37a0386c869c3961
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/components/AudioHandler.xml
@@ -0,0 +1,4 @@
+<Actions>
+ <Component id="JavaFx" name="AudioHandler.JavaFX">de.tobias.playpad.audio.JavaFXHandlerFactory</Component>
+ <Component id="TinyAudio" name="AudioHandler.TinySound">de.tobias.playpad.audio.TinyAudioHandlerFactory</Component>
+</Actions>
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/components/DragMode.xml b/PlayWall/src/main/resources/de/tobias/playpad/components/DragMode.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6febd257dd7b24ad9cb5e5c39bcc2afd8b6d4eac
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/components/DragMode.xml
@@ -0,0 +1,11 @@
+<Actions>
+ <Component id="move" name="DnDMode.Move" icon="ARROWS" class="de.tobias.utils.nui.icon.FontAwesomeType" size="30">
+ de.tobias.playpad.pad.drag.MoveDragMode
+ </Component>
+ <Component id="duplicate" name="DnDMode.Duplicate" icon="COPY" class="de.tobias.utils.nui.icon.FontAwesomeType"
+ size="30">de.tobias.playpad.pad.drag.DuplicateDragMode
+ </Component>
+ <Component id="replace" name="DnDMode.Replace" icon="ARROW_CIRCLE_RIGHT"
+ class="de.tobias.utils.nui.icon.FontAwesomeType" size="30">de.tobias.playpad.pad.drag.ReplaceDragMode
+ </Component>
+</Actions>
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/components/Keys.xml b/PlayWall/src/main/resources/de/tobias/playpad/components/Keys.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7cac62ea30c38c1a401166da6a4f4d01bbf8633d
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/components/Keys.xml
@@ -0,0 +1,54 @@
+<Keys>
+ <Windows>
+ <Key id="new_proj" name="main.menuitem.new" key="N" ctrl="true" alt="false" meta="false" shift="false"/>
+ <Key id="open_proj" name="main.menuitem.project" key="O" ctrl="true" alt="false" meta="false" shift="false"/>
+ <Key id="save_proj" name="main.menuitem.save" key="S" ctrl="true" alt="false" meta="false" shift="false"/>
+ <Key id="print_proj" name="main.menuitem.print" key="P" ctrl="true" alt="false" meta="false" shift="false"/>
+
+ <Key id="play" name="main.menuitem.play" key="H" ctrl="true" alt="false" meta="false" shift="false"/>
+ <Key id="drag" name="main.menuitem.drag" key="J" ctrl="true" alt="false" meta="false" shift="false"/>
+ <Key id="page" name="main.menuitem.page" key="K" ctrl="true" alt="false" meta="false" shift="false"/>
+ <Key id="color" name="main.menuitem.color" key="L" ctrl="true" alt="false" meta="false" shift="false"/>
+
+ <Key id="notfound" name="main.menuitem.notfound" key="E" ctrl="true" alt="false" meta="false" shift="false"/>
+
+ <Key id="plugins" name="main.menuitem.plugins"/>
+ <Key id="project_settings" name="main.menuitem.projectSettings" key="Comma" ctrl="true" alt="true" meta="false"
+ shift="false"/>
+ <Key id="profile_settings" name="main.menuitem.profileSettings" key="Comma" ctrl="true" alt="false" meta="false"
+ shift="false"/>
+ <Key id="global_settings" name="main.menuitem.globalSettings" key="Comma" ctrl="true" alt="false" meta="false"
+ shift="true"/>
+
+ <Key id="window_top" name="main.menuitem.onTop"/>
+ <Key id="window_fullscreen" name="main.menuitem.fullScreen" key="F" ctrl="true" alt="false" meta="false"
+ shift="true"/>
+ <Key id="search_pad" name="main.menuitem.searchPad" key="F" ctrl="true" alt="false" meta="false" shift="false"/>
+ </Windows>
+ <Mac>
+ <Key id="new_proj" name="main.menuitem.new" key="N" ctrl="false" alt="false" meta="true" shift="false"/>
+ <Key id="open_proj" name="main.menuitem.project" key="O" ctrl="false" alt="false" meta="true" shift="false"/>
+ <Key id="save_proj" name="main.menuitem.save" key="S" ctrl="false" alt="false" meta="true" shift="false"/>
+ <Key id="print_proj" name="main.menuitem.print" key="P" ctrl="false" alt="false" meta="true" shift="false"/>
+
+ <Key id="play" name="main.menuitem.play" key="H" ctrl="false" alt="false" meta="true" shift="false"/>
+ <Key id="drag" name="main.menuitem.drag" key="J" ctrl="false" alt="false" meta="true" shift="false"/>
+ <Key id="page" name="main.menuitem.page" key="K" ctrl="false" alt="false" meta="true" shift="false"/>
+ <Key id="color" name="main.menuitem.color" key="L" ctrl="false" alt="false" meta="true" shift="false"/>
+
+ <Key id="notfound" name="main.menuitem.notfound" key="E" ctrl="false" alt="false" meta="true" shift="false"/>
+
+ <Key id="plugins" name="main.menuitem.plugins"/>
+ <Key id="project_settings" name="main.menuitem.projectSettings" key="Comma" ctrl="false" alt="true" meta="true"
+ shift="false"/>
+ <Key id="profile_settings" name="main.menuitem.profileSettings" key="Comma" ctrl="false" alt="false" meta="true"
+ shift="false"/>
+ <Key id="global_settings" name="main.menuitem.globalSettings" key="Comma" ctrl="false" alt="false" meta="true"
+ shift="true"/>
+
+ <Key id="window_top" name="main.menuitem.onTop"/>
+ <Key id="window_fullscreen" name="main.menuitem.fullScreen" key="F" ctrl="false" alt="false" meta="true"
+ shift="true"/>
+ <Key id="search_pad" name="main.menuitem.searchPad" key="F" ctrl="false" alt="false" meta="true" shift="false"/>
+ </Mac>
+</Keys>
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/components/Layout.xml b/PlayWall/src/main/resources/de/tobias/playpad/components/Layout.xml
new file mode 100644
index 0000000000000000000000000000000000000000..355e475c3230061f98283f0bb38fe33da44cd85d
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/components/Layout.xml
@@ -0,0 +1,6 @@
+<Actions>
+ <Component id="Desktop" default="true" name="MainLayout.Desktop">
+ de.tobias.playpad.layout.desktop.DesktopMainLayoutFactory
+ </Component>
+ <Component id="Touch" name="MainLayout.Touch">de.tobias.playpad.layout.touch.TouchMainLayoutFactory</Component>
+</Actions>
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/components/Mapper.xml b/PlayWall/src/main/resources/de/tobias/playpad/components/Mapper.xml
new file mode 100644
index 0000000000000000000000000000000000000000..619bdad1a3f58031d3bb66e7c1e5d51d01250a8f
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/components/Mapper.xml
@@ -0,0 +1,5 @@
+<Actions>
+ <Component id="MIDI" name="Mapper.Midi.Name">de.tobias.playpad.action.mapper.MidiMapperFactory</Component>
+ <Component id="KEYBOARD" name="Mapper.Keyboard.Name">de.tobias.playpad.action.mapper.KeyboardMapperFactory
+ </Component>
+</Actions>
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/components/PadContent.xml b/PlayWall/src/main/resources/de/tobias/playpad/components/PadContent.xml
new file mode 100644
index 0000000000000000000000000000000000000000..057fcd3df553df8d7c470d46846ed63864281b60
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/components/PadContent.xml
@@ -0,0 +1,5 @@
+<Actions>
+ <Component id="audio" name="Content.Audio.Name" icon="MUSIC" class="de.tobias.utils.nui.icon.FontAwesomeType"
+ size="30">de.tobias.playpad.pad.content.AudioPadContentFactory
+ </Component>
+</Actions>
\ No newline at end of file
diff --git a/PlayWall/src/main/resources/de/tobias/playpad/components/Trigger.xml b/PlayWall/src/main/resources/de/tobias/playpad/components/Trigger.xml
new file mode 100644
index 0000000000000000000000000000000000000000..03c64a2ab2f08f388657f3cccd8f16750aaa23ed
--- /dev/null
+++ b/PlayWall/src/main/resources/de/tobias/playpad/components/Trigger.xml
@@ -0,0 +1,4 @@
+<Actions>
+ <Component id="Cart" name="Trigger.Cart.Name">de.tobias.playpad.trigger.CartTriggerItemFactory</Component>
+ <Component id="Volume" name="Trigger.Volume.Name">de.tobias.playpad.trigger.VolumeTriggerItemFactory</Component>
+</Actions>
\ No newline at end of file
diff --git a/PlayWall/src/icon.icns b/PlayWall/src/main/resources/icon.icns
similarity index 100%
rename from PlayWall/src/icon.icns
rename to PlayWall/src/main/resources/icon.icns
diff --git a/PlayWall/src/icon.ico b/PlayWall/src/main/resources/icon.ico
similarity index 100%
rename from PlayWall/src/icon.ico
rename to PlayWall/src/main/resources/icon.ico
diff --git a/PlayWall/src/icon.png b/PlayWall/src/main/resources/icon.png
similarity index 100%
rename from PlayWall/src/icon.png
rename to PlayWall/src/main/resources/icon.png
diff --git a/PlayWall/src/icon_small.png b/PlayWall/src/main/resources/icon_small.png
similarity index 100%
rename from PlayWall/src/icon_small.png
rename to PlayWall/src/main/resources/icon_small.png
diff --git a/PlayWall/test/TestPlayPad.java b/PlayWall/test/TestPlayPad.java
deleted file mode 100644
index 11d0695090c078b6f9e162514ee060931b5af6eb..0000000000000000000000000000000000000000
--- a/PlayWall/test/TestPlayPad.java
+++ /dev/null
@@ -1,25 +0,0 @@
-import de.tobias.playpad.project.importer.ConverterV6;
-import de.tobias.utils.application.App;
-import de.tobias.utils.application.ApplicationUtils;
-import org.dom4j.DocumentException;
-
-import java.io.IOException;
-import java.util.UUID;
-
-public class TestPlayPad {
-
- public static void main(String[] args) {
- try {
- App app = ApplicationUtils.registerMainApplication(TestPlayPad.class);
- app.start(args);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- try {
- ConverterV6.convert(UUID.fromString("3bbd88d2-c6ed-40dd-b138-2ff9bf132ca3"), "Test");
- } catch (IOException | DocumentException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/PlayWallCore/PlayWallCore.iml b/PlayWallCore/PlayWallCore.iml
index f5dc5887d2ddd06d56c186c1f6809ee6c60933be..17351c7611ac157d0c9bbb5200181d08b64406a2 100644
--- a/PlayWallCore/PlayWallCore.iml
+++ b/PlayWallCore/PlayWallCore.iml
@@ -1,25 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
- <orderEntry type="library" name="JLayer" level="project" />
- <orderEntry type="library" name="Plugins" level="project" />
- <orderEntry type="library" name="TinySound" level="project" />
- <orderEntry type="library" name="Json" level="project" />
- <orderEntry type="library" name="YML" level="project" />
- <orderEntry type="library" name="libUtils" level="project" />
- <orderEntry type="library" name="GSON" level="project" />
- <orderEntry type="library" name="Websocket Client" level="project" />
- <orderEntry type="library" name="sqlite-jdbc-3.8.7" level="project" />
- <orderEntry type="library" name="libLogger" level="project" />
- <orderEntry type="library" name="XML" level="project" />
- <orderEntry type="library" name="unirest" level="project" />
- <orderEntry type="library" name="Updater" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libUtils:1.5.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:9.0.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.hp.gagawa:gagawa:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:23.3-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.0.18" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:YAMLStorage:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libStorage:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libLogger:1.3.5" level="project" />
+ <orderEntry type="library" name="Maven: org.fusesource.jansi:jansi:1.17.1" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:Updater:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+ <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.23.1" level="project" />
+ <orderEntry type="library" name="Maven: net.xeoh:jspf:1.0.2" level="project" />
+ <orderEntry type="library" name="Maven: kuusisto:tinysound:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jcraft:jorbis:0.0.17" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:vorbisspi:1.0.3.3" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:jorbis:0.0.17.4" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:tritonus-share:0.3.7.4" level="project" />
+ <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.4.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+ <orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.5" level="project" />
+ <orderEntry type="library" name="Maven: javazoom:jlayer:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: net.minidev:json-smart:1.2" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/PlayWallCore/pom.xml b/PlayWallCore/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c9e045fd209587be89550d0cba45c61174d9ac04
--- /dev/null
+++ b/PlayWallCore/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallCore</artifactId>
+ <version>1.0.0</version>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>releases</id>
+ <url>https://maven.thecodelabs.de/nexus/content/repositories/releases</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.tobias</groupId>
+ <artifactId>libUtils</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>de.tobias</groupId>
+ <artifactId>Updater</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ <version>3.23.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.xeoh</groupId>
+ <artifactId>jspf</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>kuusisto</groupId>
+ <artifactId>tinysound</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jcraft</groupId>
+ <artifactId>jorbis</artifactId>
+ <version>0.0.17</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.soundlibs</groupId>
+ <artifactId>vorbisspi</artifactId>
+ <version>1.0.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.soundlibs</groupId>
+ <artifactId>tritonus-share</artifactId>
+ <version>0.3.7.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.mashape.unirest</groupId>
+ <artifactId>unirest-java</artifactId>
+ <version>1.4.9</version>
+ </dependency>
+ <dependency>
+ <groupId>com.neovisionaries</groupId>
+ <artifactId>nv-websocket-client</artifactId>
+ <version>2.5</version> <!--1.31-->
+ </dependency>
+
+ <dependency>
+ <groupId>javazoom</groupId>
+ <artifactId>jlayer</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.minidev</groupId>
+ <artifactId>json-smart</artifactId>
+ <version>1.2</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/PlayWallCore/src/de/tobias/playpad/plugin/SettingsListener.java b/PlayWallCore/src/de/tobias/playpad/plugin/SettingsListener.java
deleted file mode 100644
index 9415cc585c956c94db1aca8b4665d93e7fabde7d..0000000000000000000000000000000000000000
--- a/PlayWallCore/src/de/tobias/playpad/plugin/SettingsListener.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.tobias.playpad.plugin;
-
-import de.tobias.playpad.profile.Profile;
-
-public interface SettingsListener {
-
- default void onLoad(Profile profile) {}
-
- default void onSave(Profile profile) {}
-
- default void onChange(Profile profile) {}
-}
diff --git a/PlayWallCore/src/de/tobias/playpad/Displayable.java b/PlayWallCore/src/main/java/de/tobias/playpad/Displayable.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/Displayable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/Displayable.java
index 453c8d8f0ec95cff9d33d9a161f8f6e5e75fee32..9f11439b350255a697b9270322886922682c2bfe 100644
--- a/PlayWallCore/src/de/tobias/playpad/Displayable.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/Displayable.java
@@ -14,7 +14,7 @@ public interface Displayable {
/**
* Optional Method for a displayable cell
- *
+ *
* @return Einstellungen für dieses Objetkt.
*/
default NVC getSettingsViewController() {
diff --git a/PlayWallCore/src/de/tobias/playpad/DisplayableColor.java b/PlayWallCore/src/main/java/de/tobias/playpad/DisplayableColor.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/DisplayableColor.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/DisplayableColor.java
diff --git a/PlayWallCore/src/de/tobias/playpad/PlayPad.java b/PlayWallCore/src/main/java/de/tobias/playpad/PlayPad.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/PlayPad.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/PlayPad.java
diff --git a/PlayWallCore/src/de/tobias/playpad/PlayPadPlugin.java b/PlayWallCore/src/main/java/de/tobias/playpad/PlayPadPlugin.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/PlayPadPlugin.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/PlayPadPlugin.java
index 03ce9759bdf8cb9342ad60fe480aa3f675564221..fc4f4f481dbd1a2e7e2a7e07400fb3ae0e0553d7 100644
--- a/PlayWallCore/src/de/tobias/playpad/PlayPadPlugin.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/PlayPadPlugin.java
@@ -22,7 +22,7 @@ public final class PlayPadPlugin {
/**
* Gibt die Implementierung für die Registries
- *
+ *
* @return Registry Collection Impl
*/
public static RegistryCollection getRegistryCollection() {
diff --git a/PlayWallCore/src/de/tobias/playpad/RegistryCollection.java b/PlayWallCore/src/main/java/de/tobias/playpad/RegistryCollection.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/RegistryCollection.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/RegistryCollection.java
index b2113868193b47198e43125cc57ceef18e608bcc..c47db038ac7609d71ad6c5820c693055bcbc977a 100644
--- a/PlayWallCore/src/de/tobias/playpad/RegistryCollection.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/RegistryCollection.java
@@ -13,9 +13,8 @@ import de.tobias.playpad.view.main.MainLayoutFactory;
/**
* Schnittstelle für die einzelen Registry. Hier sind alle Registries gesammelt, damit Komponenten registriert werden können. Die
* eigentliche Implementierung ist im Hauptprogramm.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.1.0
*/
public interface RegistryCollection {
diff --git a/PlayWallCore/src/de/tobias/playpad/action/Action.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/Action.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/action/Action.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/Action.java
diff --git a/PlayWallCore/src/de/tobias/playpad/action/ActionDisplayable.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/ActionDisplayable.java
similarity index 83%
rename from PlayWallCore/src/de/tobias/playpad/action/ActionDisplayable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/ActionDisplayable.java
index 02d5724c6a0ab5765ba1c3930d89922adf8a2d7d..3a7cfed274aba66d86e732219b05de5215f71823 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/ActionDisplayable.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/ActionDisplayable.java
@@ -7,22 +7,18 @@ import de.tobias.utils.nui.NVC;
/**
* Einn zusätzliches Interface für die Klasse {@link ActionFactory} oder {@link Action} mit der es möglich ist für ein ActionType oder eine
* Action Einstellungen anzuzeigen.
- *
+ *
* @author tobias
- *
* @since 5.0.0
- *
*/
// TODO Redo
public interface ActionDisplayable extends Displayable {
/**
* Erlaubt es einen ViewController für diesen ActionType oder die Action zu schalten.
- *
- * @param mapping
- * Aktuelles Mapping
- * @param controller
- * Aktueller ViewController für das Mapping
+ *
+ * @param mapping Aktuelles Mapping
+ * @param controller Aktueller ViewController für das Mapping
* @return ViewController für den ActionType
*/
default NVC getActionSettingsViewController(Mapping mapping, IMappingTabViewController controller) {
diff --git a/PlayWallCore/src/de/tobias/playpad/action/ActionFactory.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/ActionFactory.java
similarity index 81%
rename from PlayWallCore/src/de/tobias/playpad/action/ActionFactory.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/ActionFactory.java
index 98fba490069b4a79b45401ef9f1e0d71dc9ee1b4..d1855dbb335966015e59e840f0a1f8b3ed21d733 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/ActionFactory.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/ActionFactory.java
@@ -8,12 +8,10 @@ import java.util.List;
/**
* Verwalter einer Action für die Instance und GUI.
- *
- * @author tobias
*
- * @since 5.0.0
- *
+ * @author tobias
* @see Action Implementierung der eigentlichen Action.
+ * @since 5.0.0
*/
public abstract class ActionFactory extends Component {
@@ -23,11 +21,9 @@ public abstract class ActionFactory extends Component {
/**
* Erstellt ein TreeItem für die Grupierung der Actions.
- *
- * @param actions
- * Liste der alle Actionen dieses Types.
- * @param mapping
- * Mapping, indem die Actions sind.
+ *
+ * @param actions Liste der alle Actionen dieses Types.
+ * @param mapping Mapping, indem die Actions sind.
* @return TreeItem
*/
public abstract TreeItem<ActionDisplayable> getTreeViewForActions(List<Action> actions, Mapping mapping);
@@ -35,26 +31,23 @@ public abstract class ActionFactory extends Component {
/**
* Initialisiert ein Mapping mit allen möglichen Action Varianten. Dies ist nötig, damit alle möglichen Actions in den Einstellungen
* aufgelistet werden können.
- *
- * @param mapping
- * Mapping
- * @param profile
- * Profile für Einstellungen
+ *
+ * @param mapping Mapping
+ * @param profile Profile für Einstellungen
*/
public abstract void initActionType(Mapping mapping, Profile profile);
/**
* Erstellt eine neue Instance der Aktion.
- *
+ *
* @return Neue Instance.
*/
public abstract Action newInstance();
/**
* Gibt die Art der Action zurück. Gibt Auskunft über die Anordnung in den Einstellungen.
- *
+ *
* @return Art der Aktion
- *
* @see ActionType
*/
public abstract ActionType geActionType();
diff --git a/PlayWallCore/src/de/tobias/playpad/action/ActionSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/ActionSerializer.java
similarity index 95%
rename from PlayWallCore/src/de/tobias/playpad/action/ActionSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/ActionSerializer.java
index 527d13e5e67d9dec1b71e241e65f16946c09bb64..7ba35bbb7d9dee9e9167bfa64ad589f75d061335 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/ActionSerializer.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/ActionSerializer.java
@@ -27,11 +27,9 @@ public class ActionSerializer implements XMLSerializer<Action>, XMLDeserializer<
/**
* Speichern.
- *
- * @param mapping
- * mapping
- * @param profile
- * profile
+ *
+ * @param mapping mapping
+ * @param profile profile
*/
public ActionSerializer(Mapping mapping, Profile profile) {
this.mapping = mapping;
diff --git a/PlayWallCore/src/de/tobias/playpad/action/ActionType.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/ActionType.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/action/ActionType.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/ActionType.java
index c685066a7ac7605612cca93304f2a2f8953c465c..790ca108fa8af082af9f71cef43f53fde7474395 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/ActionType.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/ActionType.java
@@ -2,9 +2,8 @@ package de.tobias.playpad.action;
/**
* Art der Action.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.0.0
*/
public enum ActionType {
diff --git a/PlayWallCore/src/de/tobias/playpad/action/InputType.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/InputType.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/action/InputType.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/InputType.java
index 54bb13024158003a000f8f83058b11e574b65479..aa145350e6ae937370f3f140b5ee8335296cd83c 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/InputType.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/InputType.java
@@ -2,9 +2,8 @@ package de.tobias.playpad.action;
/**
* Optionne für die verschiedenen Input Möglichkeiten.
- *
+ *
* @author tobias
- *
* @since 5.0.0
*/
public enum InputType {
diff --git a/PlayWallCore/src/de/tobias/playpad/action/Mapping.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/Mapping.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/action/Mapping.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/Mapping.java
diff --git a/PlayWallCore/src/de/tobias/playpad/action/MappingList.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/MappingList.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/action/MappingList.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/MappingList.java
index dc6d80f1a20ea53dc241bc6e6b6a338bf579dd2d..9dcfcb542e03a87c0342843b8ff5c8b37c1ef486 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/MappingList.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/MappingList.java
@@ -73,7 +73,7 @@ public class MappingList extends ArrayList<Mapping> {
loadMappings.forEach(mapping ->
{
mapping.initActionType(profile); // Update Actions, damit alle da sind und keine fehlt (falls eine gelöscht wurde
- // auf der Datei)
+ // auf der Datei)
mapping.updateDisplayProperty();
mappings.add(mapping);
});
diff --git a/PlayWallCore/src/de/tobias/playpad/action/MappingSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/MappingSerializer.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/action/MappingSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/MappingSerializer.java
diff --git a/PlayWallCore/src/de/tobias/playpad/action/feedback/ColorAdjustable.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjustable.java
similarity index 97%
rename from PlayWallCore/src/de/tobias/playpad/action/feedback/ColorAdjustable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjustable.java
index 0f8e0c3298d277826233f26ffb24f70a619ea446..54fbdf2a7352b01860079b307d3708185d6e353a 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/feedback/ColorAdjustable.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjustable.java
@@ -4,23 +4,22 @@ import de.tobias.playpad.pad.Pad;
/**
* Eine Action implementiert dieses Interface, falls die Feedbackfarbe automatisch an die Farbe der Kachel angepasst werden soll.
- *
+ *
* @author tobias
* @since 5.0.0
- *
*/
public interface ColorAdjustable {
/**
* Ist dieses Feature ative.
- *
+ *
* @return <code>true</code> Active
*/
boolean isAutoFeedbackColors();
/**
* Kachel, die mit dieser Action verkünpft ist.
- *
+ *
* @return Pad
*/
Pad getPad();
diff --git a/PlayWallCore/src/de/tobias/playpad/action/feedback/ColorAdjuster.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/action/feedback/ColorAdjuster.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAdjuster.java
diff --git a/PlayWallCore/src/de/tobias/playpad/action/feedback/ColorAssociator.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAssociator.java
similarity index 84%
rename from PlayWallCore/src/de/tobias/playpad/action/feedback/ColorAssociator.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAssociator.java
index 8ef5df5ac2dd54ede640dadb3273acbe290c1d6b..2f85e744440a90685bf37cf30ee5b549ef69f0ab 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/feedback/ColorAssociator.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/ColorAssociator.java
@@ -4,7 +4,7 @@ import javafx.scene.paint.Color;
/**
* Dieses Interface wird in einem Mapper implementiert. Dabei handelt er die Anfragen für das Mapping von Farben.
- *
+ *
* @author tobias
* @since 5.0.0
*/
@@ -12,40 +12,37 @@ public interface ColorAssociator {
/**
* Gibt die Gerätefarben zurück. Dabei enthalten diese ein Int Value und ein Paint.
- *
+ *
* @return Liste an Farben
*/
DisplayableFeedbackColor[] getColors();
/**
* Standardfarbe, falls nichts passendes gefunden wurde.
- *
+ *
* @return Standardfarbe
*/
DisplayableFeedbackColor getDefaultStandardColor();
/**
* Eventfarbe, falls nichts passendes gefunden wurde.
- *
+ *
* @return Eventfarbe
*/
DisplayableFeedbackColor getDefaultEventColor();
/**
* Setzt die Feedback Farbe für die Instanz des Mappers.
- *
- * @param feedbackMessage
- * Art der Feedbacknachricht
- * @param color
- * Matched Color
+ *
+ * @param feedbackMessage Art der Feedbacknachricht
+ * @param color Matched Color
*/
void setColor(FeedbackMessage feedbackMessage, DisplayableFeedbackColor color);
/**
* Sucht zu einer {@link Color} die passende FeedbackColor, falls vorhanden.
- *
- * @param color
- * Kachel Farbe
+ *
+ * @param color Kachel Farbe
* @return Feedback Farbe oder null.
*/
DisplayableFeedbackColor map(Color color);
diff --git a/PlayWallCore/src/de/tobias/playpad/action/feedback/DisplayableFeedbackColor.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/DisplayableFeedbackColor.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/action/feedback/DisplayableFeedbackColor.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/DisplayableFeedbackColor.java
diff --git a/PlayWallCore/src/de/tobias/playpad/action/feedback/Feedback.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/Feedback.java
similarity index 75%
rename from PlayWallCore/src/de/tobias/playpad/action/feedback/Feedback.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/Feedback.java
index 0f53c30082d0097d84b8f23ca36fc6c1c9edc2bb..5d543dc672a30cdd6e53e7e5e8fbfb8f72862f8e 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/feedback/Feedback.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/Feedback.java
@@ -6,57 +6,49 @@ import org.dom4j.Element;
/**
* Das ist die Abstrakte Klasse für ein Feedback. Jedes Mapper Gerät kann eine eigene Klasse dafür entwickeln. Allerdings müssen gibt es ur
* eine beschränkte Anzahl an Typen von Feedbacks.
- *
- * @author tobias
- *
- * @since 5.0.0
*
+ * @author tobias
* @see FeedbackType Type des Feedbacks. Damit wird es im Mapper initalisiert.
* @see Mapper#initFeedback() Damit wird das Feedback initalisiert im Mapper.
+ * @since 5.0.0
*/
public abstract class Feedback {
/**
* Gibt den Wert für das Gerät zurück, für eine bestimmte Aktion.
- *
- * @param message
- * Art der Feedback Meldung
+ *
+ * @param message Art der Feedback Meldung
* @return Wert für den Mapper
*/
public abstract int getValueForFeedbackMessage(FeedbackMessage message);
/**
* Setzt den Wert für eine Feedback Meldung.
- *
- * @param feedbackMessage
- * Art der Feedback Meldung
- * @param value
- * Wert für den Mapper
+ *
+ * @param feedbackMessage Art der Feedback Meldung
+ * @param value Wert für den Mapper
*/
public abstract void setFeedback(FeedbackMessage feedbackMessage, int value);
/**
* Lädt alle Informationen aus einem XML Objekt.
- *
- * @param feedbackObject
- * XML Object.
+ *
+ * @param feedbackObject XML Object.
*/
public abstract void load(Element feedbackObject);
/**
* Speichert die Informationen des Feedbacks in ein XML Objekt.
- *
- * @param feedbackObject
- * Oberstes Objekt der XML Daten
+ *
+ * @param feedbackObject Oberstes Objekt der XML Daten
*/
public abstract void save(Element feedbackObject);
/**
* Dupliziert ein FeedbackObjeck.
- *
+ *
* @return Duplikat.
- * @throws CloneNotSupportedException
- * Clone Fehlerhaft
+ * @throws CloneNotSupportedException Clone Fehlerhaft
*/
public abstract Feedback cloneFeedback() throws CloneNotSupportedException;
diff --git a/PlayWallCore/src/de/tobias/playpad/action/feedback/FeedbackMessage.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/FeedbackMessage.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/action/feedback/FeedbackMessage.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/FeedbackMessage.java
index c88811c2a3affa447d4cdf923968b29fae8c5ab3..94d1b772a9c4d1bc1c1926d4daff209e3c55a895 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/feedback/FeedbackMessage.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/FeedbackMessage.java
@@ -2,12 +2,10 @@ package de.tobias.playpad.action.feedback;
/**
* Arten von Feedback Meldungen.
- *
- * @author tobias
*
- * @since 5.0.0
- *
+ * @author tobias
* @see Feedback#getValueForFeedbackMessage(FeedbackMessage)
+ * @since 5.0.0
*/
public enum FeedbackMessage {
diff --git a/PlayWallCore/src/de/tobias/playpad/action/feedback/FeedbackType.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/FeedbackType.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/action/feedback/FeedbackType.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/feedback/FeedbackType.java
diff --git a/PlayWallCore/src/de/tobias/playpad/action/mapper/Mapper.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/Mapper.java
similarity index 89%
rename from PlayWallCore/src/de/tobias/playpad/action/mapper/Mapper.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/Mapper.java
index d855493c530b09b43ccc0514353ead41db75a9ed..d0f8c46c88f3b1b062c26d51e13b1b77b013e806 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/mapper/Mapper.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/Mapper.java
@@ -11,13 +11,11 @@ import org.dom4j.Element;
* Jeder Mapper muss zu einer Aktion gehören. Zu jedem Mapper gehört auch ein Feedback. Dieses wird mittels Interfaces in der konktreten
* Implementation definiert. Diese abstrakte Klasse verwaltet allerdings nur den Type des Feedbacks. Die eigentloche Implementierung des
* Feedbacks ist Aufgabe des konkreten Mappers.
- *
- * @author tobias
*
- * @since 5.0.0
- *
+ * @author tobias
* @see Action Aktion, zu der ein Mapper gehört.
* @see Feedback Feedback für ein Mapper.
+ * @since 5.0.0
*/
public abstract class Mapper implements Displayable, Cloneable {
@@ -28,12 +26,9 @@ public abstract class Mapper implements Displayable, Cloneable {
/**
* Setzt den FeedbackType des Mappers und initalisiert ihn.
- *
- * @param feedbackType
- * neuer FeedbackType
- *
+ *
+ * @param feedbackType neuer FeedbackType
* @see Mapper#initFeedback() wird automatisch aufgerufen.
- *
*/
@Deprecated // Referenz auf Action, da Action den FeedbackType schon hat
public void setFeedbackType(FeedbackType feedbackType) {
@@ -43,7 +38,7 @@ public abstract class Mapper implements Displayable, Cloneable {
/**
* Gibt den FeedbackType für den entsprechenden Mapper zurück.
- *
+ *
* @return FeedbackType für den Mapper.
*/
@Deprecated
@@ -61,32 +56,29 @@ public abstract class Mapper implements Displayable, Cloneable {
/**
* ID des Mappers.
- *
+ *
* @return IDs
*/
public abstract String getType();
/**
* Deserialisierung der Daten
- *
- * @param element
- * XML Element
- * @param action
- * Zugehörige Action
+ *
+ * @param element XML Element
+ * @param action Zugehörige Action
*/
public abstract void load(Element element, Action action);
/**
* Speichert die Einstellungen eines Mappers.
- *
- * @param element
- * Oberstes Objekt der XML Daten
+ *
+ * @param element Oberstes Objekt der XML Daten
*/
public abstract void save(Element element);
/**
* Dupliziert ein Mapper Objekt.
- *
+ *
* @return Duplikat.
* @throws CloneNotSupportedException Clone Fehlgeschlagen
*/
diff --git a/PlayWallCore/src/de/tobias/playpad/action/mapper/MapperConnectFeedbackable.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperConnectFeedbackable.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/action/mapper/MapperConnectFeedbackable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperConnectFeedbackable.java
index b663edb04f5c5e05470ee9c86646689cfefc88bc..a15a912057ae696b36eb1728f6c829013a1389b3 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/mapper/MapperConnectFeedbackable.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperConnectFeedbackable.java
@@ -2,9 +2,8 @@ package de.tobias.playpad.action.mapper;
/**
* Dieses Interface ermöglicht einem Mapper Gerät (nicht einem speziellen Mapping mit einer Action) sich einzurichten und wieder zu clearen.
- *
- * @author tobias
*
+ * @author tobias
*/
public interface MapperConnectFeedbackable {
diff --git a/PlayWallCore/src/de/tobias/playpad/action/mapper/MapperFactory.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperFactory.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/action/mapper/MapperFactory.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperFactory.java
diff --git a/PlayWallCore/src/de/tobias/playpad/action/mapper/MapperFeedbackable.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperFeedbackable.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/action/mapper/MapperFeedbackable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperFeedbackable.java
diff --git a/PlayWallCore/src/de/tobias/playpad/action/mapper/MapperSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperSerializer.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/action/mapper/MapperSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperSerializer.java
index f8042d3f058e4206e28a4b1c185d4746ce470b5d..990d7a8aef0d15522181b9d1efdd9ee82652ab13 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/mapper/MapperSerializer.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperSerializer.java
@@ -9,9 +9,8 @@ import org.dom4j.Element;
/**
* Laden und Speichern von Mappern (Array von Mappern)
- *
- * @author tobias
*
+ * @author tobias
* @since 5.0.1
*/
public class MapperSerializer implements XMLSerializer<Mapper>, XMLDeserializer<Mapper> {
@@ -23,7 +22,7 @@ public class MapperSerializer implements XMLSerializer<Mapper>, XMLDeserializer<
public MapperSerializer(Action action) {
this.action = action;
}
-
+
@Override
public Mapper loadElement(Element element) {
String mapperType = element.attributeValue(MAPPER_TYPE);
diff --git a/PlayWallCore/src/de/tobias/playpad/action/mapper/MapperViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperViewController.java
similarity index 97%
rename from PlayWallCore/src/de/tobias/playpad/action/mapper/MapperViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperViewController.java
index 49b01acd997fe4059e046f01a6104611949871e7..e47650598e26dfac0eed9e8055c0a4395730635b 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/mapper/MapperViewController.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/mapper/MapperViewController.java
@@ -4,11 +4,9 @@ import de.tobias.utils.nui.NVC;
/**
* Übersicht über die Mapper zu einer Action.s
- *
+ *
* @author tobias
- *
* @since 5.0.0
- *
*/
public abstract class MapperViewController extends NVC {
@@ -20,7 +18,7 @@ public abstract class MapperViewController extends NVC {
/**
* Zeigt einen Dialog für die Eingabe des Mappers.
- *
+ *
* @return <code>true</code> Erfolgreiche Einageb, <code>false</code> Abbruch oder Fehler.
*/
public abstract boolean showInputMapperUI();
diff --git a/PlayWallCore/src/de/tobias/playpad/action/mididevice/DeviceColorAssociatorConnector.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/mididevice/DeviceColorAssociatorConnector.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/action/mididevice/DeviceColorAssociatorConnector.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/mididevice/DeviceColorAssociatorConnector.java
index 2a2e634ce81df86a516a631a4d64459b6bc3dfb1..16804f7a070de2f281118a77c0382b22e6f7d006 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/mididevice/DeviceColorAssociatorConnector.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/mididevice/DeviceColorAssociatorConnector.java
@@ -10,6 +10,6 @@ public interface DeviceColorAssociatorConnector {
DisplayableFeedbackColor getDefaultEventColor();
DisplayableFeedbackColor[] getColors();
-
+
DisplayableFeedbackColor map(Color color);
}
diff --git a/PlayWallCore/src/de/tobias/playpad/action/mididevice/MidiDeviceImpl.java b/PlayWallCore/src/main/java/de/tobias/playpad/action/mididevice/MidiDeviceImpl.java
similarity index 96%
rename from PlayWallCore/src/de/tobias/playpad/action/mididevice/MidiDeviceImpl.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/action/mididevice/MidiDeviceImpl.java
index cf57445f3fbb7866a41fd0a532bf0d5cc24f5dfc..5d781982a360d40fc1e12f80b5efe8240b0909b5 100644
--- a/PlayWallCore/src/de/tobias/playpad/action/mididevice/MidiDeviceImpl.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/action/mididevice/MidiDeviceImpl.java
@@ -14,9 +14,8 @@ import java.util.List;
/**
* Abstraktes Midi Gerät. Jede Implementierung musss hier von erben. Es ist zugleich ein Listener und registriert die Listener beim
* Erstellen automatisch auf Implementierung. Mögliche Interfaces: DeviceColorAssociatorConnector
- *
+ *
* @author tobias
- *
* @since 5.0.0
*/
public abstract class MidiDeviceImpl extends EventDispatcher implements Listener {
@@ -41,7 +40,8 @@ public abstract class MidiDeviceImpl extends EventDispatcher implements Listener
public abstract void clearFeedback();
// Custom Midi Actions
- public void onMidiMessage(MidiMessage message) {}
+ public void onMidiMessage(MidiMessage message) {
+ }
@Override
public void dispatchEvent(Event event) {
diff --git a/PlayWallCore/src/de/tobias/playpad/audio/AudioCapability.java b/PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioCapability.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/audio/AudioCapability.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioCapability.java
diff --git a/PlayWallCore/src/de/tobias/playpad/audio/AudioEqualizeable.java b/PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioEqualizeable.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/audio/AudioEqualizeable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioEqualizeable.java
diff --git a/PlayWallCore/src/de/tobias/playpad/audio/AudioFeature.java b/PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioFeature.java
similarity index 96%
rename from PlayWallCore/src/de/tobias/playpad/audio/AudioFeature.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioFeature.java
index 7805f9ffc202c94465606069b8aed99580ecc556..4513298414ec165f51008cbbe94dad85004f81ad 100644
--- a/PlayWallCore/src/de/tobias/playpad/audio/AudioFeature.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioFeature.java
@@ -2,9 +2,8 @@ package de.tobias.playpad.audio;
/**
* Flag für Audiofeature
- *
- * @author tobias
*
+ * @author tobias
*/
public interface AudioFeature {
diff --git a/PlayWallCore/src/de/tobias/playpad/audio/AudioHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioHandler.java
similarity index 94%
rename from PlayWallCore/src/de/tobias/playpad/audio/AudioHandler.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioHandler.java
index 72cd79f4cc4ba3bcb49c58e94fa496a8e0f2e501..36ca1614401b65240b81e2bda609a9110abff470 100644
--- a/PlayWallCore/src/de/tobias/playpad/audio/AudioHandler.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioHandler.java
@@ -39,14 +39,16 @@ public abstract class AudioHandler {
public abstract void stop();
/**
- * Get the current play position of the current player.
+ * Get the current play position of the current player.
+ *
* @return current position
*/
public abstract Duration getPosition();
/**
* Get the current play position of the current player.
- * @return current position property
+ *
+ * @return current position property
*/
public abstract ReadOnlyObjectProperty<Duration> positionProperty();
diff --git a/PlayWallCore/src/de/tobias/playpad/audio/AudioHandlerFactory.java b/PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioHandlerFactory.java
similarity index 87%
rename from PlayWallCore/src/de/tobias/playpad/audio/AudioHandlerFactory.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioHandlerFactory.java
index b1e4e8a0ccb32c737ee7756d8622800e93762abf..11d8add4d0feef26634f5f488caebf5f90fdc62b 100644
--- a/PlayWallCore/src/de/tobias/playpad/audio/AudioHandlerFactory.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioHandlerFactory.java
@@ -10,7 +10,6 @@ import de.tobias.playpad.viewcontroller.AudioHandlerViewController;
* If an AudioHandler have some cleanups on shutdown to do, it must implement {@link AutoCloseable}
*
* @author tobias
- *
* @since 5.0.0
*/
public abstract class AudioHandlerFactory extends Component {
@@ -21,18 +20,16 @@ public abstract class AudioHandlerFactory extends Component {
/**
* Erstellt für eine Kachel ein neunes AudioInterface
- *
- * @param content
- * Content des Pads
+ *
+ * @param content Content des Pads
* @return AudioHandler
*/
public abstract AudioHandler createAudioHandler(PadContent content);
/**
* Check if an audio feature is available in the implementation
- *
- * @param audioCapability
- * Feature
+ *
+ * @param audioCapability Feature
* @return <code>true</code> available
*/
public abstract boolean isFeatureAvailable(AudioCapability audioCapability);
@@ -40,9 +37,8 @@ public abstract class AudioHandlerFactory extends Component {
/**
* Gibt wenn vorhanden einen ViewController für die entsprechenden
* Einstellungen zurück.
- *
- * @param audioCapablility
- * Audio Feature
+ *
+ * @param audioCapablility Audio Feature
* @return ViewController
*/
public abstract AudioHandlerViewController getAudioFeatureSettings(AudioCapability audioCapablility);
diff --git a/PlayWallCore/src/de/tobias/playpad/audio/AudioRegistry.java b/PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioRegistry.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/audio/AudioRegistry.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/audio/AudioRegistry.java
diff --git a/PlayWallCore/src/de/tobias/playpad/audio/Peakable.java b/PlayWallCore/src/main/java/de/tobias/playpad/audio/Peakable.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/audio/Peakable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/audio/Peakable.java
index 8dd1f580c6f65060dc6921b473f5a3d2f4d62fd8..b2bb956226fd806fafde29776d7df62c00c89855 100644
--- a/PlayWallCore/src/de/tobias/playpad/audio/Peakable.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/audio/Peakable.java
@@ -9,8 +9,8 @@ public interface Peakable {
LEFT,
RIGHT
}
-
+
DoubleProperty audioLevelProperty(Channel channel);
-
+
double getAudioLevel(Channel channel);
}
diff --git a/PlayWallCore/src/de/tobias/playpad/audio/Soundcardable.java b/PlayWallCore/src/main/java/de/tobias/playpad/audio/Soundcardable.java
similarity index 96%
rename from PlayWallCore/src/de/tobias/playpad/audio/Soundcardable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/audio/Soundcardable.java
index 3705e375b8df0bba7abda3db1feff8018cdcbf39..b4f5eec0cb1eadd74270017b4f129d7ac6e050ac 100644
--- a/PlayWallCore/src/de/tobias/playpad/audio/Soundcardable.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/audio/Soundcardable.java
@@ -2,11 +2,9 @@ package de.tobias.playpad.audio;
/**
* Setzt die Soundcard für die Audioimplementierung.
- *
+ *
* @author tobias
- *
* @since 6.0.0
- *
*/
public interface Soundcardable extends AudioFeature {
diff --git a/PlayWallCore/src/de/tobias/playpad/design/ColorModeHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/ColorModeHandler.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/design/ColorModeHandler.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/ColorModeHandler.java
index 030a79d8cd9140fe5a59aa8cd2564aaf2328388d..fb78c30ef1506d3019822b3e5d19d6adf8d0d4c3 100644
--- a/PlayWallCore/src/de/tobias/playpad/design/ColorModeHandler.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/design/ColorModeHandler.java
@@ -8,9 +8,8 @@ import java.util.function.Consumer;
/**
* Wenn vom Design unterstützt, wird hier die GUI für Farbeinstellungen erstellt.
- *
- * @author tobias
*
+ * @author tobias
*/
public interface ColorModeHandler {
diff --git a/PlayWallCore/src/de/tobias/playpad/design/Design.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/Design.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/design/Design.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/Design.java
diff --git a/PlayWallCore/src/de/tobias/playpad/design/DesignColorAssociator.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/DesignColorAssociator.java
similarity index 97%
rename from PlayWallCore/src/de/tobias/playpad/design/DesignColorAssociator.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/DesignColorAssociator.java
index fdc3ce3caca7a68ad8a3c849cc6ceee85373431f..d00cbaeb94264a0ac7c41634a0cdaaa7671cc869 100644
--- a/PlayWallCore/src/de/tobias/playpad/design/DesignColorAssociator.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/design/DesignColorAssociator.java
@@ -5,7 +5,7 @@ import javafx.scene.paint.Color;
/**
* Methoden für die Verwaltung der Farben, die an einer Kachel eingestellt sind. Das ist wichtig, falls Kachel eine andere Farbverwaltung
* verwendet (beispiel Lineare Gradient).
- *
+ *
* @author tobias
* @since 5.0.0
*/
@@ -13,14 +13,14 @@ public interface DesignColorAssociator {
/**
* Gibt die Standardfarbe (Kacheln ohne Aktion) zurück.
- *
+ *
* @return Farbe der Kachel
*/
Color getAssociatedStandardColor();
/**
* Gibt die Eventfarbe (Kacheln mit Aktion) zurück.
- *
+ *
* @return Farbe der Kachel
*/
Color getAssociatedEventColor();
diff --git a/PlayWallCore/src/de/tobias/playpad/design/FadeableColor.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/FadeableColor.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/design/FadeableColor.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/FadeableColor.java
diff --git a/PlayWallCore/src/de/tobias/playpad/design/ModernDesignHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/ModernDesignHandler.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/design/ModernDesignHandler.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/ModernDesignHandler.java
diff --git a/PlayWallCore/src/de/tobias/playpad/design/modern/ModernCartDesign2.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernCartDesign2.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/design/modern/ModernCartDesign2.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernCartDesign2.java
diff --git a/PlayWallCore/src/de/tobias/playpad/design/modern/ModernCartDesignHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernCartDesignHandler.java
similarity index 91%
rename from PlayWallCore/src/de/tobias/playpad/design/modern/ModernCartDesignHandler.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernCartDesignHandler.java
index fb1d843493e1223dcaf3a9b69f5be31b5b8849d5..e00643532a33c28554a264a10b162486fa8e13cd 100644
--- a/PlayWallCore/src/de/tobias/playpad/design/modern/ModernCartDesignHandler.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernCartDesignHandler.java
@@ -8,8 +8,8 @@ public interface ModernCartDesignHandler {
String convertToCss(ModernCartDesign2 design, String classSuffix, boolean fullCss, boolean flat);
/*
- * Wird in einem neuen Thread aufgerufen
- */
+ * Wird in einem neuen Thread aufgerufen
+ */
void handleWarning(ModernCartDesign2 design, IPadViewController controller, Duration warning, ModernGlobalDesign2 globalDesign);
default void stopWarning(ModernCartDesign2 design, IPadViewController controller) {
diff --git a/PlayWallCore/src/de/tobias/playpad/design/modern/ModernColor.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernColor.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/design/modern/ModernColor.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernColor.java
diff --git a/PlayWallCore/src/de/tobias/playpad/design/modern/ModernGlobalDesign2.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernGlobalDesign2.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/design/modern/ModernGlobalDesign2.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernGlobalDesign2.java
diff --git a/PlayWallCore/src/de/tobias/playpad/design/modern/ModernGlobalDesignHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernGlobalDesignHandler.java
similarity index 93%
rename from PlayWallCore/src/de/tobias/playpad/design/modern/ModernGlobalDesignHandler.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernGlobalDesignHandler.java
index ae72217aa5a1c27d00a1453ccb13980da41ca096..69e7b8d0ae62eb1d41f5157c3289fd943dfa1b4b 100644
--- a/PlayWallCore/src/de/tobias/playpad/design/modern/ModernGlobalDesignHandler.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernGlobalDesignHandler.java
@@ -13,8 +13,8 @@ public interface ModernGlobalDesignHandler {
void applyCssMainView(ModernGlobalDesign2 design, IMainViewController controller, Stage stage, Project project);
/*
- * Wird in einem neuen Thread aufgerufen
- */
+ * Wird in einem neuen Thread aufgerufen
+ */
void handleWarning(ModernGlobalDesign2 design, IPadViewController controller, Duration warning);
default void stopWarning(ModernGlobalDesign2 design, IPadViewController controller) {
diff --git a/PlayWallCore/src/de/tobias/playpad/design/modern/serializer/ModernCartDesignSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/serializer/ModernCartDesignSerializer.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/design/modern/serializer/ModernCartDesignSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/modern/serializer/ModernCartDesignSerializer.java
diff --git a/PlayWallCore/src/de/tobias/playpad/design/modern/serializer/ModernGlobalDesignSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/serializer/ModernGlobalDesignSerializer.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/design/modern/serializer/ModernGlobalDesignSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/modern/serializer/ModernGlobalDesignSerializer.java
diff --git a/PlayWallCore/src/de/tobias/playpad/event/Event.java b/PlayWallCore/src/main/java/de/tobias/playpad/event/Event.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/event/Event.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/event/Event.java
diff --git a/PlayWallCore/src/de/tobias/playpad/event/EventDispatcher.java b/PlayWallCore/src/main/java/de/tobias/playpad/event/EventDispatcher.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/event/EventDispatcher.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/event/EventDispatcher.java
diff --git a/PlayWallCore/src/de/tobias/playpad/event/EventHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/event/EventHandler.java
similarity index 82%
rename from PlayWallCore/src/de/tobias/playpad/event/EventHandler.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/event/EventHandler.java
index 1a88a0282dccf0c0c4fc5d43c27d362ffba80262..9777c66731694798515386aad99073a84592650f 100644
--- a/PlayWallCore/src/de/tobias/playpad/event/EventHandler.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/event/EventHandler.java
@@ -2,7 +2,7 @@ package de.tobias.playpad.event;
import java.lang.annotation.*;
-@Target({ ElementType.METHOD })
+@Target({ElementType.METHOD})
@Documented
@Retention(RetentionPolicy.RUNTIME)
public @interface EventHandler {
diff --git a/PlayWallCore/src/de/tobias/playpad/event/Listener.java b/PlayWallCore/src/main/java/de/tobias/playpad/event/Listener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/event/Listener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/event/Listener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/log/LogItem.java b/PlayWallCore/src/main/java/de/tobias/playpad/log/LogItem.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/log/LogItem.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/log/LogItem.java
diff --git a/PlayWallCore/src/de/tobias/playpad/log/LogSeason.java b/PlayWallCore/src/main/java/de/tobias/playpad/log/LogSeason.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/log/LogSeason.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/log/LogSeason.java
diff --git a/PlayWallCore/src/de/tobias/playpad/log/LogSeasons.java b/PlayWallCore/src/main/java/de/tobias/playpad/log/LogSeasons.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/log/LogSeasons.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/log/LogSeasons.java
index 1f5cd0ec2453fc639a2f4425a402d63d782bcd7b..52cf961d515ef0e38d165f038718ae9a1b87e354 100644
--- a/PlayWallCore/src/de/tobias/playpad/log/LogSeasons.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/log/LogSeasons.java
@@ -21,7 +21,7 @@ public class LogSeasons {
if (storageHandler != null) {
storageHandler.addLogSeason(INSTANCE);
}
-
+
return INSTANCE;
}
diff --git a/PlayWallCore/src/de/tobias/playpad/log/PlayOutItem.java b/PlayWallCore/src/main/java/de/tobias/playpad/log/PlayOutItem.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/log/PlayOutItem.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/log/PlayOutItem.java
diff --git a/PlayWallCore/src/de/tobias/playpad/log/listener/PadMediaPathLogListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/log/listener/PadMediaPathLogListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/log/listener/PadMediaPathLogListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/log/listener/PadMediaPathLogListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/log/listener/PadPlayLogListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/log/listener/PadPlayLogListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/log/listener/PadPlayLogListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/log/listener/PadPlayLogListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/log/storage/LogSeasonStorageHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/log/storage/LogSeasonStorageHandler.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/log/storage/LogSeasonStorageHandler.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/log/storage/LogSeasonStorageHandler.java
diff --git a/PlayWallCore/src/de/tobias/playpad/log/storage/SqlLiteLogSeasonStorageHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/log/storage/SqlLiteLogSeasonStorageHandler.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/log/storage/SqlLiteLogSeasonStorageHandler.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/log/storage/SqlLiteLogSeasonStorageHandler.java
diff --git a/PlayWallCore/src/de/tobias/playpad/midi/Midi.java b/PlayWallCore/src/main/java/de/tobias/playpad/midi/Midi.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/midi/Midi.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/midi/Midi.java
diff --git a/PlayWallCore/src/de/tobias/playpad/midi/MidiListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/midi/MidiListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/midi/MidiListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/midi/MidiListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/midi/device/DefaultMidiDeviceImpl.java b/PlayWallCore/src/main/java/de/tobias/playpad/midi/device/DefaultMidiDeviceImpl.java
similarity index 89%
rename from PlayWallCore/src/de/tobias/playpad/midi/device/DefaultMidiDeviceImpl.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/midi/device/DefaultMidiDeviceImpl.java
index dd0fdbb5dfcb2863134e5ba8cfb0d91df68d57f6..273459124a63f682b702b365d02af4135054d61b 100644
--- a/PlayWallCore/src/de/tobias/playpad/midi/device/DefaultMidiDeviceImpl.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/midi/device/DefaultMidiDeviceImpl.java
@@ -18,13 +18,16 @@ public class DefaultMidiDeviceImpl extends MidiDeviceImpl {
}
@Override
- public void handleFeedback(FeedbackMessage type, int key, Feedback feedback) {}
+ public void handleFeedback(FeedbackMessage type, int key, Feedback feedback) {
+ }
@Override
- public void initDevice() {}
+ public void initDevice() {
+ }
@Override
- public void clearFeedback() {}
+ public void clearFeedback() {
+ }
@Override
public DisplayableFeedbackColor getColor(int id) {
diff --git a/PlayWallCore/src/de/tobias/playpad/midi/device/DeviceRegistry.java b/PlayWallCore/src/main/java/de/tobias/playpad/midi/device/DeviceRegistry.java
similarity index 83%
rename from PlayWallCore/src/de/tobias/playpad/midi/device/DeviceRegistry.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/midi/device/DeviceRegistry.java
index d3dc94ad8d8d52b057efc0fe4167cc8354848400..e81fb5c7dc1a00e4c52c57b1e1b11875e727c42e 100644
--- a/PlayWallCore/src/de/tobias/playpad/midi/device/DeviceRegistry.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/midi/device/DeviceRegistry.java
@@ -11,10 +11,9 @@ import java.util.List;
/**
* Verwaltet die Midi Geräte Implementierung. Hier werden Geräte registiert und bei Verwendung instanziert für das Programm.
- *
+ *
* @author tobias
* @since 3.0.0
- *
*/
public class DeviceRegistry extends EventDispatcher {
@@ -31,11 +30,9 @@ public class DeviceRegistry extends EventDispatcher {
/**
* Registriert eine neue Implementierung für ein Midi Gerät
- *
- * @param id
- * Names des Gerätes, muss exakt der Produktname sein
- * @param device
- * Implementierung als Klasse, Instanz erstellt das Programm bei bei bedarf
+ *
+ * @param id Names des Gerätes, muss exakt der Produktname sein
+ * @param device Implementierung als Klasse, Instanz erstellt das Programm bei bei bedarf
*/
public void registerDevice(String id, Class<? extends MidiDeviceImpl> device) {
devices.put(id, device);
@@ -44,14 +41,11 @@ public class DeviceRegistry extends EventDispatcher {
/**
* Instanz einer Implementierung für ein Midi Gerät.
- *
- * @param id
- * Name des Geräts
+ *
+ * @param id Name des Geräts
* @return Implementierung, DefaultMidiDeviceImpl wenn keine vorhanden oder registriert über register
- * @throws InstantiationException
- * Fehler beim instanzieren
- * @throws IllegalAccessException
- * Fehler beim instanzieren
+ * @throws InstantiationException Fehler beim instanzieren
+ * @throws IllegalAccessException Fehler beim instanzieren
* @see DeviceRegistry#registerDevice(String, Class)
* @see DefaultMidiDeviceImpl
*/
@@ -67,7 +61,7 @@ public class DeviceRegistry extends EventDispatcher {
/**
* Instanz der MidiDeviceImpl Component
- *
+ *
* @return instance
*/
public static DeviceRegistry getFactoryInstance() {
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/Pad.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/Pad.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/Pad.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/Pad.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/PadException.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/PadException.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/pad/PadException.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/PadException.java
index afb9ca9620a59c861804ca0bba4d634a6f79212f..d915cdf95bdc4af793973855c91285a9eb540a32 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/PadException.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/PadException.java
@@ -12,7 +12,7 @@ import java.nio.file.Path;
public class PadException extends Exception {
/**
- *
+ *
*/
private static final long serialVersionUID = 1L;
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/PadSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/PadSerializer.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/PadSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/PadSerializer.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/PadSettings.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/PadSettings.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/PadSettings.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/PadSettings.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/PadSettingsSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/PadSettingsSerializer.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/PadSettingsSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/PadSettingsSerializer.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/PadStatus.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/PadStatus.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/PadStatus.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/PadStatus.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/TimeMode.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/TimeMode.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/TimeMode.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/TimeMode.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/content/PadContent.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/PadContent.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/content/PadContent.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/content/PadContent.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/content/PadContentFactory.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/PadContentFactory.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/content/PadContentFactory.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/content/PadContentFactory.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/content/PadContentRegistry.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/PadContentRegistry.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/content/PadContentRegistry.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/content/PadContentRegistry.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/content/path/MultiPathContent.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/path/MultiPathContent.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/pad/content/path/MultiPathContent.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/content/path/MultiPathContent.java
index 5bf4264416199761b406710456af3468f1eeb740..27578e18be1489581360561d33ca2a7014ee9b51 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/content/path/MultiPathContent.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/path/MultiPathContent.java
@@ -7,12 +7,12 @@ import java.util.List;
* A PadContent should implement this interface, if the content consists of multiple files. If this interface is implemented, the program can easily obtain the media paths.
*
* @author tobias
- *
*/
public interface MultiPathContent {
/**
* Get a list of the used media files.
+ *
* @return media files
*/
List<Path> getPaths();
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/content/path/SinglePathContent.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/path/SinglePathContent.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/pad/content/path/SinglePathContent.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/content/path/SinglePathContent.java
index 37fae2f831f71118d74cb4d26a488587397a667c..16d4f10546315ae2a3a4f7053a5e3d35ec25f2b9 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/content/path/SinglePathContent.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/path/SinglePathContent.java
@@ -6,12 +6,12 @@ import java.nio.file.Path;
* A PadContent should implement this interface, if the content consists of one file. If this interface is implemented, the program can easily obtain the media path.
*
* @author tobias
- *
*/
public interface SinglePathContent {
/**
* Get the media path of the content.
+ *
* @return media path
*/
Path getPath();
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/content/play/Durationable.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/play/Durationable.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/content/play/Durationable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/content/play/Durationable.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/content/play/Equalizeable.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/play/Equalizeable.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/content/play/Equalizeable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/content/play/Equalizeable.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/content/play/Pauseable.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/play/Pauseable.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/content/play/Pauseable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/content/play/Pauseable.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/content/play/Seekable.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/content/play/Seekable.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/content/play/Seekable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/content/play/Seekable.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/drag/PadDragMode.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/drag/PadDragMode.java
similarity index 82%
rename from PlayWallCore/src/de/tobias/playpad/pad/drag/PadDragMode.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/drag/PadDragMode.java
index dbf4e0796473c3e0a3660357d60bee5328f291c8..1b557e68bae1db2c5a094462b860cd0846de5e3d 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/drag/PadDragMode.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/drag/PadDragMode.java
@@ -6,9 +6,8 @@ import de.tobias.playpad.registry.Component;
/**
* Modus um ein Pad mit Drag and Drop zu verschieben.
- *
- * @author tobias
*
+ * @author tobias
* @since 6.0.0
*/
public abstract class PadDragMode extends Component implements Comparable<PadDragMode> {
@@ -19,13 +18,10 @@ public abstract class PadDragMode extends Component implements Comparable<PadDra
/**
* Führt die Drag and Drop Aktion aus, ändert das Datenmodell.
- *
- * @param oldPad
- * Alter Index
- * @param newPad
- * Neuer Index
- * @param project
- * Projekt zu den Pads
+ *
+ * @param oldPad Alter Index
+ * @param newPad Neuer Index
+ * @param project Projekt zu den Pads
* @return <code>true</code> Erfolgreiches DnD
*/
public abstract boolean handle(PadIndex oldPad, PadIndex newPad, Project project);
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/fade/Fade.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/Fade.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/fade/Fade.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/Fade.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/fade/FadeDelegate.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/FadeDelegate.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/fade/FadeDelegate.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/FadeDelegate.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/fade/Fadeable.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/Fadeable.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/fade/Fadeable.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/Fadeable.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/fade/listener/PadFadeContentListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/listener/PadFadeContentListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/fade/listener/PadFadeContentListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/listener/PadFadeContentListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/fade/listener/PadFadeDurationListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/listener/PadFadeDurationListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/fade/listener/PadFadeDurationListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/fade/listener/PadFadeDurationListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/listener/IPadPositionListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/IPadPositionListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/listener/IPadPositionListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/IPadPositionListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/listener/PadStatusControlListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/PadStatusControlListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/listener/PadStatusControlListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/PadStatusControlListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/listener/PadStatusNotFoundListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/PadStatusNotFoundListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/listener/PadStatusNotFoundListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/PadStatusNotFoundListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/listener/trigger/PadTriggerContentListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/trigger/PadTriggerContentListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/listener/trigger/PadTriggerContentListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/trigger/PadTriggerContentListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/listener/trigger/PadTriggerDurationListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/trigger/PadTriggerDurationListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/listener/trigger/PadTriggerDurationListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/trigger/PadTriggerDurationListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/listener/trigger/PadTriggerStatusListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/trigger/PadTriggerStatusListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/listener/trigger/PadTriggerStatusListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/listener/trigger/PadTriggerStatusListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/mediapath/MediaPath.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/mediapath/MediaPath.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/mediapath/MediaPath.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/mediapath/MediaPath.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/mediapath/MediaPool.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/mediapath/MediaPool.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/pad/mediapath/MediaPool.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/mediapath/MediaPool.java
index 349aeaabbc155de69d603e28dbb3b91a3b520ec7..ba99d90aaf41026d078a66940416944da9fbbe78 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/mediapath/MediaPool.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/mediapath/MediaPool.java
@@ -109,7 +109,7 @@ public class MediaPool {
stmt = connection.prepareStatement("INSERT INTO Path VALUES (?, ?, ?)");
stmt.setString(1, path.getId().toString());
stmt.setString(2, path.getPad().getProject().getProjectReference().getUuid().toString());
- stmt.setString(3, localPath != null ? localPath.toString(): null);
+ stmt.setString(3, localPath != null ? localPath.toString() : null);
stmt.executeUpdate();
} catch (SQLException e) {
e.printStackTrace();
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadContentView.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/view/IPadContentView.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/pad/view/IPadContentView.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/view/IPadContentView.java
index 6d0b085c6055d8696b12fc163f0b277140008531..163bc2dd768b4e55b6dbb4f6e7eb7c9b5949908b 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadContentView.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/view/IPadContentView.java
@@ -3,18 +3,18 @@ package de.tobias.playpad.pad.view;
import javafx.scene.Node;
// TODO Rename to ContentView
+
/**
* Schnittstelle für die Vorschau des PadContent eines Pads.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.1.0
*/
public interface IPadContentView {
/**
* Gibt das GUI Element zurück.
- *
+ *
* @return GUI Element
*/
Node getNode();
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadView.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/view/IPadView.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/pad/view/IPadView.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/view/IPadView.java
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/viewcontroller/IPadViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/viewcontroller/IPadViewController.java
similarity index 94%
rename from PlayWallCore/src/de/tobias/playpad/pad/viewcontroller/IPadViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/pad/viewcontroller/IPadViewController.java
index 673dd449028cc9fd08e5c9fc5e7a7e8b5510ebd3..6c010518809856910286625e81179040dfcb5c13 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/viewcontroller/IPadViewController.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/viewcontroller/IPadViewController.java
@@ -8,32 +8,30 @@ import javafx.util.Duration;
/**
* Schnittstellen um mit einem PadViewController zu kommunizieren.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.1.0
*/
public interface IPadViewController {
/**
* Gibt das Pad zurück, welches er verwaltet. (Das Datenmodel)
- *
+ *
* @return Pad
*/
Pad getPad();
/**
* Gibt die View des Controllers zurück.
- *
+ *
* @return View
*/
IPadView getView();
/**
* Setzt ein Pad für ein View. Hier werden die Datein mittels ViewController der View bekannt gemacht.
- *
- * @param pad
- * Neues Pad
+ *
+ * @param pad Neues Pad
*/
void setupPad(Pad pad);
diff --git a/PlayWallCore/src/de/tobias/playpad/plugin/AdvancedPlugin.java b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/AdvancedPlugin.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/plugin/AdvancedPlugin.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/plugin/AdvancedPlugin.java
index 33085c617914d081d1cab3bd209cb7c902a0b7b3..0e2f1dd0fffd36a3bffba26c4347e3a18b2c6611 100644
--- a/PlayWallCore/src/de/tobias/playpad/plugin/AdvancedPlugin.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/AdvancedPlugin.java
@@ -4,9 +4,8 @@ import de.tobias.updater.client.Updatable;
/**
* Schnittatelle, von der Plugins erben, damit diese alle notwendigen Services unterstützen.
- *
- * @author tobias - s0553746
*
+ * @author tobias - s0553746
*/
public interface AdvancedPlugin extends net.xeoh.plugins.base.Plugin {
diff --git a/PlayWallCore/src/de/tobias/playpad/plugin/ModernPlugin.java b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/ModernPlugin.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/plugin/ModernPlugin.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/plugin/ModernPlugin.java
diff --git a/PlayWallCore/src/de/tobias/playpad/plugin/ModernPluginManager.java b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/ModernPluginManager.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/plugin/ModernPluginManager.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/plugin/ModernPluginManager.java
index 244258dfbd0400be66561572deedc61458ff4bb7..d02387f3a17a122c54c0ed8088e3aadc8ed9ff84 100644
--- a/PlayWallCore/src/de/tobias/playpad/plugin/ModernPluginManager.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/ModernPluginManager.java
@@ -87,8 +87,7 @@ public class ModernPluginManager {
/**
* Fügt ein Plugin hinzu, sich zu löschen.
*
- * @param path
- * Pfad zu einem Plugin
+ * @param path Pfad zu einem Plugin
*/
private void addDeletedPlugin(Path path) {
deletedPlugins.add(path);
diff --git a/PlayWallCore/src/de/tobias/playpad/plugin/Module.java b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/Module.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/plugin/Module.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/plugin/Module.java
index 19c04e6d4ffebce95722c596236ce2207de0cf26..e280d35ea2fa6bb15fb6551389f8b1f05ac088ba 100644
--- a/PlayWallCore/src/de/tobias/playpad/plugin/Module.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/Module.java
@@ -2,9 +2,8 @@ package de.tobias.playpad.plugin;
/**
* Ein Modul beschreibt ein Plugin. Es wird verwendet, um Components der Registry einem Mpdul zuzuordnen.
- *
- * @author tobias - s0553746
*
+ * @author tobias - s0553746
*/
public class Module {
diff --git a/PlayWallCore/src/de/tobias/playpad/plugin/ModuleSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/ModuleSerializer.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/plugin/ModuleSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/plugin/ModuleSerializer.java
diff --git a/PlayWallCore/src/de/tobias/playpad/plugin/PadListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/PadListener.java
similarity index 80%
rename from PlayWallCore/src/de/tobias/playpad/plugin/PadListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/plugin/PadListener.java
index a2550ecff39cf5bd97cde27a05a85e5c449c642f..ec4388da4c5f31ceb8dcd6c91c1a823d04451d1b 100644
--- a/PlayWallCore/src/de/tobias/playpad/plugin/PadListener.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/PadListener.java
@@ -4,27 +4,23 @@ import de.tobias.playpad.pad.Pad;
/**
* Listener für ein Pad.
- *
+ *
* @author tobias
- *
* @see Pad
- *
*/
public interface PadListener {
/**
* Wird aufgerufen, sobald ein Pad wiedergegeben wird.
- *
- * @param pad
- * Pad
+ *
+ * @param pad Pad
*/
void onPlay(Pad pad);
/**
* Wird aufgerufen, sobald ein Pad gestoppt wird.
- *
- * @param pad
- * Pad
+ *
+ * @param pad Pad
*/
void onStop(Pad pad);
diff --git a/PlayWallCore/src/de/tobias/playpad/plugin/PluginSource.java b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/PluginSource.java
similarity index 85%
rename from PlayWallCore/src/de/tobias/playpad/plugin/PluginSource.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/plugin/PluginSource.java
index 48f58baea5ebe8df2cafafa1aa9dd1e36d1a9ab5..aff9a8eed0e8ee80202c9ca950a7e84f2f3cd5c1 100644
--- a/PlayWallCore/src/de/tobias/playpad/plugin/PluginSource.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/PluginSource.java
@@ -5,11 +5,9 @@ import java.net.URL;
/**
* Diese Klasse verwaltet PluginSources, indem sie die URL zu einerm plugin.yml auf einem Server speichert. Das Format für solch eine
* plugin.yml muss folgendes enthalten: version, filename, remotepath, build, dependencies (optional), id.
- *
+ *
* @author tobias
- *
* @since 5.1.0
- *
*/
public class PluginSource {
@@ -18,11 +16,9 @@ public class PluginSource {
/**
* Erstellt eine neues Plugin Quelle.
- *
- * @param name
- * Name der Quelle
- * @param url
- * Adresse der Quelle
+ *
+ * @param name Name der Quelle
+ * @param url Adresse der Quelle
*/
public PluginSource(String name, URL url) {
this.name = name;
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/plugin/SettingsListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/SettingsListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..48218df630b5da1eac940a023a27f2c707a87f43
--- /dev/null
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/SettingsListener.java
@@ -0,0 +1,15 @@
+package de.tobias.playpad.plugin;
+
+import de.tobias.playpad.profile.Profile;
+
+public interface SettingsListener {
+
+ default void onLoad(Profile profile) {
+ }
+
+ default void onSave(Profile profile) {
+ }
+
+ default void onChange(Profile profile) {
+ }
+}
diff --git a/PlayWallCore/src/de/tobias/playpad/plugin/StandardPluginUpdater.java b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/StandardPluginUpdater.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/plugin/StandardPluginUpdater.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/plugin/StandardPluginUpdater.java
diff --git a/PlayWallCore/src/de/tobias/playpad/plugin/WindowListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/WindowListener.java
similarity index 97%
rename from PlayWallCore/src/de/tobias/playpad/plugin/WindowListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/plugin/WindowListener.java
index a3285dabd79818c304587cebdcbf30a7759360f0..e9174ce96e30403264522567240754bc680f599f 100644
--- a/PlayWallCore/src/de/tobias/playpad/plugin/WindowListener.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/WindowListener.java
@@ -5,6 +5,6 @@ public interface WindowListener<T> {
void onInit(T t);
default void onClose(T t) {
-
+
}
}
diff --git a/PlayWallCore/src/de/tobias/playpad/profile/Profile.java b/PlayWallCore/src/main/java/de/tobias/playpad/profile/Profile.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/profile/Profile.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/profile/Profile.java
index 48ed75334c13889e80a342413ff2be3bcfbf6692..92a771dd3d377c5dc669c6d3ec9bb96998abe2d1 100644
--- a/PlayWallCore/src/de/tobias/playpad/profile/Profile.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/profile/Profile.java
@@ -31,9 +31,8 @@ public class Profile {
/**
* Use {@link ProfileReferenceManager#addProfile(ProfileReference)} instead
- *
- * @param ref
- * Ref
+ *
+ * @param ref Ref
*/
public Profile(ProfileReference ref) {
this.ref = ref;
diff --git a/PlayWallCore/src/de/tobias/playpad/profile/ProfileListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/profile/ProfileListener.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/profile/ProfileListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/profile/ProfileListener.java
index ee792c4d31a39c2c1d30b410418229812b3e4d1e..dc7003aa3a948b2cd203581f509708743c7d2349 100644
--- a/PlayWallCore/src/de/tobias/playpad/profile/ProfileListener.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/profile/ProfileListener.java
@@ -2,9 +2,8 @@ package de.tobias.playpad.profile;
/**
* Listener for ProfileChanging
- *
- * @author tobias
*
+ * @author tobias
*/
public interface ProfileListener {
diff --git a/PlayWallCore/src/de/tobias/playpad/profile/ProfileNotFoundException.java b/PlayWallCore/src/main/java/de/tobias/playpad/profile/ProfileNotFoundException.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/profile/ProfileNotFoundException.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/profile/ProfileNotFoundException.java
diff --git a/PlayWallCore/src/de/tobias/playpad/profile/ProfileSettings.java b/PlayWallCore/src/main/java/de/tobias/playpad/profile/ProfileSettings.java
similarity index 90%
rename from PlayWallCore/src/de/tobias/playpad/profile/ProfileSettings.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/profile/ProfileSettings.java
index 8f01f316025f63b213497a81158e3467b67df6de..808bfeb2fca91cff25252bf09b3879a1b388d089 100644
--- a/PlayWallCore/src/de/tobias/playpad/profile/ProfileSettings.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/profile/ProfileSettings.java
@@ -5,8 +5,8 @@ import de.tobias.playpad.design.modern.ModernGlobalDesign2;
import de.tobias.playpad.design.modern.serializer.ModernGlobalDesignSerializer;
import de.tobias.playpad.pad.TimeMode;
import de.tobias.playpad.settings.Fade;
+import de.tobias.utils.settings.Key;
import de.tobias.utils.settings.SettingsSerializable;
-import de.tobias.utils.settings.Storable;
import de.tobias.utils.settings.UserDefaults;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.DoubleProperty;
@@ -30,31 +30,43 @@ public class ProfileSettings implements SettingsSerializable {
private static final long serialVersionUID = 1L;
- @Storable private BooleanProperty lockedProperty = new SimpleBooleanProperty(false);
+ @Key
+ private BooleanProperty lockedProperty = new SimpleBooleanProperty(false);
// MIDI
- @Storable private String midiDevice;
- @Storable private boolean midiActive = false;
+ @Key
+ private String midiDevice;
+ @Key
+ private boolean midiActive = false;
// Audio Output
- @Storable private String audioClass = PlayPadPlugin.getRegistryCollection().getAudioHandlers().getDefaultID();
- @Storable private HashMap<String, Object> audioUserInfo = new HashMap<>();
+ @Key
+ private String audioClass = PlayPadPlugin.getRegistryCollection().getAudioHandlers().getDefaultID();
+ @Key
+ private HashMap<String, Object> audioUserInfo = new HashMap<>();
// Layout
- @Storable
+ @Key
private ModernGlobalDesign2 design = new ModernGlobalDesign2();
- @Storable private String mainLayoutType = PlayPadPlugin.getRegistryCollection().getMainLayouts().getDefaultID();
+ @Key
+ private String mainLayoutType = PlayPadPlugin.getRegistryCollection().getMainLayouts().getDefaultID();
// Cart Settings
- @Storable private boolean multiplePlayer = true;
- @Storable private Duration warningTime = Duration.seconds(5);
+ @Key
+ private boolean multiplePlayer = true;
+ @Key
+ private Duration warningTime = Duration.seconds(5);
- @Storable private DoubleProperty volumeProperty = new SimpleDoubleProperty(1.0);
+ @Key
+ private DoubleProperty volumeProperty = new SimpleDoubleProperty(1.0);
- @Storable private boolean windowAlwaysOnTop = false;
+ @Key
+ private boolean windowAlwaysOnTop = false;
- @Storable private Fade fade = new Fade();
- @Storable private TimeMode player_timeDisplayMode = TimeMode.REST;
+ @Key
+ private Fade fade = new Fade();
+ @Key
+ private TimeMode player_timeDisplayMode = TimeMode.REST;
public boolean isLocked() {
return lockedProperty.get();
diff --git a/PlayWallCore/src/de/tobias/playpad/profile/ref/ProfileReference.java b/PlayWallCore/src/main/java/de/tobias/playpad/profile/ref/ProfileReference.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/profile/ref/ProfileReference.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/profile/ref/ProfileReference.java
diff --git a/PlayWallCore/src/de/tobias/playpad/profile/ref/ProfileReferenceList.java b/PlayWallCore/src/main/java/de/tobias/playpad/profile/ref/ProfileReferenceList.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/profile/ref/ProfileReferenceList.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/profile/ref/ProfileReferenceList.java
index 7972bb7fa71fc396e1cb7331452e1ff8d2996805..c4cab84226075f0ac581835e9b95875104cfca37 100644
--- a/PlayWallCore/src/de/tobias/playpad/profile/ref/ProfileReferenceList.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/profile/ref/ProfileReferenceList.java
@@ -6,11 +6,10 @@ import java.util.Collection;
/**
* Liste, wo nur ProfileRefernzen gespeichert werden, deren Namen Unique ist.
- *
- * @author tobias
*
- * @since 5.0.1
+ * @author tobias
* @see ProfileReference
+ * @since 5.0.1
*/
public final class ProfileReferenceList extends UniqList<ProfileReference> {
diff --git a/PlayWallCore/src/de/tobias/playpad/profile/ref/ProfileReferenceManager.java b/PlayWallCore/src/main/java/de/tobias/playpad/profile/ref/ProfileReferenceManager.java
similarity index 86%
rename from PlayWallCore/src/de/tobias/playpad/profile/ref/ProfileReferenceManager.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/profile/ref/ProfileReferenceManager.java
index 5c92edb327f5cec23c9c92e43389aabef68c61d1..55f0726483ce407b8091c7bd3992a22df5ac6f95 100644
--- a/PlayWallCore/src/de/tobias/playpad/profile/ref/ProfileReferenceManager.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/profile/ref/ProfileReferenceManager.java
@@ -20,7 +20,8 @@ import java.util.UUID;
public final class ProfileReferenceManager {
- private ProfileReferenceManager() {}
+ private ProfileReferenceManager() {
+ }
/**
* Liste mit allen Referenzen
@@ -29,9 +30,8 @@ public final class ProfileReferenceManager {
/**
* Sucht eine Referenz zu einer UUID raus.
- *
- * @param profile
- * UUID des Profiles
+ *
+ * @param profile UUID des Profiles
* @return ProfileReferenz für die UUID
*/
public static ProfileReference getReference(UUID profile) {
@@ -49,7 +49,7 @@ public final class ProfileReferenceManager {
/**
* Listet alle verfügbaren Profil Refernzen auf.
- *
+ *
* @return Liste von Referenzen (Name, UUID)
*/
public static ProfileReferenceList getProfiles() {
@@ -58,14 +58,11 @@ public final class ProfileReferenceManager {
/**
* Create and Save a new Profile
- *
- * @param name
- * Profile Name
+ *
+ * @param name Profile Name
* @return Referenz auf das neue Profile.
- * @throws UnsupportedEncodingException
- * Fehler beim Speichern des XML
- * @throws IOException
- * IO Fehler
+ * @throws UnsupportedEncodingException Fehler beim Speichern des XML
+ * @throws IOException IO Fehler
*/
public static Profile newProfile(String name) throws IOException {
ProfileReference ref = new ProfileReference(UUID.randomUUID(), name);
@@ -79,9 +76,8 @@ public final class ProfileReferenceManager {
/**
* Fügt ein Profile hinzu und erstellt den Ordner auf der Festplatte.
- *
- * @param ref
- * Referenz zu diesem Profile (Name, UUID)
+ *
+ * @param ref Referenz zu diesem Profile (Name, UUID)
*/
public static void addProfile(ProfileReference ref) {
// MODEL
@@ -100,13 +96,10 @@ public final class ProfileReferenceManager {
/**
* Dupliziert eine Profile. Dabei werden die Dateien auf der Festplatte auch dupliziert.
- *
- * @param src
- * Name des Orginalprofiles
- * @param des
- * Name des neuen Profiles
- * @throws IOException
- * IO Fehler
+ *
+ * @param src Name des Orginalprofiles
+ * @param des Name des neuen Profiles
+ * @throws IOException IO Fehler
*/
public static void duplicate(ProfileReference src, ProfileReference des) throws IOException {
if (!des.equals(src)) {
@@ -130,11 +123,9 @@ public final class ProfileReferenceManager {
/**
* Entfernt eine ProfileReferenz und das Profile.
- *
- * @param ref
- * Profile Referenz
- * @throws IOException
- * IO Fehler
+ *
+ * @param ref Profile Referenz
+ * @throws IOException IO Fehler
*/
public static void removeProfile(ProfileReference ref) throws IOException {
// Model
@@ -165,11 +156,9 @@ public final class ProfileReferenceManager {
/**
* Lädt alle Profile Referenzen.
- *
- * @throws IOException
- * IO Fehler
- * @throws DocumentException
- * XML Fehler
+ *
+ * @throws IOException IO Fehler
+ * @throws DocumentException XML Fehler
*/
public static void loadProfiles() throws IOException, DocumentException {
ProfileReferenceManager.profiles.clear();
@@ -192,11 +181,9 @@ public final class ProfileReferenceManager {
/**
* Speichert alle Profile Referenzen in eine Datei.
- *
- * @throws UnsupportedEncodingException
- * XML Fehler
- * @throws IOException
- * IO Fehler
+ *
+ * @throws UnsupportedEncodingException XML Fehler
+ * @throws IOException IO Fehler
*/
public static void saveProfiles() throws IOException {
Document document = DocumentHelper.createDocument();
diff --git a/PlayWallCore/src/de/tobias/playpad/profile/ref/ProfileReferenceSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/profile/ref/ProfileReferenceSerializer.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/profile/ref/ProfileReferenceSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/profile/ref/ProfileReferenceSerializer.java
index ba2e5012375c2da043a49237d1bde6ed03b69351..c07e2f5340d09ad69bf972c6c4319a75cf3c0f29 100644
--- a/PlayWallCore/src/de/tobias/playpad/profile/ref/ProfileReferenceSerializer.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/profile/ref/ProfileReferenceSerializer.java
@@ -13,11 +13,10 @@ import java.util.UUID;
/**
* Util zum arbeiten mit XML und ProfileReference
- *
+ *
* @author tobias
- *
- * @since 5.0.1
* @see ProfileReference
+ * @since 5.0.1
*/
public class ProfileReferenceSerializer implements XMLSerializer<ProfileReference>, XMLDeserializer<ProfileReference> {
diff --git a/PlayWallCore/src/de/tobias/playpad/project/Project.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/project/Project.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java
diff --git a/PlayWallCore/src/de/tobias/playpad/project/ProjectNotFoundException.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectNotFoundException.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/project/ProjectNotFoundException.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectNotFoundException.java
diff --git a/PlayWallCore/src/de/tobias/playpad/project/ProjectReader.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectReader.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/project/ProjectReader.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectReader.java
index 513f0f92a3d92c9cdeb3bf4c8e707733d1c1aae6..cf0f4f167bf250904c3ee9fd38ec4464bb7b6dc4 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/ProjectReader.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectReader.java
@@ -20,9 +20,13 @@ public interface ProjectReader {
interface ProjectReaderListener {
void startReadProject();
+
void finishReadProject();
+
void readMedia(String name);
+
void totalMedia(int size);
+
void finish();
}
diff --git a/PlayWallCore/src/de/tobias/playpad/project/ProjectSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSerializer.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/project/ProjectSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSerializer.java
diff --git a/PlayWallCore/src/de/tobias/playpad/project/ProjectSettings.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSettings.java
similarity index 90%
rename from PlayWallCore/src/de/tobias/playpad/project/ProjectSettings.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSettings.java
index c72914d08d0c1765cb5b5b55cf39f9983b3618e5..792c78dce3363ffc87c7f9540b0473cfcf3bbe58 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/ProjectSettings.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSettings.java
@@ -1,6 +1,6 @@
package de.tobias.playpad.project;
-import de.tobias.utils.settings.Storable;
+import de.tobias.utils.settings.Key;
import java.nio.file.Path;
@@ -12,15 +12,17 @@ public class ProjectSettings {
public static final int MAX_ROWS = 10;
public static final int MIN_ROWS = 1;
- @Storable private int columns = 6;
- @Storable private int rows = 5;
+ @Key
+ private int columns = 6;
+ @Key
+ private int rows = 5;
private boolean useMediaPath = false;
private Path mediaPath = null;
/**
* Returns the value of colums (Number of cells form left to right)
- *
+ *
* @return columns
*/
public int getColumns() {
@@ -29,7 +31,7 @@ public class ProjectSettings {
/**
* Returns the value of rows (Number of cells from top to bottom
- *
+ *
* @return rows
*/
public int getRows() {
diff --git a/PlayWallCore/src/de/tobias/playpad/project/ProjectSettingsSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSettingsSerializer.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/project/ProjectSettingsSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSettingsSerializer.java
diff --git a/PlayWallCore/src/de/tobias/playpad/project/ProjectSyncSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSyncSerializer.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/project/ProjectSyncSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectSyncSerializer.java
diff --git a/PlayWallCore/src/de/tobias/playpad/project/ProjectWriter.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectWriter.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/project/ProjectWriter.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/ProjectWriter.java
diff --git a/PlayWallCore/src/de/tobias/playpad/project/export/ProjectExporter.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/export/ProjectExporter.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/project/export/ProjectExporter.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/export/ProjectExporter.java
index a132ad16ae310170916ed335183a6b32e5f6dbbf..657110a0ab558fa9b2e85aafcb79612996a4de25 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/export/ProjectExporter.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/export/ProjectExporter.java
@@ -13,7 +13,7 @@ import de.tobias.utils.application.App;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.application.container.PathType;
import de.tobias.utils.util.FileUtils;
-import de.tobias.utils.util.ZipFile;
+import de.tobias.utils.util.zip.ZipFile;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
diff --git a/PlayWallCore/src/de/tobias/playpad/project/export/ProjectExporterDelegate.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/export/ProjectExporterDelegate.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/project/export/ProjectExporterDelegate.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/export/ProjectExporterDelegate.java
diff --git a/PlayWallCore/src/de/tobias/playpad/project/importer/ConverterV6.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/importer/ConverterV6.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/project/importer/ConverterV6.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/importer/ConverterV6.java
diff --git a/PlayWallCore/src/de/tobias/playpad/project/importer/ProjectImporter.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/importer/ProjectImporter.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/project/importer/ProjectImporter.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/importer/ProjectImporter.java
index 94dbaf6dc0e904694001629820766bd33c030093..a2431ee7d08bf633a86216a44183508f7def4faa 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/importer/ProjectImporter.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/importer/ProjectImporter.java
@@ -14,7 +14,7 @@ import de.tobias.playpad.project.ref.ProjectReferenceManager;
import de.tobias.utils.application.App;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.application.container.PathType;
-import de.tobias.utils.util.ZipFile;
+import de.tobias.utils.util.zip.ZipFile;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Element;
diff --git a/PlayWallCore/src/de/tobias/playpad/project/importer/ProjectImporterDelegate.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/importer/ProjectImporterDelegate.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/project/importer/ProjectImporterDelegate.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/importer/ProjectImporterDelegate.java
diff --git a/PlayWallCore/src/de/tobias/playpad/project/loader/ProjectLoader.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/loader/ProjectLoader.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/project/loader/ProjectLoader.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/loader/ProjectLoader.java
index 2ca9b91852763d3aed4b08319bdbaedb19c47998..d60ceeb07dfcfa0292a00ad7f0cad8ff459415c9 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/loader/ProjectLoader.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/loader/ProjectLoader.java
@@ -82,7 +82,7 @@ public class ProjectLoader {
ProfileReference profile = delegate.getProfileReference();
projectReference.setProfileReference(profile);
}
-
+
// Lädt das entsprechende Profile und aktiviert es
Profile.load(projectReference.getProfileReference());
}
diff --git a/PlayWallCore/src/de/tobias/playpad/project/page/PadIndex.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/page/PadIndex.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/project/page/PadIndex.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/page/PadIndex.java
index 9c1f55dd066c5e2c0859d3cb94e153d204f3dff6..430d62c87d15739748a26b33662a2887f2d7f327 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/page/PadIndex.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/page/PadIndex.java
@@ -4,9 +4,8 @@ import java.io.Serializable;
/**
* Struktur um den Index eines Pads zu beschrieben.
- *
+ *
* @author tobias
- *
* @since 6.0.0
*/
public class PadIndex implements Serializable {
diff --git a/PlayWallCore/src/de/tobias/playpad/project/page/Page.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/page/Page.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/project/page/Page.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/page/Page.java
diff --git a/PlayWallCore/src/de/tobias/playpad/project/page/PageSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/page/PageSerializer.java
similarity index 97%
rename from PlayWallCore/src/de/tobias/playpad/project/page/PageSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/page/PageSerializer.java
index 1c8129e235eaeb57e3649ffc4b107485038e7cff..e7ea035d7fb6355be3f875fd513fd614c3120bda 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/page/PageSerializer.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/page/PageSerializer.java
@@ -22,9 +22,8 @@ public class PageSerializer implements XMLSerializer<Page>, XMLDeserializer<Page
/**
* Für Deserialize
- *
- * @param project
- * Project Reference
+ *
+ * @param project Project Reference
*/
public PageSerializer(Project project) {
this.project = project;
diff --git a/PlayWallCore/src/de/tobias/playpad/project/ref/ProjectReference.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/ref/ProjectReference.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/project/ref/ProjectReference.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/ref/ProjectReference.java
diff --git a/PlayWallCore/src/de/tobias/playpad/project/ref/ProjectReferenceList.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/ref/ProjectReferenceList.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/project/ref/ProjectReferenceList.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/ref/ProjectReferenceList.java
index 00db638dab61961b81fb688e3c997c730687d64e..60fa33795265659734769ddbe7945e5c0d7f52d1 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/ref/ProjectReferenceList.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/ref/ProjectReferenceList.java
@@ -4,11 +4,10 @@ import de.tobias.utils.list.UniqList;
/**
* Liste, wo nur ProjektRefernzen gespeichert werden, deren Namen Unique ist.
- *
- * @author tobias
*
- * @since 5.0.1
+ * @author tobias
* @see ProjectReference
+ * @since 5.0.1
*/
final class ProjectReferenceList extends UniqList<ProjectReference> {
diff --git a/PlayWallCore/src/de/tobias/playpad/project/ref/ProjectReferenceManager.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/ref/ProjectReferenceManager.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/project/ref/ProjectReferenceManager.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/ref/ProjectReferenceManager.java
diff --git a/PlayWallCore/src/de/tobias/playpad/project/ref/ProjectReferenceSerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/ref/ProjectReferenceSerializer.java
similarity index 97%
rename from PlayWallCore/src/de/tobias/playpad/project/ref/ProjectReferenceSerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/project/ref/ProjectReferenceSerializer.java
index 0d7ce1af731f2cba4fa5452896ca928667e04c38..c857e90f40293331207a989fe798c10023732ee6 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/ref/ProjectReferenceSerializer.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/ref/ProjectReferenceSerializer.java
@@ -34,7 +34,7 @@ public class ProjectReferenceSerializer implements XMLDeserializer<ProjectRefere
UUID profile = null;
if (element.attributeValue(PROFILE_ATTR) != null) {
- profile = UUID.fromString(element.attributeValue(PROFILE_ATTR));
+ profile = UUID.fromString(element.attributeValue(PROFILE_ATTR));
}
boolean sync = Boolean.valueOf(element.attributeValue(SYNC_ATTR));
long lastModified = Long.valueOf(element.attributeValue(LAST_MODIFIED_ATTR));
diff --git a/PlayWallCore/src/de/tobias/playpad/registry/Component.java b/PlayWallCore/src/main/java/de/tobias/playpad/registry/Component.java
similarity index 92%
rename from PlayWallCore/src/de/tobias/playpad/registry/Component.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/registry/Component.java
index 7d656b772c8d237c3c62b907e2e0e4c688cba397..3d5804ebc82b9fc82fe6d90cb1d36f3ae5485815 100644
--- a/PlayWallCore/src/de/tobias/playpad/registry/Component.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/registry/Component.java
@@ -1,8 +1,8 @@
package de.tobias.playpad.registry;
import de.tobias.playpad.Displayable;
-import de.tobias.utils.ui.icon.FontIcon;
-import de.tobias.utils.ui.icon.FontIconType;
+import de.tobias.utils.nui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontIconType;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.scene.Node;
diff --git a/PlayWallCore/src/de/tobias/playpad/registry/ComponentRegistry.java b/PlayWallCore/src/main/java/de/tobias/playpad/registry/ComponentRegistry.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/registry/ComponentRegistry.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/registry/ComponentRegistry.java
index 87b77f74ded23d623fcbaf5e0627206a84705eec..39c42c0e74ccceba52779a33be0d8713d49d1317 100644
--- a/PlayWallCore/src/de/tobias/playpad/registry/ComponentRegistry.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/registry/ComponentRegistry.java
@@ -3,7 +3,7 @@ package de.tobias.playpad.registry;
import de.tobias.logger.LogLevel;
import de.tobias.logger.Logger;
import de.tobias.playpad.plugin.Module;
-import de.tobias.utils.ui.icon.FontIconType;
+import de.tobias.utils.nui.icon.FontIconType;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Element;
diff --git a/PlayWallCore/src/de/tobias/playpad/registry/DefaultComponentRegistry.java b/PlayWallCore/src/main/java/de/tobias/playpad/registry/DefaultComponentRegistry.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/registry/DefaultComponentRegistry.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/registry/DefaultComponentRegistry.java
index 93bb0dbc499be030f470fd9327bd4b8dd795855c..78e42df2a3915b8c9818fcf0689f8793f21aaeb2 100644
--- a/PlayWallCore/src/de/tobias/playpad/registry/DefaultComponentRegistry.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/registry/DefaultComponentRegistry.java
@@ -1,7 +1,7 @@
package de.tobias.playpad.registry;
import de.tobias.playpad.plugin.Module;
-import de.tobias.utils.ui.icon.FontIconType;
+import de.tobias.utils.nui.icon.FontIconType;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Element;
@@ -50,7 +50,7 @@ public class DefaultComponentRegistry<F extends Component> extends ComponentRegi
}
@Override
- public void setDefaultID(Class<?> clazz) throws NoSuchComponentException{
+ public void setDefaultID(Class<?> clazz) throws NoSuchComponentException {
setDefault(getFactory(clazz));
}
diff --git a/PlayWallCore/src/de/tobias/playpad/registry/DefaultRegistry.java b/PlayWallCore/src/main/java/de/tobias/playpad/registry/DefaultRegistry.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/registry/DefaultRegistry.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/registry/DefaultRegistry.java
index 893f7a56bb7aa989f511d97ea442568354a61cf3..7555ba147cf93b9d276c6b2d554d8dc5ae875cc2 100644
--- a/PlayWallCore/src/de/tobias/playpad/registry/DefaultRegistry.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/registry/DefaultRegistry.java
@@ -2,10 +2,9 @@ package de.tobias.playpad.registry;
/**
* Zusätzliche Methoden Definitionen für eine Registry, die einen Default Wert braucht.
- *
- * @author tobias - s0553746
*
* @param <F> Type der Daten
+ * @author tobias - s0553746
*/
public interface DefaultRegistry<F extends Component> extends Registry<F> {
diff --git a/PlayWallCore/src/de/tobias/playpad/registry/Item.java b/PlayWallCore/src/main/java/de/tobias/playpad/registry/Item.java
similarity index 84%
rename from PlayWallCore/src/de/tobias/playpad/registry/Item.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/registry/Item.java
index 998c57936cf328e83e76198db8823f5fc2cdc868..589c3420943e0a70e3f74f82d68fae55e131faeb 100644
--- a/PlayWallCore/src/de/tobias/playpad/registry/Item.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/registry/Item.java
@@ -1,7 +1,7 @@
package de.tobias.playpad.registry;
import de.tobias.playpad.plugin.Module;
-import de.tobias.utils.ui.icon.FontIconType;
+import de.tobias.utils.nui.icon.FontIconType;
/**
* Created by tobias on 31.12.16.
diff --git a/PlayWallCore/src/de/tobias/playpad/registry/NoSuchComponentException.java b/PlayWallCore/src/main/java/de/tobias/playpad/registry/NoSuchComponentException.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/registry/NoSuchComponentException.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/registry/NoSuchComponentException.java
diff --git a/PlayWallCore/src/de/tobias/playpad/registry/Registry.java b/PlayWallCore/src/main/java/de/tobias/playpad/registry/Registry.java
similarity index 79%
rename from PlayWallCore/src/de/tobias/playpad/registry/Registry.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/registry/Registry.java
index f547f6afbd4cb78100cfe576d75f0318f5cb526f..3610eccc10c92959a5e7c14f659df9af44903c1b 100644
--- a/PlayWallCore/src/de/tobias/playpad/registry/Registry.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/registry/Registry.java
@@ -7,30 +7,25 @@ import java.util.Set;
/**
* Dieses Interface definiert Methoden bei Arbeit mit Komponenten, die durch Plugins zum Programm hinzugefügt werden können.
- *
- * @author tobias
*
- * @param <C>
- * Item
- *
+ * @param <C> Item
+ * @author tobias
* @since 5.1.0
*/
public interface Registry<C> extends WriteOnlyRegistry<C> {
/**
* Gibt eine Komponenten zu einer ID zurück.
- *
- * @param id
- * ID der Komponenten
+ *
+ * @param id ID der Komponenten
* @return Komponente
- *
- * @throws NoSuchComponentException
- * Wird geworfen, wenn die Komponente nicht existiert.
+ * @throws NoSuchComponentException Wird geworfen, wenn die Komponente nicht existiert.
*/
C getFactory(String id) throws NoSuchComponentException;
/**
* Get a Components for a Class Type
+ *
* @param clazz type
* @return component
* @throws NoSuchComponentException no component found
@@ -39,23 +34,22 @@ public interface Registry<C> extends WriteOnlyRegistry<C> {
/**
* Listet alle Type ID auf, die registriert wurden.
- *
+ *
* @return Liste mit IDs
*/
Set<String> getTypes();
/**
* Listet alle Implementierungen auf.
- *
+ *
* @return Implementierungen
*/
Collection<C> getComponents();
/**
* Gibt das Module zurück.
- *
- * @param id
- * id der Komponente.
+ *
+ * @param id id der Komponente.
* @return Module
*/
Module getModule(String id);
diff --git a/PlayWallCore/src/de/tobias/playpad/registry/WriteOnlyRegistry.java b/PlayWallCore/src/main/java/de/tobias/playpad/registry/WriteOnlyRegistry.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/registry/WriteOnlyRegistry.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/registry/WriteOnlyRegistry.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/ConnectionState.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/ConnectionState.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/ConnectionState.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/ConnectionState.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/LoginException.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/LoginException.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/LoginException.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/LoginException.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/Server.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/Server.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/Server.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/Server.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/ServerHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/ServerHandler.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/ServerHandler.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/ServerHandler.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/PropertyDef.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/PropertyDef.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/PropertyDef.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/PropertyDef.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/ServerUtils.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/ServerUtils.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/ServerUtils.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/ServerUtils.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/Change.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/Change.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/Change.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/Change.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/Command.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/Command.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/Command.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/Command.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/CommandExecutor.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/CommandExecutor.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/CommandExecutor.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/CommandExecutor.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/CommandExecutorHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/CommandExecutorHandler.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/CommandExecutorHandler.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/CommandExecutorHandler.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/CommandManager.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/CommandManager.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/CommandManager.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/CommandManager.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/CommandStore.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/CommandStore.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/CommandStore.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/CommandStore.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/Commands.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/Commands.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/Commands.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/Commands.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/PadAddCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/PadAddCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/PadAddCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/PadAddCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/PadClearCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/PadClearCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/PadClearCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/PadClearCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/PadMoveCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/PadMoveCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/PadMoveCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/PadMoveCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/PadRemoveCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/PadRemoveCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/PadRemoveCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/PadRemoveCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/PadUpdateCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/PadUpdateCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/PadUpdateCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/PadUpdateCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/settings/PadSettingsAddCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/settings/PadSettingsAddCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/settings/PadSettingsAddCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/settings/PadSettingsAddCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/settings/PadSettingsUpdateCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/settings/PadSettingsUpdateCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/settings/PadSettingsUpdateCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/settings/PadSettingsUpdateCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/settings/design/DesignAddCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/settings/design/DesignAddCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/settings/design/DesignAddCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/settings/design/DesignAddCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/settings/design/DesignUpdateCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/settings/design/DesignUpdateCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/pad/settings/design/DesignUpdateCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/pad/settings/design/DesignUpdateCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/page/PageAddCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/page/PageAddCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/page/PageAddCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/page/PageAddCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/page/PageRemoveCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/page/PageRemoveCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/page/PageRemoveCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/page/PageRemoveCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/page/PageUpdateCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/page/PageUpdateCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/page/PageUpdateCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/page/PageUpdateCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/path/PathAddCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/path/PathAddCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/path/PathAddCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/path/PathAddCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/path/PathRemoveCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/path/PathRemoveCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/path/PathRemoveCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/path/PathRemoveCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/project/ProjectAddCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/project/ProjectAddCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/project/ProjectAddCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/project/ProjectAddCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/project/ProjectRemoveCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/project/ProjectRemoveCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/project/ProjectRemoveCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/project/ProjectRemoveCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/command/project/ProjectUpdateCommand.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/project/ProjectUpdateCommand.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/command/project/ProjectUpdateCommand.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/command/project/ProjectUpdateCommand.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/conflict/Conflict.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/conflict/Conflict.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/conflict/Conflict.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/conflict/Conflict.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/conflict/ConflictSolver.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/conflict/ConflictSolver.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/conflict/ConflictSolver.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/conflict/ConflictSolver.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/conflict/ConflictStrategy.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/conflict/ConflictStrategy.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/conflict/ConflictStrategy.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/conflict/ConflictStrategy.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/conflict/ConflictStrategyType.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/conflict/ConflictStrategyType.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/conflict/ConflictStrategyType.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/conflict/ConflictStrategyType.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/conflict/ConflictType.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/conflict/ConflictType.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/conflict/ConflictType.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/conflict/ConflictType.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/conflict/Version.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/conflict/Version.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/conflict/Version.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/conflict/Version.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/ServerListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/ServerListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/ServerListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/ServerListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/PadAddListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/PadAddListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/PadAddListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/PadAddListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/PadClearListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/PadClearListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/PadClearListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/PadClearListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/PadMoveListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/PadMoveListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/PadMoveListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/PadMoveListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/PadRemoveListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/PadRemoveListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/PadRemoveListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/PadRemoveListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/PadUpdateListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/PadUpdateListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/PadUpdateListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/PadUpdateListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/settings/PadSettingsAddListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/settings/PadSettingsAddListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/settings/PadSettingsAddListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/settings/PadSettingsAddListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/settings/PadSettingsUpdateListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/settings/PadSettingsUpdateListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/settings/PadSettingsUpdateListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/settings/PadSettingsUpdateListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/settings/design/DesignAddListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/settings/design/DesignAddListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/settings/design/DesignAddListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/settings/design/DesignAddListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/settings/design/DesignUpdateListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/settings/design/DesignUpdateListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/pad/settings/design/DesignUpdateListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/pad/settings/design/DesignUpdateListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/page/PageAddListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/page/PageAddListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/page/PageAddListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/page/PageAddListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/page/PageRemoveListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/page/PageRemoveListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/page/PageRemoveListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/page/PageRemoveListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/page/PageUpdateListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/page/PageUpdateListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/page/PageUpdateListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/page/PageUpdateListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/path/PathAddListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/path/PathAddListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/path/PathAddListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/path/PathAddListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/path/PathRemoveListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/path/PathRemoveListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/path/PathRemoveListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/path/PathRemoveListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/project/ProjectAddListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/project/ProjectAddListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/project/ProjectAddListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/project/ProjectAddListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/project/ProjectRemoveListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/project/ProjectRemoveListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/project/ProjectRemoveListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/project/ProjectRemoveListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/project/ProjectUpdateListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/project/ProjectUpdateListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/downstream/project/ProjectUpdateListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/downstream/project/ProjectUpdateListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/upstream/DesignUpdateListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/upstream/DesignUpdateListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/upstream/DesignUpdateListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/upstream/DesignUpdateListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/upstream/PadSettingsUpdateListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/upstream/PadSettingsUpdateListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/upstream/PadSettingsUpdateListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/upstream/PadSettingsUpdateListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/upstream/PadUpdateListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/upstream/PadUpdateListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/upstream/PadUpdateListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/upstream/PadUpdateListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/upstream/PageUpdateListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/upstream/PageUpdateListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/upstream/PageUpdateListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/upstream/PageUpdateListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/server/sync/listener/upstream/ProjectUpdateListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/upstream/ProjectUpdateListener.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/server/sync/listener/upstream/ProjectUpdateListener.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/server/sync/listener/upstream/ProjectUpdateListener.java
diff --git a/PlayWallCore/src/de/tobias/playpad/settings/Fade.java b/PlayWallCore/src/main/java/de/tobias/playpad/settings/Fade.java
similarity index 90%
rename from PlayWallCore/src/de/tobias/playpad/settings/Fade.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/settings/Fade.java
index 13de97ab3fd3dcb3e47f5e366e0c882b638bd722..7945d9253f1e9b849ac1bd00a66fb0ff6844a40a 100644
--- a/PlayWallCore/src/de/tobias/playpad/settings/Fade.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/settings/Fade.java
@@ -7,14 +7,11 @@ import org.dom4j.Element;
/**
* Einstellungen zum Fade, zusammengefasst in dieser Klasse.
- *
+ *
* @author tobias
- *
- * @since 6.0.0
- *
* @see ProfileSettings#getFade()
* @see PadSettings#getFade()
- *
+ * @since 6.0.0
*/
public class Fade {
@@ -35,11 +32,9 @@ public class Fade {
/**
* Erstellt einen neues Fade mit Custom Zeiten und Default Einstellungen für Play, Pause, Stop.
- *
- * @param fadeIn
- * Fade In Dauer
- * @param fadeOut
- * Fade Out Dauer
+ *
+ * @param fadeIn Fade In Dauer
+ * @param fadeOut Fade Out Dauer
*/
public Fade(Duration fadeIn, Duration fadeOut) {
this(fadeIn, fadeOut, false, true, true, true);
@@ -47,19 +42,13 @@ public class Fade {
/**
* Erstellt ein Fade mit Custom Werten.
- *
- * @param fadeIn
- * Fade In Dauer
- * @param fadeOut
- * Fade Out Dauer
- * @param fadeInStart
- * Fade beim Start
- * @param fadeInPause
- * Fade nach Pause
- * @param fadeOutPause
- * Fade vor Pause
- * @param fadeOutStop
- * Fade vor Stop
+ *
+ * @param fadeIn Fade In Dauer
+ * @param fadeOut Fade Out Dauer
+ * @param fadeInStart Fade beim Start
+ * @param fadeInPause Fade nach Pause
+ * @param fadeOutPause Fade vor Pause
+ * @param fadeOutStop Fade vor Stop
*/
public Fade(Duration fadeIn, Duration fadeOut, boolean fadeInStart, boolean fadeInPause, boolean fadeOutPause, boolean fadeOutStop) {
this.fadeIn = fadeIn;
diff --git a/PlayWallCore/src/de/tobias/playpad/settings/GlobalSettings.java b/PlayWallCore/src/main/java/de/tobias/playpad/settings/GlobalSettings.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/settings/GlobalSettings.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/settings/GlobalSettings.java
diff --git a/PlayWallCore/src/de/tobias/playpad/settings/keys/Key.java b/PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/Key.java
similarity index 89%
rename from PlayWallCore/src/de/tobias/playpad/settings/keys/Key.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/Key.java
index 19db1c9a98bea1fa5d28aad1cd912c6ecb5a4dff..ea03cac0283c33ed248753d6c1db344d954bd429 100644
--- a/PlayWallCore/src/de/tobias/playpad/settings/keys/Key.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/Key.java
@@ -7,9 +7,8 @@ import javafx.scene.input.KeyCombination;
/**
* Eine Tastenkombination für das Mapping zum Menü.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.1.0
*/
public class Key implements Displayable {
@@ -24,9 +23,8 @@ public class Key implements Displayable {
/**
* Erstellt eine leere Tastenkombination.
- *
- * @param id
- * ID für die Speicherung
+ *
+ * @param id ID für die Speicherung
*/
public Key(String id) {
this.id = id;
@@ -34,19 +32,13 @@ public class Key implements Displayable {
/**
* Erstellt eine Vollständige Tastenkombination mit ID und Datenwerten.
- *
- * @param id
- * ID f+r doe Speicherung
- * @param key
- * Taste
- * @param ctrl
- * ctrl
- * @param alt
- * alt
- * @param meta
- * meta (Mac: CMD)
- * @param shift
- * shift
+ *
+ * @param id ID f+r doe Speicherung
+ * @param key Taste
+ * @param ctrl ctrl
+ * @param alt alt
+ * @param meta meta (Mac: CMD)
+ * @param shift shift
*/
public Key(String id, String key, boolean ctrl, boolean alt, boolean meta, boolean shift) {
this.id = id;
@@ -114,7 +106,7 @@ public class Key implements Displayable {
/**
* Gibt die Tastenkombination als String für das Menü in JavaFX zurück.
- *
+ *
* @return KeyCombination Readable
*/
public String getKeyCode() {
diff --git a/PlayWallCore/src/de/tobias/playpad/settings/keys/KeyCollection.java b/PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/KeyCollection.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/settings/keys/KeyCollection.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/KeyCollection.java
diff --git a/PlayWallCore/src/de/tobias/playpad/settings/keys/KeyCollectionEntry.java b/PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/KeyCollectionEntry.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/settings/keys/KeyCollectionEntry.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/KeyCollectionEntry.java
index 9d90cf8f5e8f0aa606ea34748fc998bf0269fb8f..f401475a34b185374fa963b5734e58c8a0e0d490 100644
--- a/PlayWallCore/src/de/tobias/playpad/settings/keys/KeyCollectionEntry.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/KeyCollectionEntry.java
@@ -2,9 +2,8 @@ package de.tobias.playpad.settings.keys;
/**
* Datenstruktur für die KeyCollection, zum speichern der Einträge.
- *
- * @author tobias
*
+ * @author tobias
* @since 6.0.0
*/
class KeyCollectionEntry {
diff --git a/PlayWallCore/src/de/tobias/playpad/settings/keys/KeyConflictException.java b/PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/KeyConflictException.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/settings/keys/KeyConflictException.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/KeyConflictException.java
index 6590027a19c382cd001bae0d3800d28d8da2a111..963d36db26c1399f6e8e2c85573edc46aae2a534 100644
--- a/PlayWallCore/src/de/tobias/playpad/settings/keys/KeyConflictException.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/KeyConflictException.java
@@ -2,9 +2,8 @@ package de.tobias.playpad.settings.keys;
/**
* Exception wenn Key nicht hinzugefügt werden kann, aufgrund eines Konflikts.
- *
- * @author tobias
*
+ * @author tobias
* @since 6.0.0
*/
public class KeyConflictException extends Exception {
diff --git a/PlayWallCore/src/de/tobias/playpad/settings/keys/KeySerializer.java b/PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/KeySerializer.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/settings/keys/KeySerializer.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/settings/keys/KeySerializer.java
diff --git a/PlayWallCore/src/de/tobias/playpad/tigger/Trigger.java b/PlayWallCore/src/main/java/de/tobias/playpad/tigger/Trigger.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/tigger/Trigger.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/tigger/Trigger.java
index 6e98d74b4635a2bcc6ed467ea279df1de6404270..55bb0f6a448440beeed10563280f891a975c9ce6 100644
--- a/PlayWallCore/src/de/tobias/playpad/tigger/Trigger.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/tigger/Trigger.java
@@ -58,7 +58,8 @@ public class Trigger {
public void load(Element element) {
try {
triggerPoint = TriggerPoint.valueOf(element.attributeValue(POINT_ATTR));
- } catch (Exception e) {}
+ } catch (Exception e) {
+ }
for (Object itemObj : element.elements(ITEM_ELEMENT)) {
if (itemObj instanceof Element) {
diff --git a/PlayWallCore/src/de/tobias/playpad/tigger/TriggerItem.java b/PlayWallCore/src/main/java/de/tobias/playpad/tigger/TriggerItem.java
similarity index 93%
rename from PlayWallCore/src/de/tobias/playpad/tigger/TriggerItem.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/tigger/TriggerItem.java
index 3211dc390fe67ff7f58a24f01842b9e75a9d9132..db9a1b7d8c74f47a60dbd70fdfdbad8cf59f13f8 100644
--- a/PlayWallCore/src/de/tobias/playpad/tigger/TriggerItem.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/tigger/TriggerItem.java
@@ -36,7 +36,7 @@ public abstract class TriggerItem {
/**
* Get an identification name
- *
+ *
* @return name
*/
public abstract String getType();
@@ -47,9 +47,8 @@ public abstract class TriggerItem {
/**
* You must call super.load
- *
- * @param element
- * XML Element
+ *
+ * @param element XML Element
*/
public void load(Element element) {
if (element.attributeValue(DURATION_ATTR) != null) {
@@ -59,9 +58,8 @@ public abstract class TriggerItem {
/**
* You must call super.save
- *
- * @param element
- * XMl Element
+ *
+ * @param element XMl Element
*/
public void save(Element element) {
element.addAttribute(DURATION_ATTR, String.valueOf(durationFromPoint.toMillis()));
diff --git a/PlayWallCore/src/de/tobias/playpad/tigger/TriggerItemFactory.java b/PlayWallCore/src/main/java/de/tobias/playpad/tigger/TriggerItemFactory.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/tigger/TriggerItemFactory.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/tigger/TriggerItemFactory.java
diff --git a/PlayWallCore/src/de/tobias/playpad/tigger/TriggerPoint.java b/PlayWallCore/src/main/java/de/tobias/playpad/tigger/TriggerPoint.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/tigger/TriggerPoint.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/tigger/TriggerPoint.java
diff --git a/PlayWallCore/src/de/tobias/playpad/view/main/MainLayoutFactory.java b/PlayWallCore/src/main/java/de/tobias/playpad/view/main/MainLayoutFactory.java
similarity index 85%
rename from PlayWallCore/src/de/tobias/playpad/view/main/MainLayoutFactory.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/view/main/MainLayoutFactory.java
index adfce3c605f4784a57353f01304bd373a1ba5a8c..f7cf7399636ec98235da323c9e75f1c23a0631f1 100644
--- a/PlayWallCore/src/de/tobias/playpad/view/main/MainLayoutFactory.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/view/main/MainLayoutFactory.java
@@ -8,12 +8,11 @@ import de.tobias.playpad.viewcontroller.main.MenuToolbarViewController;
/**
* Dieses Interface beschreibt die Bestandteile des Layouts (GUI Elemente) des Main Views.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.1.0
*/
-public abstract class MainLayoutFactory extends Component {
+public abstract class MainLayoutFactory extends Component {
public MainLayoutFactory(String type) {
super(type);
@@ -21,19 +20,16 @@ public abstract class MainLayoutFactory extends Component {
/**
* Erstellt einen ViewController für die Menu/Toolbar Fläche.
- *
- * @param mainViewRef
- * Refernz auf den Main View
- *
+ *
+ * @param mainViewRef Refernz auf den Main View
* @return Neuer ViewController mit View
*/
public abstract MenuToolbarViewController createMenuToolbar(IMainViewController mainViewRef);
/**
* Erstellt ein neues Pad mit einem ViewController
- *
+ *
* @return Pad
- *
* @see IPadView notwendige Methoden für ein Pad
* @see IPadViewController ViewController zum Pad
*/
@@ -41,15 +37,14 @@ public abstract class MainLayoutFactory extends Component {
/**
* Recycelt eine PadView, damit nicht immer neue erstellt werden müssen.
- *
- * @param padView
- * alte PadView
+ *
+ * @param padView alte PadView
*/
public abstract void recyclePadView(IPadView padView);
/**
* Gibt das Layout sepzifische Stylesheet zurück.
- *
+ *
* @return path in jar
*/
public abstract String getStylesheet();
diff --git a/PlayWallCore/src/de/tobias/playpad/view/main/MainLayoutHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/view/main/MainLayoutHandler.java
similarity index 85%
rename from PlayWallCore/src/de/tobias/playpad/view/main/MainLayoutHandler.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/view/main/MainLayoutHandler.java
index dad1ee963135a4c5dc2406594f19d0e6641916f8..c8bf545fb26be467817828367d416f06892cb487 100644
--- a/PlayWallCore/src/de/tobias/playpad/view/main/MainLayoutHandler.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/view/main/MainLayoutHandler.java
@@ -5,24 +5,20 @@ import de.tobias.playpad.viewcontroller.main.MenuToolbarViewController;
/**
* Schnittstelle für das Handle einer neunen Toolbar. Diese Methode wird vom MainView automatisch bei einem neuen Layout aufgeführt.
- *
- * @author tobias
- *
- * @since 5.1.0
*
+ * @author tobias
* @see IMainViewController#performLayoutDependedAction(MainLayoutHandler)
* @see MainLayoutFactory
+ * @since 5.1.0
*/
@FunctionalInterface
public interface MainLayoutHandler {
/**
* Listener Methode für den Wechsel der Toolbar.
- *
- * @param oldToolbar
- * Alte Toolbar
- * @param newToolbar
- * Neue Toolbar
+ *
+ * @param oldToolbar Alte Toolbar
+ * @param newToolbar Neue Toolbar
*/
void handle(MenuToolbarViewController oldToolbar, MenuToolbarViewController newToolbar);
diff --git a/PlayWallCore/src/de/tobias/playpad/view/main/MenuType.java b/PlayWallCore/src/main/java/de/tobias/playpad/view/main/MenuType.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/view/main/MenuType.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/view/main/MenuType.java
diff --git a/PlayWallCore/src/de/tobias/playpad/view/main/ProjectPreviewView.java b/PlayWallCore/src/main/java/de/tobias/playpad/view/main/ProjectPreviewView.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/view/main/ProjectPreviewView.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/view/main/ProjectPreviewView.java
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/AudioHandlerViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/AudioHandlerViewController.java
similarity index 81%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/AudioHandlerViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/AudioHandlerViewController.java
index 6ec17e1b358d949681a9e203e08310774e85a831..6d14d9a63ebe6e1aecdaec316f4f6c65995a42da 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/AudioHandlerViewController.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/AudioHandlerViewController.java
@@ -7,22 +7,18 @@ import java.util.ResourceBundle;
/**
* Einstellungen ViewController für einen sAudio Handler.
- *
+ *
* @author tobias
- *
* @see AudioHandlerFactory
*/
public abstract class AudioHandlerViewController extends NVC {
/**
* Neuer ViewController.
- *
- * @param name
- * Name der FXML
- * @param path
- * Path zur FXML (ohne Dateiname)
- * @param localization
- * Localization
+ *
+ * @param name Name der FXML
+ * @param path Path zur FXML (ohne Dateiname)
+ * @param localization Localization
*/
public AudioHandlerViewController(String name, String path, ResourceBundle localization) {
load(path, name, localization);
@@ -30,7 +26,7 @@ public abstract class AudioHandlerViewController extends NVC {
/**
* Prüft ob die Einstellungen geändert wurden.
- *
+ *
* @return <code>true</code> Audio Einstellungen für Pads werden automatisch neu geladen
*/
public abstract boolean isChanged();
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/BaseMapperOverviewViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/BaseMapperOverviewViewController.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/BaseMapperOverviewViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/BaseMapperOverviewViewController.java
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/IMappingTabViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/IMappingTabViewController.java
similarity index 89%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/IMappingTabViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/IMappingTabViewController.java
index 995f28cef9003dbb778857ebb1ff8cd5a7c20954..18cd15934d565f7f2c643c7ebfcfc8b75c3fecb1 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/IMappingTabViewController.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/IMappingTabViewController.java
@@ -4,18 +4,16 @@ import de.tobias.playpad.action.Action;
/**
* Schnittstelle für den Mapping Tab ViewController. Der Controller hat zwei Bereiche: ActionType (Optional), Action
- *
- * @author tobias
*
+ * @author tobias
* @since 5.0.0
*/
public interface IMappingTabViewController {
/**
* Zeigt im Action Teil der View die Einstellungen zu einer Action an.
- *
- * @param action
- * Action
+ *
+ * @param action Action
*/
void showMapperFor(Action action);
}
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/IPadSettingsViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/IPadSettingsViewController.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/IPadSettingsViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/IPadSettingsViewController.java
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/PadSettingsTabViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/PadSettingsTabViewController.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/PadSettingsTabViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/PadSettingsTabViewController.java
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainToolbarViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/IMainToolbarViewController.java
similarity index 99%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainToolbarViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/IMainToolbarViewController.java
index 20cabf408d52bce275e67c992a171cc2bedd542a..72900bcdb911b55238a651917724670d6b2ee37e 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainToolbarViewController.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/IMainToolbarViewController.java
@@ -7,6 +7,6 @@ public interface IMainToolbarViewController {
void createPageButtons();
void showIcon(Node node);
-
+
void hideIcon(Node node);
}
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/IMainViewController.java
similarity index 96%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/IMainViewController.java
index 4a91ac607627a289ef99f1a1ce62c7f4cd008b0a..a7fa7b7430833aba2a8f6d3d5f70e598d2ceced3 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/IMainViewController.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/IMainViewController.java
@@ -7,9 +7,9 @@ import de.tobias.playpad.project.page.Page;
import de.tobias.playpad.settings.keys.KeyCollection;
import de.tobias.playpad.view.main.MainLayoutFactory;
import de.tobias.playpad.view.main.MainLayoutHandler;
-import de.tobias.utils.ui.Alertable;
-import de.tobias.utils.ui.NotificationHandler;
-import de.tobias.utils.ui.scene.NotificationPane;
+import de.tobias.utils.nui.Alertable;
+import de.tobias.utils.nui.NotificationHandler;
+import de.tobias.utils.nui.scene.NotificationPane;
import javafx.event.Event;
import javafx.event.EventHandler;
import javafx.event.EventType;
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
similarity index 95%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
index 3457c2ecac376192cf13f089f0ba5604cc454ccf..06970c285c8f0a41bf5bfd05306d1eb5e3f04de0 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/main/MenuToolbarViewController.java
@@ -4,7 +4,7 @@ import de.tobias.playpad.profile.ProfileSettings;
import de.tobias.playpad.project.Project;
import de.tobias.playpad.settings.keys.KeyCollection;
import de.tobias.playpad.view.main.MenuType;
-import de.tobias.utils.ui.ContentViewController;
+import de.tobias.utils.nui.NVC;
import javafx.scene.Node;
import javafx.scene.control.MenuItem;
import javafx.scene.control.Slider;
@@ -17,7 +17,7 @@ import java.util.ResourceBundle;
* @author tobias
* @since 5.1.0
*/
-public abstract class MenuToolbarViewController extends ContentViewController {
+public abstract class MenuToolbarViewController extends NVC {
protected static final String CURRENT_PAGE_BUTTON = "current-page-button";
@@ -28,7 +28,7 @@ public abstract class MenuToolbarViewController extends ContentViewController {
* @param root Path zur FXML
*/
public MenuToolbarViewController(String path, String root) {
- super(path, root);
+ load(root, path);
}
/**
@@ -39,7 +39,7 @@ public abstract class MenuToolbarViewController extends ContentViewController {
* @param localization Localization ResourceBundle
*/
public MenuToolbarViewController(String name, String path, ResourceBundle localization) {
- super(name, path, localization);
+ load(path, name, localization);
}
/**
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/GlobalSettingsTabViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/GlobalSettingsTabViewController.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/option/GlobalSettingsTabViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/GlobalSettingsTabViewController.java
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IGlobalReloadTask.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IGlobalReloadTask.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IGlobalReloadTask.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IGlobalReloadTask.java
index e9ddc6744b42676f34fb78f3c52ea5ee3673f576..898526cb64ff1f26abb97d67474b8834c74f41ec 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IGlobalReloadTask.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IGlobalReloadTask.java
@@ -5,11 +5,9 @@ import de.tobias.playpad.viewcontroller.main.IMainViewController;
/**
* * Schnittstelle, um das ein Task zum Laden der Einstellungen angezeigt werden kann.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.1.0
- *
*/
public interface IGlobalReloadTask {
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IGlobalSettingsViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IGlobalSettingsViewController.java
similarity index 81%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IGlobalSettingsViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IGlobalSettingsViewController.java
index c86eecdc2a36db0a33f8c469f18cc369d9e52fac..da0909a2f656ff88dae39673d3a712563f0ac475 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IGlobalSettingsViewController.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IGlobalSettingsViewController.java
@@ -2,18 +2,16 @@ package de.tobias.playpad.viewcontroller.option;
/**
* Schnittstelle um die GlobalSettingsView zu ändern.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.1.0
*/
public interface IGlobalSettingsViewController {
/**
* Fügt en Tab hinzu.
- *
- * @param globalSettingsTabViewController
- * tab
+ *
+ * @param globalSettingsTabViewController tab
*/
void addTab(GlobalSettingsTabViewController globalSettingsTabViewController);
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IProfileReloadTask.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IProfileReloadTask.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IProfileReloadTask.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IProfileReloadTask.java
index c9674cbafd0145fea69fca3a54241d1da260ffa6..c20dc53696ab85b4a6b9b3d74a4c5581be475512 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IProfileReloadTask.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IProfileReloadTask.java
@@ -6,11 +6,9 @@ import de.tobias.playpad.viewcontroller.main.IMainViewController;
/**
* * Schnittstelle, um das ein Task zum Laden der Einstellungen angezeigt werden kann.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.1.0
- *
*/
public interface IProfileReloadTask {
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IProfileSettingsViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IProfileSettingsViewController.java
similarity index 81%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IProfileSettingsViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IProfileSettingsViewController.java
index b4d0f149d7ca889967c0602cda2e8ad641be27c9..695d89459880f3598f9cf7e31a4b6d91f15f0954 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IProfileSettingsViewController.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IProfileSettingsViewController.java
@@ -2,18 +2,16 @@ package de.tobias.playpad.viewcontroller.option;
/**
* Schnittstelle um die ProfileSettingsView zu ändern.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.0.0
*/
public interface IProfileSettingsViewController {
/**
* Fügt en Tab hinzu.
- *
- * @param profileSettingsTabViewController
- * tab
+ *
+ * @param profileSettingsTabViewController tab
*/
void addTab(ProfileSettingsTabViewController profileSettingsTabViewController);
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IProjectReloadTask.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IProjectReloadTask.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IProjectReloadTask.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IProjectReloadTask.java
index 62fed75b3122d3eb677bfdca1fe23070363487e6..1f3aadd483eec98589a7f8456a3833e3cb791ba7 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IProjectReloadTask.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IProjectReloadTask.java
@@ -6,11 +6,9 @@ import de.tobias.playpad.viewcontroller.main.IMainViewController;
/**
* * Schnittstelle, um das ein Task zum Laden der Einstellungen angezeigt werden kann.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.1.0
- *
*/
public interface IProjectReloadTask {
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IProjectSettingsViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IProjectSettingsViewController.java
similarity index 81%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IProjectSettingsViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IProjectSettingsViewController.java
index ad50c8e3570fcc6a58bdde252da1f530ff40df03..1f26f2fbcee76fca331c6429430e19a775a0433c 100644
--- a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/IProjectSettingsViewController.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/IProjectSettingsViewController.java
@@ -2,18 +2,16 @@ package de.tobias.playpad.viewcontroller.option;
/**
* Schnittstelle um die GlobalSettingsView zu ändern.
- *
- * @author tobias
*
+ * @author tobias
* @since 5.1.0
*/
public interface IProjectSettingsViewController {
/**
* Fügt en Tab hinzu.
- *
- * @param projectSettingsTabViewController
- * tab
+ *
+ * @param projectSettingsTabViewController tab
*/
void addTab(ProjectSettingsTabViewController projectSettingsTabViewController);
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/ProfileSettingsTabViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/ProfileSettingsTabViewController.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/option/ProfileSettingsTabViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/ProfileSettingsTabViewController.java
diff --git a/PlayWallCore/src/de/tobias/playpad/viewcontroller/option/ProjectSettingsTabViewController.java b/PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/ProjectSettingsTabViewController.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/viewcontroller/option/ProjectSettingsTabViewController.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/viewcontroller/option/ProjectSettingsTabViewController.java
diff --git a/PlayWallCore/src/de/tobias/playpad/volume/VolumeFilter.java b/PlayWallCore/src/main/java/de/tobias/playpad/volume/VolumeFilter.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/volume/VolumeFilter.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/volume/VolumeFilter.java
diff --git a/PlayWallCore/src/de/tobias/playpad/volume/VolumeManager.java b/PlayWallCore/src/main/java/de/tobias/playpad/volume/VolumeManager.java
similarity index 100%
rename from PlayWallCore/src/de/tobias/playpad/volume/VolumeManager.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/volume/VolumeManager.java
diff --git a/PluginAwake/PluginAwake.iml b/PluginAwake/PluginAwake.iml
index 3170aeebcf59adaddf264781dfee115c0664cb0d..9f4a0bb50fa4569fcb26dad6e45282f341ac1598 100644
--- a/PluginAwake/PluginAwake.iml
+++ b/PluginAwake/PluginAwake.iml
@@ -1,19 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Plugins" level="project" />
- <orderEntry type="library" name="libUtils" level="project" />
- <orderEntry type="library" name="XML" level="project" />
- <orderEntry type="library" name="YML" level="project" />
- <orderEntry type="library" name="Updater" level="project" />
- <orderEntry type="library" name="JNA" level="project" />
<orderEntry type="module" module-name="PlayWallCore" />
- <orderEntry type="library" name="libLogger" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libUtils:1.5.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:9.0.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.hp.gagawa:gagawa:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:23.3-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.0.18" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:YAMLStorage:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libStorage:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libLogger:1.3.5" level="project" />
+ <orderEntry type="library" name="Maven: org.fusesource.jansi:jansi:1.17.1" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:Updater:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+ <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.23.1" level="project" />
+ <orderEntry type="library" name="Maven: net.xeoh:jspf:1.0.2" level="project" />
+ <orderEntry type="library" name="Maven: kuusisto:tinysound:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jcraft:jorbis:0.0.17" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:vorbisspi:1.0.3.3" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:jorbis:0.0.17.4" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:tritonus-share:0.3.7.4" level="project" />
+ <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.4.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+ <orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.5" level="project" />
+ <orderEntry type="library" name="Maven: javazoom:jlayer:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: net.minidev:json-smart:1.2" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/PluginAwake/pom.xml b/PluginAwake/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..03eb51ccd6ab3768f052f49d6eda97ac8e4bdd52
--- /dev/null
+++ b/PluginAwake/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallPluginAwake</artifactId>
+ <version>1.0.0</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>releases</id>
+ <url>https://maven.thecodelabs.de/nexus/content/repositories/releases</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallCore</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/PluginAwake/src/de/tobias/playpad/awakeplugin/AwakePlugin.java b/PluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakePlugin.java
similarity index 100%
rename from PluginAwake/src/de/tobias/playpad/awakeplugin/AwakePlugin.java
rename to PluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakePlugin.java
diff --git a/PluginAwake/src/de/tobias/playpad/awakeplugin/AwakePluginImpl.java b/PluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakePluginImpl.java
similarity index 97%
rename from PluginAwake/src/de/tobias/playpad/awakeplugin/AwakePluginImpl.java
rename to PluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakePluginImpl.java
index fc2b244278fb28a441945765e644c6696ecd4f47..fc97d12cbee92a09e5922ff59d8a103df2b1dd16 100644
--- a/PluginAwake/src/de/tobias/playpad/awakeplugin/AwakePluginImpl.java
+++ b/PluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakePluginImpl.java
@@ -10,12 +10,12 @@ import de.tobias.updater.client.Updatable;
import de.tobias.updater.client.UpdateChannel;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.application.container.PathType;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
-import de.tobias.utils.util.AwakeUtils;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import de.tobias.utils.util.Localization;
import de.tobias.utils.util.OS;
import de.tobias.utils.util.OS.OSType;
+import de.tobias.utils.util.mac.AwakeUtils;
import de.tobias.utils.util.win.Kernel32;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
diff --git a/PluginAwake/src/de/tobias/playpad/awakeplugin/AwakeSettings.java b/PluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakeSettings.java
similarity index 100%
rename from PluginAwake/src/de/tobias/playpad/awakeplugin/AwakeSettings.java
rename to PluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakeSettings.java
index b60f7439347584d686c008236c820e12a67c95ae..dfc3d61c8d12f681a031174a09400c4fe4c01c7d 100644
--- a/PluginAwake/src/de/tobias/playpad/awakeplugin/AwakeSettings.java
+++ b/PluginAwake/src/main/java/de/tobias/playpad/awakeplugin/AwakeSettings.java
@@ -1,9 +1,5 @@
package de.tobias.playpad.awakeplugin;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
@@ -12,6 +8,10 @@ import org.dom4j.io.OutputFormat;
import org.dom4j.io.SAXReader;
import org.dom4j.io.XMLWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
class AwakeSettings {
boolean active = false;
diff --git a/PluginAwake/src/de/tobias/playpad/awakeplugin/assets/awake_de.properties b/PluginAwake/src/main/java/de/tobias/playpad/awakeplugin/assets/awake_de.properties
similarity index 100%
rename from PluginAwake/src/de/tobias/playpad/awakeplugin/assets/awake_de.properties
rename to PluginAwake/src/main/java/de/tobias/playpad/awakeplugin/assets/awake_de.properties
diff --git a/PluginEqualizer/PluginEqualizer.iml b/PluginEqualizer/PluginEqualizer.iml
index c5b8d49a921e0b2e511329f206097723ff61944d..9f4a0bb50fa4569fcb26dad6e45282f341ac1598 100644
--- a/PluginEqualizer/PluginEqualizer.iml
+++ b/PluginEqualizer/PluginEqualizer.iml
@@ -1,18 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="libUtils" level="project" />
- <orderEntry type="library" name="Plugins" level="project" />
- <orderEntry type="library" name="Updater" level="project" />
- <orderEntry type="library" name="XML" level="project" />
- <orderEntry type="library" name="YML" level="project" />
<orderEntry type="module" module-name="PlayWallCore" />
- <orderEntry type="library" name="libLogger" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libUtils:1.5.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:9.0.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.hp.gagawa:gagawa:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:23.3-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.0.18" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:YAMLStorage:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libStorage:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libLogger:1.3.5" level="project" />
+ <orderEntry type="library" name="Maven: org.fusesource.jansi:jansi:1.17.1" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:Updater:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+ <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.23.1" level="project" />
+ <orderEntry type="library" name="Maven: net.xeoh:jspf:1.0.2" level="project" />
+ <orderEntry type="library" name="Maven: kuusisto:tinysound:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jcraft:jorbis:0.0.17" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:vorbisspi:1.0.3.3" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:jorbis:0.0.17.4" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:tritonus-share:0.3.7.4" level="project" />
+ <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.4.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+ <orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.5" level="project" />
+ <orderEntry type="library" name="Maven: javazoom:jlayer:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: net.minidev:json-smart:1.2" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/PluginEqualizer/pom.xml b/PluginEqualizer/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35a8a430f885825386c523c6cf16503f8f4f4ec4
--- /dev/null
+++ b/PluginEqualizer/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallPluginEqualizer</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>releases</id>
+ <url>https://maven.thecodelabs.de/nexus/content/repositories/releases</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallCore</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/equalizerView.fxml b/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/equalizerView.fxml
deleted file mode 100644
index 83248d0f5488bc042f557652e10a793bd4e8c7d2..0000000000000000000000000000000000000000
--- a/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/equalizerView.fxml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <children>
- <HBox fx:id="equalizerView" prefHeight="353.0" prefWidth="600.0" AnchorPane.bottomAnchor="47.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
- <CheckBox fx:id="enableCheckBox" layoutX="14.0" layoutY="368.0" mnemonicParsing="false" onAction="#enableCheckBoxHandler" text="%eq.checkbox.enabled" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" />
- <HBox layoutX="420.0" layoutY="364.0" spacing="14.0" AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="14.0">
- <children>
- <Button fx:id="resetButton" layoutX="471.0" layoutY="364.0" mnemonicParsing="false" onAction="#resetButtonHandler" text="%eq.button.reset" AnchorPane.bottomAnchor="10.0" AnchorPane.rightAnchor="76.0" />
- <Button fx:id="finishButton" layoutX="534.0" layoutY="364.0" mnemonicParsing="false" onAction="#finishButtonHandler" text="%eq.button.finish" AnchorPane.bottomAnchor="10.0" AnchorPane.rightAnchor="14.0" />
- </children>
- </HBox>
- </children>
-</AnchorPane>
diff --git a/PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/assets/equalizerView.fxml b/PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/assets/equalizerView.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..3bbcecebf50eb6f9c97056e79b7537250d837ca1
--- /dev/null
+++ b/PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/assets/equalizerView.fxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.layout.*?>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
+ prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox fx:id="equalizerView" prefHeight="353.0" prefWidth="600.0" AnchorPane.bottomAnchor="47.0"
+ AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
+ <CheckBox fx:id="enableCheckBox" layoutX="14.0" layoutY="368.0" mnemonicParsing="false"
+ onAction="#enableCheckBoxHandler" text="%eq.checkbox.enabled" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.leftAnchor="14.0"/>
+ <HBox layoutX="420.0" layoutY="364.0" spacing="14.0" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.rightAnchor="14.0">
+ <children>
+ <Button fx:id="resetButton" layoutX="471.0" layoutY="364.0" mnemonicParsing="false"
+ onAction="#resetButtonHandler" text="%eq.button.reset" AnchorPane.bottomAnchor="10.0"
+ AnchorPane.rightAnchor="76.0"/>
+ <Button fx:id="finishButton" layoutX="534.0" layoutY="364.0" mnemonicParsing="false"
+ onAction="#finishButtonHandler" text="%eq.button.finish" AnchorPane.bottomAnchor="10.0"
+ AnchorPane.rightAnchor="14.0"/>
+ </children>
+ </HBox>
+ </children>
+</AnchorPane>
diff --git a/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/equalizer_de.properties b/PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/assets/equalizer_de.properties
similarity index 78%
rename from PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/equalizer_de.properties
rename to PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/assets/equalizer_de.properties
index 9afc1e473d5f70819edcc109629b30e69c6b8c01..edda909b678011af1e595387c95d283304bfe90e 100644
--- a/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/equalizer_de.properties
+++ b/PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/assets/equalizer_de.properties
@@ -1,7 +1,6 @@
eq.checkbox.enabled=Equalizer aktiviert
-eq.button.reset=Zur�cksetzen
+eq.button.reset=Zur\uFFFDcksetzen
eq.button.finish=Fertig
eq.slider=Hz
-
eq.menuitem.name=Equalizer
eq.title=Equalizer
\ No newline at end of file
diff --git a/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/style.css b/PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/assets/style.css
similarity index 100%
rename from PluginEqualizer/src/de/tobias/playpad/equalizerplugin/assets/style.css
rename to PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/assets/style.css
diff --git a/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/Equalizer.java b/PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/main/Equalizer.java
similarity index 99%
rename from PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/Equalizer.java
rename to PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/main/Equalizer.java
index 4ab02029ceeb4c474a995a5e352562697f2f5437..9d459cb05d14552f88803cc47cd3ad825d3bade2 100644
--- a/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/Equalizer.java
+++ b/PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/main/Equalizer.java
@@ -1,11 +1,9 @@
package de.tobias.playpad.equalizerplugin.main;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Set;
-
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleDoubleProperty;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
@@ -14,10 +12,11 @@ import org.dom4j.io.OutputFormat;
import org.dom4j.io.SAXReader;
import org.dom4j.io.XMLWriter;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleDoubleProperty;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Set;
public class Equalizer {
diff --git a/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/EqualizerPlugin.java b/PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/main/EqualizerPlugin.java
similarity index 100%
rename from PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/EqualizerPlugin.java
rename to PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/main/EqualizerPlugin.java
diff --git a/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginImpl.java b/PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginImpl.java
similarity index 100%
rename from PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginImpl.java
rename to PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/main/impl/EqualizerPluginImpl.java
diff --git a/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/impl/EqualizerViewController.java b/PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/main/impl/EqualizerViewController.java
similarity index 96%
rename from PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/impl/EqualizerViewController.java
rename to PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/main/impl/EqualizerViewController.java
index 5bc18e01783b773547d5c8ddee4352519aa8887c..0ad45138d5783f3ecac793cf6375d4861584bfb1 100644
--- a/PluginEqualizer/src/de/tobias/playpad/equalizerplugin/main/impl/EqualizerViewController.java
+++ b/PluginEqualizer/src/main/java/de/tobias/playpad/equalizerplugin/main/impl/EqualizerViewController.java
@@ -32,10 +32,14 @@ import java.util.List;
public class EqualizerViewController extends NVC {
- @FXML private HBox equalizerView;
- @FXML private Button resetButton;
- @FXML private Button finishButton;
- @FXML private CheckBox enableCheckBox;
+ @FXML
+ private HBox equalizerView;
+ @FXML
+ private Button resetButton;
+ @FXML
+ private Button finishButton;
+ @FXML
+ private CheckBox enableCheckBox;
public EqualizerViewController(Window owner) {
load("de/tobias/playpad/equalizerplugin/assets/", "equalizerView", EqualizerPluginImpl.getBundle());
diff --git a/PluginLaunchpad/PluginLaunchpad.iml b/PluginLaunchpad/PluginLaunchpad.iml
index 85ea9fbfb886b73e082ed83db9b43799f2a5dd66..9f4a0bb50fa4569fcb26dad6e45282f341ac1598 100644
--- a/PluginLaunchpad/PluginLaunchpad.iml
+++ b/PluginLaunchpad/PluginLaunchpad.iml
@@ -1,18 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="libUtils" level="project" />
- <orderEntry type="library" name="Plugins" level="project" />
- <orderEntry type="library" name="Updater" level="project" />
- <orderEntry type="library" name="YML" level="project" />
- <orderEntry type="library" name="XML" level="project" />
<orderEntry type="module" module-name="PlayWallCore" />
- <orderEntry type="library" name="libLogger" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libUtils:1.5.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:9.0.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.hp.gagawa:gagawa:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:23.3-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.0.18" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:YAMLStorage:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libStorage:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libLogger:1.3.5" level="project" />
+ <orderEntry type="library" name="Maven: org.fusesource.jansi:jansi:1.17.1" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:Updater:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+ <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.23.1" level="project" />
+ <orderEntry type="library" name="Maven: net.xeoh:jspf:1.0.2" level="project" />
+ <orderEntry type="library" name="Maven: kuusisto:tinysound:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jcraft:jorbis:0.0.17" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:vorbisspi:1.0.3.3" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:jorbis:0.0.17.4" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:tritonus-share:0.3.7.4" level="project" />
+ <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.4.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+ <orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.5" level="project" />
+ <orderEntry type="library" name="Maven: javazoom:jlayer:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: net.minidev:json-smart:1.2" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/PluginLaunchpad/pom.xml b/PluginLaunchpad/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1902762d43914d1798996177623640d5551c2a61
--- /dev/null
+++ b/PluginLaunchpad/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallPluginLaunchpad</artifactId>
+ <version>1.0.0</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>releases</id>
+ <url>https://maven.thecodelabs.de/nexus/content/repositories/releases</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallCore</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/LaunchpadPlugin.java b/PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/LaunchpadPlugin.java
similarity index 100%
rename from PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/LaunchpadPlugin.java
rename to PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/LaunchpadPlugin.java
diff --git a/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/assets/launchpad_de.properties b/PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/assets/launchpad_de.properties
similarity index 100%
rename from PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/assets/launchpad_de.properties
rename to PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/assets/launchpad_de.properties
diff --git a/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/assets/launchpad_mk2.map b/PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/assets/launchpad_mk2.map
similarity index 100%
rename from PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/assets/launchpad_mk2.map
rename to PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/assets/launchpad_mk2.map
diff --git a/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java b/PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java
similarity index 100%
rename from PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java
rename to PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/LaunchpadPluginImpl.java
diff --git a/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/impl/MapParser.java b/PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/MapParser.java
similarity index 100%
rename from PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/impl/MapParser.java
rename to PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/MapParser.java
index 34bbf654ea27485bddf5f8f21c082f3f0682ee9e..570c56d419765d3c447f49a7d402798b016b692d 100644
--- a/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/impl/MapParser.java
+++ b/PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/impl/MapParser.java
@@ -1,12 +1,12 @@
package de.tobias.playpad.launchpadplugin.impl;
+import de.tobias.utils.util.FileUtils;
+
import java.io.IOException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import de.tobias.utils.util.FileUtils;
-
public class MapParser {
public static Map<String, String> load(URL resource) throws IOException {
diff --git a/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2.java b/PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2.java
similarity index 99%
rename from PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2.java
rename to PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2.java
index 7d8f920ed542b5b981e6c69e0ab88646c1494328..972504e084df90037545bd940ef9abff928f97c5 100644
--- a/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2.java
+++ b/PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2.java
@@ -1,21 +1,20 @@
package de.tobias.playpad.launchpadplugin.midi.device.mk2;
-import java.net.URL;
-import java.util.Map;
-
-import javax.sound.midi.InvalidMidiDataException;
-import javax.sound.midi.MidiUnavailableException;
-import javax.sound.midi.ShortMessage;
-
import de.tobias.playpad.action.feedback.DisplayableFeedbackColor;
import de.tobias.playpad.action.feedback.Feedback;
import de.tobias.playpad.action.feedback.FeedbackMessage;
-import de.tobias.playpad.action.mididevice.MidiDeviceImpl;
import de.tobias.playpad.action.mididevice.DeviceColorAssociatorConnector;
+import de.tobias.playpad.action.mididevice.MidiDeviceImpl;
import de.tobias.playpad.launchpadplugin.impl.MapParser;
import de.tobias.playpad.midi.Midi;
import javafx.scene.paint.Color;
+import javax.sound.midi.InvalidMidiDataException;
+import javax.sound.midi.MidiUnavailableException;
+import javax.sound.midi.ShortMessage;
+import java.net.URL;
+import java.util.Map;
+
public class LaunchPadMK2 extends MidiDeviceImpl implements DeviceColorAssociatorConnector {
public static final String NAME = "Launchpad MK2";
diff --git a/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2Color.java b/PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2Color.java
similarity index 100%
rename from PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2Color.java
rename to PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/device/mk2/LaunchPadMK2Color.java
diff --git a/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadS.java b/PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadS.java
similarity index 100%
rename from PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadS.java
rename to PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadS.java
index fa6ced16276e828f4787fb6c38b0dd7559eed62d..d453038fbdc23e9899ad5cdbb73ff5062f28cfb7 100644
--- a/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadS.java
+++ b/PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadS.java
@@ -1,16 +1,16 @@
package de.tobias.playpad.launchpadplugin.midi.device.s;
-import javax.sound.midi.InvalidMidiDataException;
-import javax.sound.midi.MidiUnavailableException;
-
import de.tobias.playpad.action.feedback.DisplayableFeedbackColor;
import de.tobias.playpad.action.feedback.Feedback;
import de.tobias.playpad.action.feedback.FeedbackMessage;
-import de.tobias.playpad.action.mididevice.MidiDeviceImpl;
import de.tobias.playpad.action.mididevice.DeviceColorAssociatorConnector;
+import de.tobias.playpad.action.mididevice.MidiDeviceImpl;
import de.tobias.playpad.midi.Midi;
import javafx.scene.paint.Color;
+import javax.sound.midi.InvalidMidiDataException;
+import javax.sound.midi.MidiUnavailableException;
+
public class LaunchPadS extends MidiDeviceImpl implements DeviceColorAssociatorConnector {
public static final String NAME = "Launchpad S";
diff --git a/PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadSColor.java b/PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadSColor.java
similarity index 100%
rename from PluginLaunchpad/src/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadSColor.java
rename to PluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/device/s/LaunchPadSColor.java
diff --git a/PluginMedia/PluginMedia.iml b/PluginMedia/PluginMedia.iml
index c8a07437fadf7ad414d576ce2e2e18e68966f0c9..9f4a0bb50fa4569fcb26dad6e45282f341ac1598 100644
--- a/PluginMedia/PluginMedia.iml
+++ b/PluginMedia/PluginMedia.iml
@@ -1,18 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="XML" level="project" />
- <orderEntry type="library" name="YML" level="project" />
- <orderEntry type="library" name="Updater" level="project" />
- <orderEntry type="library" name="Plugins" level="project" />
- <orderEntry type="library" name="libUtils" level="project" />
<orderEntry type="module" module-name="PlayWallCore" />
- <orderEntry type="library" name="libLogger" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libUtils:1.5.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:9.0.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.hp.gagawa:gagawa:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:23.3-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.0.18" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:YAMLStorage:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libStorage:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libLogger:1.3.5" level="project" />
+ <orderEntry type="library" name="Maven: org.fusesource.jansi:jansi:1.17.1" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:Updater:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+ <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.23.1" level="project" />
+ <orderEntry type="library" name="Maven: net.xeoh:jspf:1.0.2" level="project" />
+ <orderEntry type="library" name="Maven: kuusisto:tinysound:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jcraft:jorbis:0.0.17" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:vorbisspi:1.0.3.3" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:jorbis:0.0.17.4" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:tritonus-share:0.3.7.4" level="project" />
+ <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.4.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+ <orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.5" level="project" />
+ <orderEntry type="library" name="Maven: javazoom:jlayer:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: net.minidev:json-smart:1.2" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/PluginMedia/pom.xml b/PluginMedia/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b2c9efd603912c4ee2fc1fdbae87c636f19c072c
--- /dev/null
+++ b/PluginMedia/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallPluginMedia</artifactId>
+ <version>1.0.0</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>releases</id>
+ <url>https://maven.thecodelabs.de/nexus/content/repositories/releases</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallCore</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/Actions.xml b/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/Actions.xml
deleted file mode 100644
index 9b9571fa5d688eaef5001cad09daac470326a7f6..0000000000000000000000000000000000000000
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/Actions.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<Actions>
- <Component id="BLIND" name="blindaction.name">de.tobias.playpad.mediaplugin.blindaction.BlindActionFactory</Component>
-</Actions>
\ No newline at end of file
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/PadContent.xml b/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/PadContent.xml
deleted file mode 100644
index 4a7ce267f766b905bd687ee3825766bd2ab7ffc1..0000000000000000000000000000000000000000
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/PadContent.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<Actions>
- <Component id="video" name="Content.Video.Name">de.tobias.playpad.mediaplugin.video.VideoPadContentFactory</Component>
- <Component id="image" name="Content.Image.Name">de.tobias.playpad.mediaplugin.image.ImagePadContentFactory</Component>
-</Actions>
\ No newline at end of file
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml b/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml
deleted file mode 100644
index 64628f11d369910dcfa1bdfc5984bcc69a69e39e..0000000000000000000000000000000000000000
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import java.lang.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <children>
- <HBox spacing="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
- <children>
- <Label alignment="BASELINE_RIGHT" maxHeight="1.7976931348623157E308" prefWidth="150.0" text="%pad.label.lastFrame" />
- <CheckBox fx:id="lastFrameCheckBox" layoutX="14.0" layoutY="14.0" mnemonicParsing="false" text="%pad.checkbox.lastFrame" />
- </children>
- </HBox>
- </children>
-</AnchorPane>
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml b/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml
deleted file mode 100644
index 797144dc10b1adcf08cdda5fd17fb121003ec508..0000000000000000000000000000000000000000
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <children>
- <VBox prefHeight="200.0" prefWidth="645.0" spacing="14.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
- <children>
- <Label text="%settings.video.label.screens" />
- <VBox alignment="TOP_CENTER">
- <children>
- <Pane fx:id="screenViewPane" prefWidth="617.0" VBox.vgrow="ALWAYS" />
- </children>
- </VBox>
- <HBox prefHeight="100.0" prefWidth="200.0" spacing="14.0">
- <children>
- <Label text="%settings.video.label.screenChoice">
- <HBox.margin>
- <Insets top="4.0" />
- </HBox.margin>
- </Label>
- <VBox prefHeight="88.0" prefWidth="325.0" spacing="14.0" HBox.hgrow="ALWAYS">
- <children>
- <ComboBox fx:id="screenComboBox" prefWidth="150.0" />
- <CheckBox fx:id="fullscreenCheckBox" mnemonicParsing="false" text="%settings.video.checkbox.fullscreen" />
- <CheckBox fx:id="videoOpenAtLaunchCheckBox" mnemonicParsing="false" text="%settings.video.checkbox.openAtLaunch" />
- </children>
- </VBox>
- </children>
- </HBox>
- </children>
- </VBox>
- </children>
-</AnchorPane>
diff --git a/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/Actions.xml b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/Actions.xml
new file mode 100644
index 0000000000000000000000000000000000000000..52edd11ec8b032a0e1a1bad961955bf165bb07b8
--- /dev/null
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/Actions.xml
@@ -0,0 +1,4 @@
+<Actions>
+ <Component id="BLIND" name="blindaction.name">de.tobias.playpad.mediaplugin.blindaction.BlindActionFactory
+ </Component>
+</Actions>
\ No newline at end of file
diff --git a/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/PadContent.xml b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/PadContent.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3215878e8967866d86dffa0af972f045c92e5e14
--- /dev/null
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/PadContent.xml
@@ -0,0 +1,6 @@
+<Actions>
+ <Component id="video" name="Content.Video.Name">de.tobias.playpad.mediaplugin.video.VideoPadContentFactory
+ </Component>
+ <Component id="image" name="Content.Image.Name">de.tobias.playpad.mediaplugin.image.ImagePadContentFactory
+ </Component>
+</Actions>
\ No newline at end of file
diff --git a/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..d407cd939961b606b8adaee546afb3e65fd25b99
--- /dev/null
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.*?>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
+ prefWidth="600.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <HBox spacing="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
+ <children>
+ <Label alignment="BASELINE_RIGHT" maxHeight="1.7976931348623157E308" prefWidth="150.0"
+ text="%pad.label.lastFrame"/>
+ <CheckBox fx:id="lastFrameCheckBox" layoutX="14.0" layoutY="14.0" mnemonicParsing="false"
+ text="%pad.checkbox.lastFrame"/>
+ </children>
+ </HBox>
+ </children>
+</AnchorPane>
diff --git a/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..1797ebe5e66ff909042861028d20dbac56b44351
--- /dev/null
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8"
+ xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <VBox prefHeight="200.0" prefWidth="645.0" spacing="14.0" AnchorPane.bottomAnchor="14.0"
+ AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
+ <children>
+ <Label text="%settings.video.label.screens"/>
+ <VBox alignment="TOP_CENTER">
+ <children>
+ <Pane fx:id="screenViewPane" prefWidth="617.0" VBox.vgrow="ALWAYS"/>
+ </children>
+ </VBox>
+ <HBox prefHeight="100.0" prefWidth="200.0" spacing="14.0">
+ <children>
+ <Label text="%settings.video.label.screenChoice">
+ <HBox.margin>
+ <Insets top="4.0"/>
+ </HBox.margin>
+ </Label>
+ <VBox prefHeight="88.0" prefWidth="325.0" spacing="14.0" HBox.hgrow="ALWAYS">
+ <children>
+ <ComboBox fx:id="screenComboBox" prefWidth="150.0"/>
+ <CheckBox fx:id="fullscreenCheckBox" mnemonicParsing="false"
+ text="%settings.video.checkbox.fullscreen"/>
+ <CheckBox fx:id="videoOpenAtLaunchCheckBox" mnemonicParsing="false"
+ text="%settings.video.checkbox.openAtLaunch"/>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ </children>
+</AnchorPane>
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/video_de.properties b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/video_de.properties
similarity index 69%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/assets/video_de.properties
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/video_de.properties
index 01d06be333d3f2492e0554d74bef51d7eb44a87f..59f1eb86e2851f3f19584a52b92a84255cccb373 100644
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/video_de.properties
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/assets/video_de.properties
@@ -1,15 +1,11 @@
settings.tab=Video/Bild
-
settings.video.tab=Video
settings.video.label.screens=Bildschirme:
-settings.video.label.screenChoice=Bildschirm f�r Videowiedergabe:
+settings.video.label.screenChoice=Bildschirm f\uFFFDr Videowiedergabe:
settings.video.checkbox.fullscreen=Vollbild
-settings.video.checkbox.openAtLaunch=Fenster beim Start �ffnen
-
+settings.video.checkbox.openAtLaunch=Fenster beim Start \uFFFDffnen
pad.label.lastFrame=Letztes Bild am Ende des Videos einfrieren (Freeze)
pad.checkbox.lastFrame=Aktivieren
-
blindaction.name=Schwarzbild Video
-
Content.Video.Name=Video
Content.Image.Name=Bild
\ No newline at end of file
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java
similarity index 94%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java
index bd5c3ac2600b0f3589f3a223ec8f092fd625e1f1..78551cc8a1b65680d0ab27bf0a3a99e396f1c597 100644
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java
@@ -1,7 +1,5 @@
package de.tobias.playpad.mediaplugin.blindaction;
-import org.dom4j.Element;
-
import de.tobias.playpad.Displayable;
import de.tobias.playpad.action.Action;
import de.tobias.playpad.action.InputType;
@@ -10,14 +8,15 @@ import de.tobias.playpad.action.feedback.FeedbackType;
import de.tobias.playpad.mediaplugin.main.impl.MediaPluginImpl;
import de.tobias.playpad.project.Project;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.beans.value.ChangeListener;
import javafx.scene.Node;
import javafx.scene.control.Label;
+import org.dom4j.Element;
public class BlindAction extends Action implements Displayable {
@@ -73,10 +72,12 @@ public class BlindAction extends Action implements Displayable {
}
@Override
- public void load(Element root) {}
+ public void load(Element root) {
+ }
@Override
- public void save(Element root) {}
+ public void save(Element root) {
+ }
@Override
public boolean equals(Object obj) {
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindActionFactory.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/blindaction/BlindActionFactory.java
similarity index 78%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindActionFactory.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/blindaction/BlindActionFactory.java
index 0825fa9f47a4c74e73e97c0bac1cf8882177506d..0fa8a225096791951e04a2708cc9cac6ee6b0fe8 100644
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindActionFactory.java
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/blindaction/BlindActionFactory.java
@@ -1,15 +1,11 @@
package de.tobias.playpad.mediaplugin.blindaction;
-import java.util.List;
-
-import de.tobias.playpad.action.Action;
-import de.tobias.playpad.action.ActionFactory;
-import de.tobias.playpad.action.ActionDisplayable;
-import de.tobias.playpad.action.ActionType;
-import de.tobias.playpad.action.Mapping;
+import de.tobias.playpad.action.*;
import de.tobias.playpad.profile.Profile;
import javafx.scene.control.TreeItem;
+import java.util.List;
+
public class BlindActionFactory extends ActionFactory {
static final String TYPE = "BLIND";
@@ -32,12 +28,12 @@ public class BlindActionFactory extends ActionFactory {
public Action newInstance() {
return new BlindAction();
}
-
+
@Override
public ActionType geActionType() {
return ActionType.SETTINGS;
}
-
+
@Override
public String getType() {
return TYPE;
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImageContent.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/image/ImageContent.java
similarity index 98%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImageContent.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/image/ImageContent.java
index cfffbab37e48cc46c570cba834245b4deaddd7d8..b2a458979d714bd0862d58750a429cc2f2f412ee 100644
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImageContent.java
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/image/ImageContent.java
@@ -1,16 +1,15 @@
package de.tobias.playpad.mediaplugin.image;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import de.tobias.playpad.pad.mediapath.MediaPath;
-
import de.tobias.playpad.mediaplugin.main.impl.MediaPluginImpl;
import de.tobias.playpad.pad.Pad;
import de.tobias.playpad.pad.PadStatus;
import de.tobias.playpad.pad.content.PadContent;
+import de.tobias.playpad.pad.mediapath.MediaPath;
import javafx.application.Platform;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
public class ImageContent extends PadContent {
private final String type;
@@ -22,7 +21,8 @@ public class ImageContent extends PadContent {
}
@Override
- public void updateVolume() {}
+ public void updateVolume() {
+ }
@Override
public String getType() {
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImagePadContentFactory.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/image/ImagePadContentFactory.java
similarity index 96%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImagePadContentFactory.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/image/ImagePadContentFactory.java
index 68630781143b3727e0109dd0717b77d5d2afeca4..7ec791ae1cdcbef202e878c4e7a0b7af7b8fbffc 100644
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImagePadContentFactory.java
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/image/ImagePadContentFactory.java
@@ -1,8 +1,8 @@
package de.tobias.playpad.mediaplugin.image;
import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.content.PadContentFactory;
import de.tobias.playpad.pad.content.PadContent;
+import de.tobias.playpad.pad.content.PadContentFactory;
import de.tobias.playpad.pad.view.IPadContentView;
import de.tobias.playpad.viewcontroller.PadSettingsTabViewController;
import javafx.collections.ListChangeListener;
@@ -19,7 +19,7 @@ import javafx.scene.text.TextAlignment;
public class ImagePadContentFactory extends PadContentFactory {
- private static final String[] FILE_EXTENSION = { "*.png", "*.jpg", "*.jpeg", "*.bmp", "*.gif" };
+ private static final String[] FILE_EXTENSION = {"*.png", "*.jpg", "*.jpeg", "*.bmp", "*.gif"};
public ImagePadContentFactory(String type) {
super(type);
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/main/MediaPlugin.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/MediaPlugin.java
similarity index 100%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/main/MediaPlugin.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/MediaPlugin.java
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/main/VideoSettings.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/VideoSettings.java
similarity index 100%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/main/VideoSettings.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/VideoSettings.java
index 147e22d7f266be71a474b015a4a7abfa77743bbd..fc8f3e139f54c52ee79b93d93787694db7ee5a98 100644
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/main/VideoSettings.java
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/VideoSettings.java
@@ -1,9 +1,5 @@
package de.tobias.playpad.mediaplugin.main;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
@@ -12,6 +8,10 @@ import org.dom4j.io.OutputFormat;
import org.dom4j.io.SAXReader;
import org.dom4j.io.XMLWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
public class VideoSettings {
private int screenId = 0;
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java
similarity index 97%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java
index e2198e3b6107a4e2bfbd7f777ad1ba815cd67a33..ba7eb98a4b27a433f822b34adef9c60a7f48de1f 100644
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java
@@ -11,9 +11,9 @@ import de.tobias.playpad.plugin.StandardPluginUpdater;
import de.tobias.playpad.profile.Profile;
import de.tobias.playpad.registry.Registry;
import de.tobias.updater.client.Updatable;
-import de.tobias.utils.ui.HUD;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.HUD;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import de.tobias.utils.util.Localization;
import javafx.application.Platform;
import javafx.beans.property.BooleanProperty;
@@ -43,7 +43,7 @@ public class MediaPluginImpl implements MediaPlugin, SettingsListener, ChangeLis
private static Module module;
private static Updatable updater;
-
+
private static MediaPluginImpl instance;
private MediaViewController videoViewController;
private VideoSettings settings = new VideoSettings();
@@ -175,12 +175,12 @@ public class MediaPluginImpl implements MediaPlugin, SettingsListener, ChangeLis
}
});
}
-
+
@Override
public Module getModule() {
return module;
}
-
+
@Override
public Updatable getUpdatable() {
return updater;
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java
similarity index 95%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java
index af4b39bfd7471d81c416c6f5750c5a9442d15e10..f50cf3727962864f693b73df5029158ad5c5fc39 100644
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java
@@ -1,9 +1,9 @@
package de.tobias.playpad.mediaplugin.main.impl;
import de.tobias.playpad.mediaplugin.main.VideoSettings;
-import de.tobias.playpad.project.Project;
import de.tobias.playpad.profile.Profile;
import de.tobias.playpad.profile.ProfileSettings;
+import de.tobias.playpad.project.Project;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import de.tobias.playpad.viewcontroller.option.IProfileReloadTask;
import de.tobias.playpad.viewcontroller.option.ProfileSettingsTabViewController;
@@ -23,10 +23,14 @@ import java.util.ResourceBundle;
public class MediaSettingsTabViewController extends ProfileSettingsTabViewController implements IProfileReloadTask {
- @FXML private Pane screenViewPane;
- @FXML private ComboBox<Integer> screenComboBox;
- @FXML private CheckBox fullscreenCheckBox;
- @FXML private CheckBox videoOpenAtLaunchCheckBox;
+ @FXML
+ private Pane screenViewPane;
+ @FXML
+ private ComboBox<Integer> screenComboBox;
+ @FXML
+ private CheckBox fullscreenCheckBox;
+ @FXML
+ private CheckBox videoOpenAtLaunchCheckBox;
private VideoSettings settings;
private ResourceBundle bundle;
@@ -123,7 +127,7 @@ public class MediaSettingsTabViewController extends ProfileSettingsTabViewContro
public boolean validSettings() {
return true;
}
-
+
@Override
public Runnable getTask(ProfileSettings settings, Project project, IMainViewController controller) {
return MediaPluginImpl.getInstance().getVideoViewController()::reloadSettings;
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java
similarity index 95%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java
index dfffde190d9c6d05f79376598ea9192ca04b8a2e..473da558d307d6ce4c14d63043da53faabd7e7da 100644
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java
@@ -1,9 +1,5 @@
package de.tobias.playpad.mediaplugin.main.impl;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
import de.tobias.playpad.PlayPadPlugin;
import de.tobias.playpad.mediaplugin.image.ImageContent;
import de.tobias.playpad.mediaplugin.main.VideoSettings;
@@ -17,16 +13,10 @@ import de.tobias.utils.application.container.PathType;
import de.tobias.utils.util.OS;
import de.tobias.utils.util.OS.OSType;
import javafx.application.Platform;
-import javafx.event.Event;
import javafx.geometry.Pos;
import javafx.geometry.Rectangle2D;
import javafx.scene.Scene;
-import javafx.scene.layout.Background;
-import javafx.scene.layout.BackgroundFill;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.Priority;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
+import javafx.scene.layout.*;
import javafx.scene.media.MediaPlayer;
import javafx.scene.media.MediaPlayer.Status;
import javafx.scene.media.MediaView;
@@ -34,6 +24,10 @@ import javafx.scene.paint.Color;
import javafx.stage.Screen;
import javafx.stage.Stage;
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
public class MediaViewController implements ProfileListener {
private MediaView mediaView;
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/Strings.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/Strings.java
similarity index 100%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/Strings.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/Strings.java
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContent.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoContent.java
similarity index 100%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContent.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoContent.java
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoPadContentFactory.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoPadContentFactory.java
similarity index 96%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoPadContentFactory.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoPadContentFactory.java
index cc550634ae83f4d6168df364a139136082a37cdc..9f46c2de68aaab441b80c7e0bf53b3475c2b02f6 100644
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoPadContentFactory.java
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoPadContentFactory.java
@@ -18,7 +18,7 @@ import javafx.scene.text.TextAlignment;
public class VideoPadContentFactory extends PadContentFactory {
- private static final String[] FILE_EXTENSION = { "*.mp4", "*.mov" };
+ private static final String[] FILE_EXTENSION = {"*.mp4", "*.mov"};
public VideoPadContentFactory(String type) {
super(type);
diff --git a/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java
similarity index 96%
rename from PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java
rename to PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java
index 8f34482a41e9a70bc0b1d97668025c00955f53d4..128b8bb8ccac37ed58b10aa0415d4609e787bb06 100644
--- a/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java
+++ b/PluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java
@@ -8,7 +8,8 @@ import javafx.scene.control.CheckBox;
public class VideoPadSettingsTabViewController extends PadSettingsTabViewController {
- @FXML private CheckBox lastFrameCheckBox;
+ @FXML
+ private CheckBox lastFrameCheckBox;
VideoPadSettingsTabViewController() {
load("de/tobias/playpad/mediaplugin/assets/", "settingsPadPane", MediaPluginImpl.getInstance().getBundle());
diff --git a/PluginNativeAudio/PluginNativeAudio.iml b/PluginNativeAudio/PluginNativeAudio.iml
index 6fc1cd5ffb5957ab94e74991acf28dae6064dc8f..8b33e97ef1b94364dd120adb5099c35c35588544 100644
--- a/PluginNativeAudio/PluginNativeAudio.iml
+++ b/PluginNativeAudio/PluginNativeAudio.iml
@@ -1,30 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="PlayWallCore" />
- <orderEntry type="library" name="libUtils" level="project" />
- <orderEntry type="library" name="Updater" level="project" />
- <orderEntry type="library" name="YML" level="project" />
- <orderEntry type="library" name="Plugins" level="project" />
- <orderEntry type="library" name="XML" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libUtils:1.5.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-net:commons-net:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:9.0.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: net.java.dev.jna:jna-platform:4.1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.hp.gagawa:gagawa:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:23.3-jre" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.0.18" level="project" />
+ <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.14" level="project" />
+ <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:YAMLStorage:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libStorage:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:libLogger:1.3.5" level="project" />
+ <orderEntry type="library" name="Maven: org.fusesource.jansi:jansi:1.17.1" level="project" />
+ <orderEntry type="library" name="Maven: de.tobias:Updater:1.0.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.5" level="project" />
+ <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.23.1" level="project" />
+ <orderEntry type="library" name="Maven: net.xeoh:jspf:1.0.2" level="project" />
+ <orderEntry type="library" name="Maven: kuusisto:tinysound:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jcraft:jorbis:0.0.17" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:vorbisspi:1.0.3.3" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:jorbis:0.0.17.4" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.soundlibs:tritonus-share:0.3.7.4" level="project" />
+ <orderEntry type="library" name="Maven: com.mashape.unirest:unirest-java:1.4.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpasyncclient:4.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore-nio:4.4.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20160212" level="project" />
+ <orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.5" level="project" />
+ <orderEntry type="library" name="Maven: javazoom:jlayer:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: net.minidev:json-smart:1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.6" level="project" />
+ <orderEntry type="library" name="Maven: net.sf.jni4net:jni4net.j:0.8.8.0" level="project" />
<orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/j4n/jni4net.j-0.8.8.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
+ <library name="Maven: de.tobias:NativeAudio:1.0.0">
<CLASSES>
<root url="jar://$MODULE_DIR$/j4n/NativeAudio.j4n.jar!/" />
</CLASSES>
@@ -32,7 +62,5 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="library" name="libLogger" level="project" />
- <orderEntry type="library" name="scala-sdk-2.12.6" level="application" />
</component>
</module>
\ No newline at end of file
diff --git a/PluginNativeAudio/pom.xml b/PluginNativeAudio/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0f7d98b9fd4cc575c63baeb25c9145bca1156a0f
--- /dev/null
+++ b/PluginNativeAudio/pom.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallPluginNativeAudio</artifactId>
+ <version>1.0.0</version>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.7.0</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+
+ <!--Scala Plugin-->
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>scala-compile-first</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>add-source</goal>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>scala-test-compile</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>scala</id>
+ <name>Scala Tools</name>
+ <url>http://scala-tools.org/repo-releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <repositories>
+ <repository>
+ <id>scala</id>
+ <name>Scala Tools</name>
+ <url>http://scala-tools.org/repo-releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+
+ <repository>
+ <id>releases</id>
+ <url>https://maven.thecodelabs.de/nexus/content/repositories/releases</url>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>de.tobias</groupId>
+ <artifactId>PlayWallCore</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.12.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.jni4net</groupId>
+ <artifactId>jni4net.j</artifactId>
+ <version>0.8.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>de.tobias</groupId>
+ <artifactId>NativeAudio</artifactId>
+ <version>1.0.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/j4n/NativeAudio.j4n.jar</systemPath>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/PluginNativeAudio/src/de/tobias/playpad/assets/win/nawinSettings.fxml b/PluginNativeAudio/src/de/tobias/playpad/assets/win/nawinSettings.fxml
deleted file mode 100644
index 3bc628651c3be6d86bd71a62dc915fa7b1d6f0fd..0000000000000000000000000000000000000000
--- a/PluginNativeAudio/src/de/tobias/playpad/assets/win/nawinSettings.fxml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<HBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
- <children>
- <ComboBox fx:id="soundCardComboBox" layoutX="118.0" layoutY="14.0" prefHeight="26.0" prefWidth="241.0" />
- <Button fx:id="testButton" layoutX="372.0" layoutY="14.0" mnemonicParsing="false" onAction="#testButtonHandler" />
- </children>
-</HBox>
diff --git a/PluginNativeAudio/src/META-INF/MANIFEST.MF b/PluginNativeAudio/src/main/java/META-INF/MANIFEST.MF
similarity index 96%
rename from PluginNativeAudio/src/META-INF/MANIFEST.MF
rename to PluginNativeAudio/src/main/java/META-INF/MANIFEST.MF
index e2defea5f5f0fb638042ceea04e6c675c159a6c8..e1e4f762ea4a59db8bc31e317f356f0a0236cae1 100644
--- a/PluginNativeAudio/src/META-INF/MANIFEST.MF
+++ b/PluginNativeAudio/src/main/java/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
-Class-Path: . nawin/jni4net.j-0.8.8.0.jar nawin/NativeAudio.j4n.jar
-
+Manifest-Version: 1.0
+Class-Path: . nawin/jni4net.j-0.8.8.0.jar nawin/NativeAudio.j4n.jar
+
diff --git a/PluginNativeAudio/src/de/tobias/playpad/NativeAudio.java b/PluginNativeAudio/src/main/java/de/tobias/playpad/NativeAudio.java
similarity index 99%
rename from PluginNativeAudio/src/de/tobias/playpad/NativeAudio.java
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/NativeAudio.java
index 193911ead7e46dc016b5828ec361b0dc45cb5fc6..e512d4272edaa636e858d2a47215eb8a6f1bb9ea 100644
--- a/PluginNativeAudio/src/de/tobias/playpad/NativeAudio.java
+++ b/PluginNativeAudio/src/main/java/de/tobias/playpad/NativeAudio.java
@@ -3,7 +3,7 @@ package de.tobias.playpad;
public class NativeAudio {
public static native void initialize();
-
+
public static native void play(int id);
public static native void pause(int id);
@@ -25,7 +25,7 @@ public class NativeAudio {
public static native double getDuration(int id);
public static native double getPosition(int id);
-
+
public static void onPeakMeter(int id, float left, float right) {
if (delegate != null) {
delegate.onPeakMeter(id, left, right);
@@ -37,7 +37,7 @@ public class NativeAudio {
delegate.onPositionChanged(id, position);
}
}
-
+
public static void onFinish(int id) {
if (delegate != null) {
delegate.onFinish(id);
@@ -52,9 +52,9 @@ public class NativeAudio {
public interface NativeAudioDelegate {
void onFinish(int id);
-
+
void onPeakMeter(int id, float left, float right);
-
+
void onPositionChanged(int id, double position);
}
}
diff --git a/PluginNativeAudio/src/de/tobias/playpad/Waveform.java b/PluginNativeAudio/src/main/java/de/tobias/playpad/Waveform.java
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/Waveform.java
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/Waveform.java
diff --git a/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/Test-Sound.wav b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/Test-Sound.wav
new file mode 100644
index 0000000000000000000000000000000000000000..1a627d7c84165c6131c47134b1ca1f4fcb0bf3be
Binary files /dev/null and b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/Test-Sound.wav differ
diff --git a/PluginNativeAudio/src/de/tobias/playpad/assets/mac/libNativeAudio.dylib b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/mac/libNativeAudio.dylib
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/assets/mac/libNativeAudio.dylib
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/assets/mac/libNativeAudio.dylib
diff --git a/PluginNativeAudio/src/de/tobias/playpad/assets/win/NAudio.dll b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/NAudio.dll
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/assets/win/NAudio.dll
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/NAudio.dll
diff --git a/PluginNativeAudio/src/de/tobias/playpad/assets/win/NativeAudio.dll b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/NativeAudio.dll
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/assets/win/NativeAudio.dll
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/NativeAudio.dll
diff --git a/PluginNativeAudio/src/de/tobias/playpad/assets/win/NativeAudio.j4n.dll b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/NativeAudio.j4n.dll
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/assets/win/NativeAudio.j4n.dll
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/NativeAudio.j4n.dll
diff --git a/PluginNativeAudio/src/de/tobias/playpad/assets/win/NativeAudio.j4n.jar b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/NativeAudio.j4n.jar
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/assets/win/NativeAudio.j4n.jar
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/NativeAudio.j4n.jar
diff --git a/PluginNativeAudio/src/de/tobias/playpad/assets/win/jni4net.j-0.8.8.0.jar b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/jni4net.j-0.8.8.0.jar
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/assets/win/jni4net.j-0.8.8.0.jar
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/jni4net.j-0.8.8.0.jar
diff --git a/PluginNativeAudio/src/de/tobias/playpad/assets/win/jni4net.n-0.8.8.0.dll b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/jni4net.n-0.8.8.0.dll
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/assets/win/jni4net.n-0.8.8.0.dll
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/jni4net.n-0.8.8.0.dll
diff --git a/PluginNativeAudio/src/de/tobias/playpad/assets/win/jni4net.n.w32.v40-0.8.8.0.dll b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/jni4net.n.w32.v40-0.8.8.0.dll
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/assets/win/jni4net.n.w32.v40-0.8.8.0.dll
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/jni4net.n.w32.v40-0.8.8.0.dll
diff --git a/PluginNativeAudio/src/de/tobias/playpad/assets/win/jni4net.n.w64.v40-0.8.8.0.dll b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/jni4net.n.w64.v40-0.8.8.0.dll
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/assets/win/jni4net.n.w64.v40-0.8.8.0.dll
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/jni4net.n.w64.v40-0.8.8.0.dll
diff --git a/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/nawinSettings.fxml b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/nawinSettings.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..c52a5222d7ea4aa039054c722581ee69329807e6
--- /dev/null
+++ b/PluginNativeAudio/src/main/java/de/tobias/playpad/assets/win/nawinSettings.fxml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.layout.HBox?>
+<HBox spacing="14.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+ <children>
+ <ComboBox fx:id="soundCardComboBox" layoutX="118.0" layoutY="14.0" prefHeight="26.0" prefWidth="241.0"/>
+ <Button fx:id="testButton" layoutX="372.0" layoutY="14.0" mnemonicParsing="false"
+ onAction="#testButtonHandler"/>
+ </children>
+</HBox>
diff --git a/PluginNativeAudio/src/de/tobias/playpad/audio/mac/NativeAudioMacHandler.java b/PluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandler.java
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/audio/mac/NativeAudioMacHandler.java
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandler.java
diff --git a/PluginNativeAudio/src/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java b/PluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java
similarity index 99%
rename from PluginNativeAudio/src/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java
index 598e6c6e476d2e3f458a1e261ae5829d683830b0..b66d85d29578d3fe6d986199f135c70c9f2a66bf 100644
--- a/PluginNativeAudio/src/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java
+++ b/PluginNativeAudio/src/main/java/de/tobias/playpad/audio/mac/NativeAudioMacHandlerFactory.java
@@ -40,7 +40,7 @@ public class NativeAudioMacHandlerFactory extends AudioHandlerFactory implements
}
}
}
-
+
@Override
public void onPositionChanged(int id, double position) {
NativeAudioMacHandler nativeAudioMacHandler = handlers.get(id);
@@ -48,7 +48,7 @@ public class NativeAudioMacHandlerFactory extends AudioHandlerFactory implements
nativeAudioMacHandler.positionProperty.set(Duration.seconds(position));
}
}
-
+
@Override
public void onPeakMeter(int id, float left, float right) {
NativeAudioMacHandler nativeAudioMacHandler = handlers.get(id);
diff --git a/PluginNativeAudio/src/de/tobias/playpad/audio/windows/NativeAudioSettingsViewController.java b/PluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioSettingsViewController.java
similarity index 95%
rename from PluginNativeAudio/src/de/tobias/playpad/audio/windows/NativeAudioSettingsViewController.java
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioSettingsViewController.java
index c5e4d532460dcfac94b4567c7b9fa58b34c5336c..4c61373f6f6db0ef9bb8fee5bd00c758b04e2715 100644
--- a/PluginNativeAudio/src/de/tobias/playpad/audio/windows/NativeAudioSettingsViewController.java
+++ b/PluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioSettingsViewController.java
@@ -4,8 +4,8 @@ import de.tobias.playpad.profile.Profile;
import de.tobias.playpad.viewcontroller.AudioHandlerViewController;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.application.container.PathType;
-import de.tobias.utils.ui.icon.FontAwesomeType;
-import de.tobias.utils.ui.icon.FontIcon;
+import de.tobias.utils.nui.icon.FontAwesomeType;
+import de.tobias.utils.nui.icon.FontIcon;
import de.tobias.utils.util.IOUtils;
import de.tobias.utils.util.Worker;
import javafx.application.Platform;
@@ -22,8 +22,10 @@ import java.nio.file.Path;
public class NativeAudioSettingsViewController extends AudioHandlerViewController {
- @FXML private ComboBox<String> soundCardComboBox;
- @FXML private Button testButton;
+ @FXML
+ private ComboBox<String> soundCardComboBox;
+ @FXML
+ private Button testButton;
private boolean isChanged;
diff --git a/PluginNativeAudio/src/de/tobias/playpad/audio/windows/NativeAudioWinHandler.java b/PluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandler.java
similarity index 96%
rename from PluginNativeAudio/src/de/tobias/playpad/audio/windows/NativeAudioWinHandler.java
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandler.java
index a9400ede8e5e2766d6bb6f6b1797b98e0c22d5e0..630c342cdb9b7f69bf25e1c6a157a8d06c59ffd3 100644
--- a/PluginNativeAudio/src/de/tobias/playpad/audio/windows/NativeAudioWinHandler.java
+++ b/PluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandler.java
@@ -1,192 +1,192 @@
-package de.tobias.playpad.audio.windows;
-
-import de.tobias.playpad.audio.AudioHandler;
-import de.tobias.playpad.audio.Soundcardable;
-import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.PadStatus;
-import de.tobias.playpad.pad.content.PadContent;
-import de.tobias.playpad.pad.content.play.Seekable;
-import de.tobias.playpad.profile.Profile;
-import javafx.application.Platform;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.util.Duration;
-import nativeaudio.NativeAudio;
-
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import java.util.List;
-
-public class NativeAudioWinHandler extends AudioHandler implements Soundcardable, Seekable {
-
- static final String SOUND_CARD = "SoundCard";
-
- private NativeAudio audioHandler;
- private ObjectProperty<Duration> durationProperty;
- private ObjectProperty<Duration> positionProperty;
-
- private static Thread positionThread;
- private static List<NativeAudioWinHandler> playedHandlers = new ArrayList<>();
- private static final int SLEEP_TIME_POSITION = 50;
-
- static {
- positionThread = new Thread(() ->
- {
- while (true) {
- try {
- if (playedHandlers.isEmpty()) {
- synchronized (positionThread) {
- positionThread.wait();
- }
- }
-
- for (Iterator<NativeAudioWinHandler> iterator = playedHandlers.iterator(); iterator.hasNext(); ) {
- NativeAudioWinHandler handler = iterator.next();
- Pad pad = handler.getContent().getPad();
-
- if (handler.audioHandler != null) {
- if (!handler.audioHandler.isPlaying()) {
- if (!pad.getPadSettings().isLoop()) {
- pad.setEof(true);
-
- // Remove from Loop and Stop
- iterator.remove();
- Platform.runLater(() -> pad.setStatus(PadStatus.STOP));
- }
- }
- }
-
- if (handler.audioHandler != null) {
- Duration position = Duration.millis(handler.audioHandler.getPosition());
-
- // Update der Zeit
- Platform.runLater(() -> handler.positionProperty.set(position));
- }
- }
-
- Thread.sleep(SLEEP_TIME_POSITION);
- } catch (ConcurrentModificationException ignored) {
- } catch (InterruptedException e) {
- break;
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
-
- positionThread.start();
- }
-
- NativeAudioWinHandler(PadContent content) {
- super(content);
- durationProperty = new SimpleObjectProperty<>();
- positionProperty = new SimpleObjectProperty<>();
- }
-
- @Override
- public void play() {
- audioHandler.setLoop(getContent().getPad().getPadSettings().isLoop());
-
- audioHandler.play();
-
- boolean start = false;
- if (playedHandlers.isEmpty()) {
- start = true;
- }
-
- if (!playedHandlers.contains(this))
- playedHandlers.add(this);
- if (start) {
- synchronized (positionThread) {
- positionThread.notify();
- }
- }
- }
-
- @Override
- public void pause() {
- audioHandler.pause();
- if (playedHandlers.contains(this))
- playedHandlers.remove(this);
- }
-
- @Override
- public void stop() {
- audioHandler.stop();
- if (playedHandlers.contains(this))
- playedHandlers.remove(this);
- }
-
- @Override
- public void seekToStart() {
- audioHandler.seek(0);
- }
-
- @Override
- public Duration getPosition() {
- return positionProperty.get();
- }
-
- @Override
- public ReadOnlyObjectProperty<Duration> positionProperty() {
- return positionProperty;
- }
-
- @Override
- public Duration getDuration() {
- return durationProperty.get();
- }
-
- @Override
- public ReadOnlyObjectProperty<Duration> durationProperty() {
- return durationProperty;
- }
-
- @Override
- public void setVolume(double volume) {
- if (audioHandler != null) {
- audioHandler.setVolume((float) volume);
- }
- }
-
- @Override
- public boolean isMediaLoaded() {
- return audioHandler != null;
- }
-
- @Override
- public void loadMedia(Path[] paths) {
- if (audioHandler == null)
- audioHandler = new NativeAudio();
- audioHandler.load(paths[0].toString());
-
- String name = (String) Profile.currentProfile().getProfileSettings().getAudioUserInfo().get(NativeAudioWinHandler.SOUND_CARD);
- audioHandler.setDevice(name);
-
- Platform.runLater(() ->
- {
- durationProperty.set(Duration.millis(audioHandler.getDuration()));
- getContent().getPad().setStatus(PadStatus.READY);
- if (getContent().getPad().isPadVisible()) {
- getContent().getPad().getController().getView().showBusyView(false);
- }
- });
- }
-
- @Override
- public void unloadMedia() {
- if (audioHandler != null) {
- audioHandler.unload();
- audioHandler = null;
- }
- }
-
- @Override
- public void setOutputDevice(String name) {
- audioHandler.setDevice(name);
- }
-
-}
+package de.tobias.playpad.audio.windows;
+
+import de.tobias.playpad.audio.AudioHandler;
+import de.tobias.playpad.audio.Soundcardable;
+import de.tobias.playpad.pad.Pad;
+import de.tobias.playpad.pad.PadStatus;
+import de.tobias.playpad.pad.content.PadContent;
+import de.tobias.playpad.pad.content.play.Seekable;
+import de.tobias.playpad.profile.Profile;
+import javafx.application.Platform;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.util.Duration;
+import nativeaudio.NativeAudio;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.List;
+
+public class NativeAudioWinHandler extends AudioHandler implements Soundcardable, Seekable {
+
+ static final String SOUND_CARD = "SoundCard";
+
+ private NativeAudio audioHandler;
+ private ObjectProperty<Duration> durationProperty;
+ private ObjectProperty<Duration> positionProperty;
+
+ private static Thread positionThread;
+ private static List<NativeAudioWinHandler> playedHandlers = new ArrayList<>();
+ private static final int SLEEP_TIME_POSITION = 50;
+
+ static {
+ positionThread = new Thread(() ->
+ {
+ while (true) {
+ try {
+ if (playedHandlers.isEmpty()) {
+ synchronized (positionThread) {
+ positionThread.wait();
+ }
+ }
+
+ for (Iterator<NativeAudioWinHandler> iterator = playedHandlers.iterator(); iterator.hasNext(); ) {
+ NativeAudioWinHandler handler = iterator.next();
+ Pad pad = handler.getContent().getPad();
+
+ if (handler.audioHandler != null) {
+ if (!handler.audioHandler.isPlaying()) {
+ if (!pad.getPadSettings().isLoop()) {
+ pad.setEof(true);
+
+ // Remove from Loop and Stop
+ iterator.remove();
+ Platform.runLater(() -> pad.setStatus(PadStatus.STOP));
+ }
+ }
+ }
+
+ if (handler.audioHandler != null) {
+ Duration position = Duration.millis(handler.audioHandler.getPosition());
+
+ // Update der Zeit
+ Platform.runLater(() -> handler.positionProperty.set(position));
+ }
+ }
+
+ Thread.sleep(SLEEP_TIME_POSITION);
+ } catch (ConcurrentModificationException ignored) {
+ } catch (InterruptedException e) {
+ break;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+
+ positionThread.start();
+ }
+
+ NativeAudioWinHandler(PadContent content) {
+ super(content);
+ durationProperty = new SimpleObjectProperty<>();
+ positionProperty = new SimpleObjectProperty<>();
+ }
+
+ @Override
+ public void play() {
+ audioHandler.setLoop(getContent().getPad().getPadSettings().isLoop());
+
+ audioHandler.play();
+
+ boolean start = false;
+ if (playedHandlers.isEmpty()) {
+ start = true;
+ }
+
+ if (!playedHandlers.contains(this))
+ playedHandlers.add(this);
+ if (start) {
+ synchronized (positionThread) {
+ positionThread.notify();
+ }
+ }
+ }
+
+ @Override
+ public void pause() {
+ audioHandler.pause();
+ if (playedHandlers.contains(this))
+ playedHandlers.remove(this);
+ }
+
+ @Override
+ public void stop() {
+ audioHandler.stop();
+ if (playedHandlers.contains(this))
+ playedHandlers.remove(this);
+ }
+
+ @Override
+ public void seekToStart() {
+ audioHandler.seek(0);
+ }
+
+ @Override
+ public Duration getPosition() {
+ return positionProperty.get();
+ }
+
+ @Override
+ public ReadOnlyObjectProperty<Duration> positionProperty() {
+ return positionProperty;
+ }
+
+ @Override
+ public Duration getDuration() {
+ return durationProperty.get();
+ }
+
+ @Override
+ public ReadOnlyObjectProperty<Duration> durationProperty() {
+ return durationProperty;
+ }
+
+ @Override
+ public void setVolume(double volume) {
+ if (audioHandler != null) {
+ audioHandler.setVolume((float) volume);
+ }
+ }
+
+ @Override
+ public boolean isMediaLoaded() {
+ return audioHandler != null;
+ }
+
+ @Override
+ public void loadMedia(Path[] paths) {
+ if (audioHandler == null)
+ audioHandler = new NativeAudio();
+ audioHandler.load(paths[0].toString());
+
+ String name = (String) Profile.currentProfile().getProfileSettings().getAudioUserInfo().get(NativeAudioWinHandler.SOUND_CARD);
+ audioHandler.setDevice(name);
+
+ Platform.runLater(() ->
+ {
+ durationProperty.set(Duration.millis(audioHandler.getDuration()));
+ getContent().getPad().setStatus(PadStatus.READY);
+ if (getContent().getPad().isPadVisible()) {
+ getContent().getPad().getController().getView().showBusyView(false);
+ }
+ });
+ }
+
+ @Override
+ public void unloadMedia() {
+ if (audioHandler != null) {
+ audioHandler.unload();
+ audioHandler = null;
+ }
+ }
+
+ @Override
+ public void setOutputDevice(String name) {
+ audioHandler.setDevice(name);
+ }
+
+}
diff --git a/PluginNativeAudio/src/de/tobias/playpad/audio/windows/NativeAudioWinHandlerFactory.java b/PluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandlerFactory.java
similarity index 96%
rename from PluginNativeAudio/src/de/tobias/playpad/audio/windows/NativeAudioWinHandlerFactory.java
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandlerFactory.java
index 5a05742b2dfbbdd64e9887cf4603417390e33a7b..2b6d098641335918c5453cc51f1bc2cfbb04b495 100644
--- a/PluginNativeAudio/src/de/tobias/playpad/audio/windows/NativeAudioWinHandlerFactory.java
+++ b/PluginNativeAudio/src/main/java/de/tobias/playpad/audio/windows/NativeAudioWinHandlerFactory.java
@@ -1,36 +1,36 @@
-package de.tobias.playpad.audio.windows;
-
-import de.tobias.playpad.audio.AudioCapability;
-import de.tobias.playpad.audio.AudioHandler;
-import de.tobias.playpad.audio.AudioHandlerFactory;
-import de.tobias.playpad.pad.content.PadContent;
-import de.tobias.playpad.viewcontroller.AudioHandlerViewController;
-
-public class NativeAudioWinHandlerFactory extends AudioHandlerFactory {
-
- public NativeAudioWinHandlerFactory(String type) {
- super(type);
- }
-
- @Override
- public AudioHandler createAudioHandler(PadContent content) {
- return new NativeAudioWinHandler(content);
- }
-
- @Override
- public boolean isFeatureAvailable(AudioCapability audioCapability) {
- for (Class<?> clazz : NativeAudioWinHandler.class.getInterfaces()) {
- if (clazz.equals(audioCapability.getAudioFeature()))
- return true;
- }
- return false;
- }
-
- @Override
- public AudioHandlerViewController getAudioFeatureSettings(AudioCapability audioCapablility) {
- if (audioCapablility == AudioCapability.SOUNDCARD) {
- return new NativeAudioSettingsViewController();
- }
- return null;
- }
-}
+package de.tobias.playpad.audio.windows;
+
+import de.tobias.playpad.audio.AudioCapability;
+import de.tobias.playpad.audio.AudioHandler;
+import de.tobias.playpad.audio.AudioHandlerFactory;
+import de.tobias.playpad.pad.content.PadContent;
+import de.tobias.playpad.viewcontroller.AudioHandlerViewController;
+
+public class NativeAudioWinHandlerFactory extends AudioHandlerFactory {
+
+ public NativeAudioWinHandlerFactory(String type) {
+ super(type);
+ }
+
+ @Override
+ public AudioHandler createAudioHandler(PadContent content) {
+ return new NativeAudioWinHandler(content);
+ }
+
+ @Override
+ public boolean isFeatureAvailable(AudioCapability audioCapability) {
+ for (Class<?> clazz : NativeAudioWinHandler.class.getInterfaces()) {
+ if (clazz.equals(audioCapability.getAudioFeature()))
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public AudioHandlerViewController getAudioFeatureSettings(AudioCapability audioCapablility) {
+ if (audioCapablility == AudioCapability.SOUNDCARD) {
+ return new NativeAudioSettingsViewController();
+ }
+ return null;
+ }
+}
diff --git a/PluginNativeAudio/src/de/tobias/playpad/plugin/NativeAudioPlugin.scala b/PluginNativeAudio/src/main/java/de/tobias/playpad/plugin/NativeAudioPlugin.scala
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/plugin/NativeAudioPlugin.scala
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/plugin/NativeAudioPlugin.scala
diff --git a/PluginNativeAudio/src/de/tobias/playpad/plugin/NativeAudioPluginImpl.scala b/PluginNativeAudio/src/main/java/de/tobias/playpad/plugin/NativeAudioPluginImpl.scala
similarity index 96%
rename from PluginNativeAudio/src/de/tobias/playpad/plugin/NativeAudioPluginImpl.scala
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/plugin/NativeAudioPluginImpl.scala
index 25fb4838a9e09ead9a13695f9b7cc854dcb08f0a..87941e7c1bd70d5d33cbff3b3b06011959166fa2 100644
--- a/PluginNativeAudio/src/de/tobias/playpad/plugin/NativeAudioPluginImpl.scala
+++ b/PluginNativeAudio/src/main/java/de/tobias/playpad/plugin/NativeAudioPluginImpl.scala
@@ -7,8 +7,6 @@ import de.tobias.utils.util.OS.OSType
import net.xeoh.plugins.base.annotations.PluginImplementation
import net.xeoh.plugins.base.annotations.events.PluginLoaded
-import scala.reflect.api.StandardDefinitions
-
/**
* Created by tobias on 16.04.17.
*/
diff --git a/PluginNativeAudio/src/de/tobias/playpad/plugin/loader/AudioImplLoader.scala b/PluginNativeAudio/src/main/java/de/tobias/playpad/plugin/loader/AudioImplLoader.scala
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/plugin/loader/AudioImplLoader.scala
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/plugin/loader/AudioImplLoader.scala
diff --git a/PluginNativeAudio/src/de/tobias/playpad/plugin/loader/MacAudioImplLoader.scala b/PluginNativeAudio/src/main/java/de/tobias/playpad/plugin/loader/MacAudioImplLoader.scala
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/plugin/loader/MacAudioImplLoader.scala
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/plugin/loader/MacAudioImplLoader.scala
diff --git a/PluginNativeAudio/src/de/tobias/playpad/plugin/loader/WindowsAudioImplLoader.scala b/PluginNativeAudio/src/main/java/de/tobias/playpad/plugin/loader/WindowsAudioImplLoader.scala
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/plugin/loader/WindowsAudioImplLoader.scala
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/plugin/loader/WindowsAudioImplLoader.scala
diff --git a/PluginNativeAudio/src/de/tobias/playpad/view/WaveformView.java b/PluginNativeAudio/src/main/java/de/tobias/playpad/view/WaveformView.java
similarity index 100%
rename from PluginNativeAudio/src/de/tobias/playpad/view/WaveformView.java
rename to PluginNativeAudio/src/main/java/de/tobias/playpad/view/WaveformView.java
diff --git a/PluginNativeAudio/src/de_tobias_playpad_NativeAudio.h b/PluginNativeAudio/src/main/java/de_tobias_playpad_NativeAudio.h
similarity index 100%
rename from PluginNativeAudio/src/de_tobias_playpad_NativeAudio.h
rename to PluginNativeAudio/src/main/java/de_tobias_playpad_NativeAudio.h
diff --git a/PluginNativeAudio/src/de_tobias_playpad_Waveform.h b/PluginNativeAudio/src/main/java/de_tobias_playpad_Waveform.h
similarity index 100%
rename from PluginNativeAudio/src/de_tobias_playpad_Waveform.h
rename to PluginNativeAudio/src/main/java/de_tobias_playpad_Waveform.h