testdb added

src/de/fhb/projects/Twitchess/twitterbot/main/TwitterBot.java

@@ -23,14 +23,14 @@
 import twitter4j.media.ImageUploadFactory;
 import de.fhb.projects.Twitchess.controller.ManagerFactory;
 import de.fhb.projects.Twitchess.controller.ManagerInterface;
+import de.fhb.projects.Twitchess.exception.TokenNotFoundException;
 import de.fhb.projects.Twitchess.games.chess.Fen;
 import de.fhb.projects.Twitchess.image.GenerateImage;
 import de.fhb.projects.Twitchess.twitterbot.commands.Command;
-import de.fhb.projects.Twitchess.twitterbot.exceptions.TokenNotFoundException;
-import de.fhb.projects.Twitchess.twitterbot.util.Serializer;
+import de.fhb.projects.Twitchess.util.Serializer;
 
-public class TwitterBot extends Observable {
-	public final String STANDARD_ACCOUNT = getString("Twitter.StandardAccount", "MatefulBot");
+public class TwitterBot extends TwitterBotAbstract {
+
 
 	private Twitter twitter;
 	private TwitterStream twitterStream;

src/de/fhb/projects/Twitchess/twitterbot/main/TwitterView.java

@@ -6,20 +6,20 @@
 import java.util.Observable;
 import java.util.Observer;
 
+import de.fhb.projects.Twitchess.exception.TokenNotFoundException;
 import de.fhb.projects.Twitchess.twitterbot.commands.ExitCommand;
 import de.fhb.projects.Twitchess.twitterbot.commands.FollowCommand;
 import de.fhb.projects.Twitchess.twitterbot.commands.ToggleAnsweringCommand;
 import de.fhb.projects.Twitchess.twitterbot.commands.UpdateStatusCommand;
-import de.fhb.projects.Twitchess.twitterbot.exceptions.TokenNotFoundException;
 
 public class TwitterView implements Runnable, Observer {
-	private TwitterBot twitterbot;
+	private TwitterBotAbstract twitterbot;
 	private Thread thread;
 	private BufferedReader inputReader;
 	private boolean running;
 
-	public TwitterView(TwitterBot controller) {
-		this.twitterbot = controller;
+	public TwitterView(TwitterBotAbstract tb) {
+		this.twitterbot = tb;
 		inputReader = new BufferedReader(new InputStreamReader(System.in));
 		twitterbot.addObserver(this);
 		login();
@@ -87,7 +87,7 @@ public void run() {
 		}
 	}
 
-	private void processInput(String input) {
+	protected void processInput(String input) {
 		switch (getCommandNumber(input)) {
 			case 0 :
 				twitterbot.receiveCommand(new ExitCommand());
@@ -161,4 +161,13 @@ public void update(Observable observable, Object argument) {
 		else if (argument instanceof String)
 			printMessage((String) argument);
 	}
+
+	public BufferedReader getInputReader() {
+		return inputReader;
+	}
+
+	public void setInputReader(BufferedReader inputReader) {
+		this.inputReader = inputReader;
+	}
+
 }