Moved SongHandler

control/GameStateManager.java

@@ -4,7 +4,6 @@ import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 
-import model.SongHandler;
 import model.gameState.EndState;
 import model.gameState.GameState;
 import model.gameState.HelpState;

control/SongHandler.java

@@ -1,4 +1,4 @@
-package model;
+package control;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -46,9 +46,9 @@ public class SongHandler {
 		
 		songs = DirScanner.scanDirectories(dir);
 		
-		sql.update(songs);
+		//sql.update(songs);
 		
-		sort(new SortPLAYED());
+		//sort(new SortPLAYED());
 		
 		updatePlayer();
 	}

main/Window.java

@@ -11,11 +11,11 @@ import java.awt.image.BufferedImage;
 import javax.swing.JFrame;
 
 import model.GameModel;
-import model.SongHandler;
 import view.GameView;
 import control.GameControl;
 import control.GameStateManager;
 import control.NetworkHandler;
+import control.SongHandler;
 import control.button.ButtonHandler;
 import control.joystick.JoystickHandler;
 import data.io.SQLConnector;

model/gameState/EndState.java

@@ -12,13 +12,13 @@ import java.awt.image.VolatileImage;
 import java.io.IOException;
 
 import model.GameModel;
-import model.SongHandler;
 import model.objects.InfoPanel;
 import model.objects.highscore.HighscoreName;
 
 import com.google.zxing.WriterException;
 
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
 import control.button.ButtonHandler;

model/gameState/GameState.java

@@ -2,8 +2,8 @@ package model.gameState;
 
 import java.awt.Graphics2D;
 
-import model.SongHandler;
 import control.GameStateManager;
+import control.SongHandler;
 import control.button.ButtonEvent;
 import control.joystick.JoystickEvent;
 import data.io.SQLConnector;

model/gameState/HelpState.java

@@ -11,8 +11,8 @@ import java.awt.image.BufferedImage;
 import java.awt.image.VolatileImage;
 
 import model.GameModel;
-import model.SongHandler;
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
 import control.button.ButtonHandler;

model/gameState/MenuState.java

@@ -17,7 +17,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import model.GameModel;
-import model.SongHandler;
 import model.objects.DifficultyButton;
 import model.objects.MenuButton;
 import model.objects.highscore.Highscore;
@@ -28,6 +27,7 @@ import audio.sorting.SortAUTHOR;
 import audio.sorting.SortPLAYED;
 import audio.sorting.SortSCORE;
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
 import control.button.ButtonHandler;

model/gameState/PlayState.java

@@ -7,7 +7,6 @@ import java.awt.Stroke;
 import java.awt.geom.Rectangle2D;
 import java.util.Iterator;
 
-import model.SongHandler;
 import model.drawObjects.Enemy;
 import model.drawObjects.Player;
 import model.objects.InfoPanel;
@@ -17,6 +16,7 @@ import model.objects.highscore.Highscore;
 import audio.ButtonInstance;
 import audio.ObjectInstance;
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.Button;
 import control.button.ButtonEvent;

model/gameState/PreGameState.java

@@ -8,8 +8,8 @@ import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 
-import model.SongHandler;
 import control.GameStateManager;
+import control.SongHandler;
 import control.button.ButtonEvent;
 import control.joystick.JoystickEvent;
 import data.io.SQLConnector;

model/gameState/TitleState.java

@@ -12,8 +12,8 @@ import java.awt.Transparency;
 import java.awt.image.BufferedImage;
 import java.awt.image.VolatileImage;
 
-import model.SongHandler;
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
 import control.joystick.JoystickEvent;

model/objects/InfoPanel.java

@@ -11,9 +11,9 @@ import java.awt.Transparency;
 import java.awt.geom.Ellipse2D;
 import java.awt.image.VolatileImage;
 
+import control.SongHandler;
 import control.button.ButtonHandler;
 import main.Window;
-import model.SongHandler;
 import model.gameState.PlayState;
 
 public class InfoPanel {