From c5dd88940671cd3a200121d1f326870d69527bff Mon Sep 17 00:00:00 2001
From: "J. Neugebauer" <ngb@helmholtz-bi.de>
Date: Wed, 6 Jul 2022 21:27:30 +0200
Subject: [PATCH] Refactoring der Package-Struktur

---
 src/schule/ngb/zm/Zeichenmaschine.java        | 2 +-
 src/schule/ngb/zm/{ => media}/Music.java      | 5 +++--
 src/schule/ngb/zm/{ => media}/Sound.java      | 2 +-
 src/schule/ngb/zm/{ => tasks}/TaskRunner.java | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename src/schule/ngb/zm/{ => media}/Music.java (97%)
 rename src/schule/ngb/zm/{ => media}/Sound.java (99%)
 rename src/schule/ngb/zm/{ => tasks}/TaskRunner.java (98%)

diff --git a/src/schule/ngb/zm/Zeichenmaschine.java b/src/schule/ngb/zm/Zeichenmaschine.java
index bcf387f..3ca7645 100644
--- a/src/schule/ngb/zm/Zeichenmaschine.java
+++ b/src/schule/ngb/zm/Zeichenmaschine.java
@@ -1,6 +1,7 @@
 package schule.ngb.zm;
 
 import schule.ngb.zm.shapes.ShapesLayer;
+import schule.ngb.zm.tasks.TaskRunner;
 import schule.ngb.zm.util.ImageLoader;
 import schule.ngb.zm.util.Log;
 
@@ -14,7 +15,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.*;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * Hauptklasse der Zeichenmaschine.
diff --git a/src/schule/ngb/zm/Music.java b/src/schule/ngb/zm/media/Music.java
similarity index 97%
rename from src/schule/ngb/zm/Music.java
rename to src/schule/ngb/zm/media/Music.java
index e1955b2..01ae8f2 100644
--- a/src/schule/ngb/zm/Music.java
+++ b/src/schule/ngb/zm/media/Music.java
@@ -1,5 +1,6 @@
-package schule.ngb.zm;
+package schule.ngb.zm.media;
 
+import schule.ngb.zm.tasks.TaskRunner;
 import schule.ngb.zm.util.ResourceStreamProvider;
 
 import javax.sound.sampled.*;
@@ -184,7 +185,7 @@ public class Music {
 		}
 	}
 
-	//private static final Logger LOGGER = Logger.getLogger("schule.ngb.zm.Music");
+	//private static final Logger LOGGER = Logger.getLogger("schule.ngb.zm.media.Music");
 	private static final Logger LOGGER = Logger.getLogger(Music.class.getName());
 
 }
diff --git a/src/schule/ngb/zm/Sound.java b/src/schule/ngb/zm/media/Sound.java
similarity index 99%
rename from src/schule/ngb/zm/Sound.java
rename to src/schule/ngb/zm/media/Sound.java
index 8cefc3b..004207f 100644
--- a/src/schule/ngb/zm/Sound.java
+++ b/src/schule/ngb/zm/media/Sound.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm;
+package schule.ngb.zm.media;
 
 import schule.ngb.zm.util.ResourceStreamProvider;
 
diff --git a/src/schule/ngb/zm/TaskRunner.java b/src/schule/ngb/zm/tasks/TaskRunner.java
similarity index 98%
rename from src/schule/ngb/zm/TaskRunner.java
rename to src/schule/ngb/zm/tasks/TaskRunner.java
index 57a047a..340ffd1 100644
--- a/src/schule/ngb/zm/TaskRunner.java
+++ b/src/schule/ngb/zm/tasks/TaskRunner.java
@@ -1,4 +1,4 @@
-package schule.ngb.zm;
+package schule.ngb.zm.tasks;
 
 import javax.swing.*;
 import java.util.concurrent.Executors;