Merge pull request #159 from klassenserver7b/Development

Development
klassenserver7b · Oct 7, 2024 · 9ebc650 · 9ebc650
2 parents 32a903a + ebda9c1
commit 9ebc650
Show file tree

Hide file tree

Showing 19 changed files with 246 additions and 253 deletions.
diff --git a/.classpath b/.classpath
@@ -28,7 +28,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
-			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -21,15 +21,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'zulu'
         cache: maven
     - name: Compile with Maven
       run: mvn -B compile
 
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
     - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@bfd2106013da0957cdede0b6c39fb5ca25ae375e
+      uses: advanced-security/maven-dependency-submission-action@4f64ddab9d742a4806eeb588d238e4c311a8397d
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -30,16 +30,16 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'zulu'
         cache: maven
     - name: Build site with Maven
       run: mvn site
     - name: Setup Pages
-      uses: actions/configure-pages@v4
+      uses: actions/configure-pages@v5
     - name: Upload artifact
       uses: actions/upload-pages-artifact@v2
       with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'zulu'
         cache: maven
     - name: Build with Maven

diff --git a/.github/workflows/tag_release.yml b/.github/workflows/tag_release.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'zulu'
         cache: maven
     - name: Build with Maven

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 
 	<groupId>de.klassenserver7b</groupId>
 	<artifactId>danceinterpreter</artifactId>
-	<version>3.10.0</version>
+	<version>3.10.1</version>
 
 	<name>DanceInterpreter</name>
 	<organization>
@@ -20,8 +20,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 	</properties>
 
 	<licenses>
@@ -38,7 +38,7 @@
 				<inherited>true</inherited>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
-				<version>3.4.1</version>
+				<version>3.5.0</version>
 				<executions>
 					<execution>
 						<id>enforce-maven-3</id>
@@ -60,13 +60,13 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.16.2</version>
+				<version>2.17.1</version>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.7.0</version>
+				<version>3.7.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -95,26 +95,23 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>4.0.0-M13</version>
+				<version>4.0.0-M16</version>
 				<configuration>
 					<outputDirectory>${project.build.directory}/mvn-site</outputDirectory>
 				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
-				<version>3.3.2</version>
+				<version>3.4.0</version>
 			</plugin>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.12.1</version>
-				<configuration>
-					<release>17</release>
-				</configuration>
+				<version>3.13.0</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.6.3</version>
+				<version>3.10.1</version>
 				<configuration>
 					<show>private</show>
 					<doclint>all,-missing</doclint>
@@ -123,18 +120,18 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.4.2</version>
 				<executions>
 					<execution>
 						<id>default-jar</id>
-						<phase />
+						<phase>none</phase>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
 				<groupId>de.dentrassi.maven</groupId>
 				<artifactId>rpm</artifactId>
-				<version>1.12.0</version>
+				<version>1.13.0</version>
 				<executions>
 					<execution>
 						<phase>install</phase>
@@ -148,6 +145,7 @@
 							<signature>
 								<keyId>5CE28D6E4C26965B</keyId>
 								<keyringFile>${user.home}/.gnupg/pubring.kbx</keyringFile>
+								<!--suppress UnresolvedMavenProperty -->
 								<passphrase>${gpg.passphrase}</passphrase>
 								<hashAlgorithm>SHA256</hashAlgorithm>
 								<skip>true</skip>
@@ -200,7 +198,7 @@
 			<plugin>
 				<groupId>org.vafer</groupId>
 				<artifactId>jdeb</artifactId>
-				<version>1.10</version>
+				<version>1.11</version>
 				<executions>
 					<execution>
 						<phase>install</phase>
@@ -260,7 +258,7 @@
 			<plugin>
 				<groupId>com.akathist.maven.plugins.launch4j</groupId>
 				<artifactId>launch4j-maven-plugin</artifactId>
-				<version>2.5.0</version>
+				<version>2.5.2</version>
 				<executions>
 					<execution>
 						<id>danceinterpreter-exe</id>
@@ -286,12 +284,14 @@
 								<fileVersion>${project.version}.0</fileVersion>
 								<txtFileVersion>txt file version</txtFileVersion>
 								<fileDescription>${project.name}</fileDescription>
+								<!--suppress UnresolvedMavenProperty -->
 								<copyright>${publisher}</copyright>
 								<productVersion>${project.version}.0</productVersion>
 								<txtProductVersion>
 									${project.description}</txtProductVersion>
 								<productName>${project.name}</productName>
 								<internalName>${project.artifactId}</internalName>
+								<!--suppress UnresolvedMavenProperty -->
 								<originalFilename>
 									${launch4j.starterName}</originalFilename>
 							</versionInfo>
@@ -307,12 +307,12 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<version>3.5.0</version>
+				<version>3.7.0</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.6.3</version>
+				<version>3.10.1</version>
 				<configuration>
 					<show>private</show>
 					<doclint>all,-missing</doclint>
@@ -321,7 +321,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.16.2</version>
+				<version>2.17.1</version>
 				<reportSets>
 					<reportSet>
 						<reports>
@@ -336,12 +336,12 @@
 	</reporting>
 
 
-	<repositories></repositories>
+	<repositories/>
 	<dependencies>
 		<dependency>
 			<groupId>se.michaelthelin.spotify</groupId>
 			<artifactId>spotify-web-api-java</artifactId>
-			<version>8.3.6</version>
+			<version>8.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.mpatric</groupId>
@@ -353,7 +353,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.3.1</version>
+			<version>5.4</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -365,26 +365,30 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.5.3</version>
+			<version>1.5.8</version>
 		</dependency>
 		<dependency>
 			<groupId> com.formdev</groupId>
 			<artifactId>flatlaf</artifactId>
-			<version>3.4</version>
+			<version>3.5.1</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>2.0.12</version>
+			<version>2.0.16</version>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.2</version>
+			<groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.11.2</version>
 		</dependency>
-		<!--
-		https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-transcoder -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.14.1</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-transcoder -->
 		<dependency>
 			<groupId>org.apache.xmlgraphics</groupId>
 			<artifactId>batik-transcoder</artifactId>

diff --git a/src/main/java/de/klassenserver7b/danceinterpreter/graphics/ConfigWindow.java b/src/main/java/de/klassenserver7b/danceinterpreter/graphics/ConfigWindow.java
@@ -13,14 +13,13 @@
 import java.util.LinkedList;
 
 import javax.imageio.ImageIO;
+import javax.swing.BoxLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
-import javax.swing.JSeparator;
-import javax.swing.SwingConstants;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,7 +70,7 @@ public ConfigWindow() {
 		try {
 			BufferedImage bufferedImage = ImageIO.read(getClass().getResourceAsStream("/icon.jpg"));
 			this.mainFrame.setIconImage(bufferedImage);
-		} catch (IOException e) {
+		} catch (@SuppressWarnings("unused") IOException e) {
 			this.log.error("No Icon Found!");
 		}
 
@@ -122,16 +121,22 @@ public void updateWindow() {
 
 		} else if (this.playlistViewGen.isPlaylistViewEnabled()) {
 
-			for (JLabel label : this.playlistViewGen.loadPlaylistView()) {
-				this.mainPanel.add(label);
+			this.mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
+
+			JPanel playlistViewP = new JPanel();
+			for (JLabel pviewlabel : this.playlistViewGen.loadPlaylistView()) {
+				playlistViewP.add(pviewlabel);
 			}
+			this.mainPanel.add(playlistViewP);
 
-			this.mainPanel.add(new JSeparator(SwingConstants.HORIZONTAL));
+			JPanel staticsP = new JPanel();
 
-			for (JLabel label : this.playlistViewGen.loadStaticActionsView()) {
-				this.mainPanel.add(label);
+			for (JLabel sactionlabel : this.playlistViewGen.loadStaticActionsView()) {
+				staticsP.add(sactionlabel);
 			}
 
+			this.mainPanel.add(staticsP);
+
 		} else {
 
 			JLabel img = new JLabel();
@@ -172,7 +177,6 @@ protected void updateContextMenu() {
 		addSong.setText("Add Song");
 		addSong.addActionListener(new ActionListener() {
 
-			@SuppressWarnings("unused")
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				new SongAddPanel();
@@ -183,7 +187,6 @@ public void actionPerformed(ActionEvent e) {
 		addLabel.setText("Add Label");
 		addLabel.addActionListener(new ActionListener() {
 
-			@SuppressWarnings("unused")
 			@Override
 			public void actionPerformed(ActionEvent e) {
 				new LabelAddPanel();

diff --git a/src/main/java/de/klassenserver7b/danceinterpreter/graphics/listener/FileDropListener.java b/src/main/java/de/klassenserver7b/danceinterpreter/graphics/listener/FileDropListener.java
@@ -88,6 +88,7 @@ public void drop(DropTargetDropEvent dtde) {
 
 		} catch (UnsupportedFlavorException e) {
 			this.log.error("Drop was not a file");
+			this.log.debug(e.getMessage(), e);
 		} catch (IOException e) {
 			this.log.error(e.getMessage(), e);
 		}

diff --git a/...java/de/klassenserver7b/danceinterpreter/graphics/listener/PlaylistViewClickListener.java b/...java/de/klassenserver7b/danceinterpreter/graphics/listener/PlaylistViewClickListener.java
@@ -83,7 +83,7 @@ private ClickListenerType(int id) {
 			this.id = id;
 		}
 
-		public ClickListenerType byId(int id) {
+		public static ClickListenerType byId(int id) {
 			for (ClickListenerType t : values()) {
 				if (t.getId() == id) {
 					return t;