From 6237be844f1b47bacd85ef3386c48612846e1875 Mon Sep 17 00:00:00 2001 From: TheCodeBoat Date: Thu, 27 Jun 2013 14:30:05 +0200 Subject: [PATCH] refactor fill highscore to db --- .../shootingstars/gui/manager/HighscoreManager.java | 9 ++++++--- .../src/org/wyrez/shootingstars/states/GameState.java | 9 +-------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/manager/HighscoreManager.java b/ShootingStars/src/org/wyrez/shootingstars/gui/manager/HighscoreManager.java index 1327b4c..f5a4b9e 100644 --- a/ShootingStars/src/org/wyrez/shootingstars/gui/manager/HighscoreManager.java +++ b/ShootingStars/src/org/wyrez/shootingstars/gui/manager/HighscoreManager.java @@ -23,8 +23,10 @@ package org.wyrez.shootingstars.gui.manager; import java.sql.Connection; import java.sql.ResultSet; import java.util.*; +import org.wyrez.shootingstars.game.GameSettings; import org.wyrez.shootingstars.gui.model.Score; import org.wyrez.shootingstars.io.SQLiteConnector; +import org.wyrez.shootingstars.states.util.OptionSettings; public class HighscoreManager { @@ -50,9 +52,10 @@ public class HighscoreManager { Collections.sort(scores, scoreComparator); } - public void addScore(String songName, String name, int score) { - scores.add(new Score(songName, name, score)); - updateScoreFile(name, score, songName); + public void addScore(GameSettings gameSettings, OptionSettings optionSettings, int score) { + String songName = gameSettings.getTrackArtist() + " ~ " + gameSettings.getTrackTitle(); + scores.add(new Score(songName, optionSettings.getUsername(), score)); + updateScoreFile(optionSettings.getUsername(), score, songName); } private void loadScoreFile() { diff --git a/ShootingStars/src/org/wyrez/shootingstars/states/GameState.java b/ShootingStars/src/org/wyrez/shootingstars/states/GameState.java index 4e1e86b..e40884a 100644 --- a/ShootingStars/src/org/wyrez/shootingstars/states/GameState.java +++ b/ShootingStars/src/org/wyrez/shootingstars/states/GameState.java @@ -237,14 +237,7 @@ public class GameState extends AbstractAppState implements GameListener, ActionL } public void finished() { - String songName = settings.getTrackArtist() + " ~ " + settings.getTrackTitle(); - - if(settings.useVideo()) { - highscoreManager.addScore(songName, optionSettings.getUsername(), Integer.valueOf(player.getUserData(UserDataKeys.POINTS).toString())); - } else { - highscoreManager.addScore(songName, optionSettings.getUsername(), Integer.valueOf(player.getUserData(UserDataKeys.POINTS).toString())); - } - + highscoreManager.addScore(settings, optionSettings, Integer.valueOf(player.getUserData(UserDataKeys.POINTS).toString())); stateManager.setState(State.HIGHSCORE); }