Merge pull request #101 from MninaTB/refactor/formatierung_und_zuweisung

refactor(comments): formatierung und zuweisungen

src/Main.java

@@ -23,7 +23,7 @@
 public class Main {
 	public static void main(String[] args) {
 		String filename = "questions.json";
-		var q = new QuestionParser();
+		QuestionParser q = new QuestionParser();
 		File file = new File(filename);
 		try {
 			InputStreamReader sr = new InputStreamReader(new FileInputStream(file));
@@ -43,8 +43,9 @@ public void run() {
 				f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 				f.setSize(1280, 720);
 				f.setResizable(false);
-				// Entfernt Fensterrahmen, erst nachdem alle Exit-Buttons implementiert sind aktivieren
-				//f.setUndecorated(true);
+				// Entfernt Fensterrahmen, erst nachdem alle Exit-Buttons implementiert sind
+				// aktivieren
+				// f.setUndecorated(true);
 				f.setLocationRelativeTo(null);
 				f.setVisible(true);
 				// NOTE: vielleicht muessen wir das laden vom screen mit dem starten
@@ -64,7 +65,7 @@ public void run() {
 			System.out.print("Failed to save questions, file: ");
 			System.out.println(filename);
 			System.exit(1);
-		} 
+		}
 		System.out.println("Saved questions!");
 		System.out.println("Bye!");
 		System.exit(0);

src/controller/Category.java

@@ -68,15 +68,16 @@ public void initCategoriesCheckBoxes(Share share) {
 			if (c.toString() != "unknown" && c.toString() != "fun") {
 				JCheckBox box = this.view.initAndAddNewCategoryCheckBox(category.toString());
 				box.addItemListener(new ItemListener() {
-				    @Override
-				    public void itemStateChanged(ItemEvent e) {
-				        if(e.getStateChange() == ItemEvent.SELECTED) {
-				        	selectedCategories.add(c);
-				        } else {
-				            selectedCategories.remove(c);
-				        };
-				        updateStartButton(share);
-				    }
+					@Override
+					public void itemStateChanged(ItemEvent e) {
+						if (e.getStateChange() == ItemEvent.SELECTED) {
+							selectedCategories.add(c);
+						} else {
+							selectedCategories.remove(c);
+						}
+						;
+						updateStartButton(share);
+					}
 				});
 			}
 		}

src/controller/Game.java

@@ -38,7 +38,7 @@ public Game(Switcher s, QuestionStore store) {
 	public void init(Share share) {
 		this.share = share;
 		this.view = new view.Game();
-		
+
 		final String key = "KEY_GAME_STATE";
 		if (!share.entryExists(key)) {
 			// TODO: maybe we should allow a screen switch from
@@ -55,9 +55,9 @@ public void init(Share share) {
 			System.out.println("game: question is null");
 			System.exit(1);
 		}
-		
+
 		this.initQuestion(share);
-		
+
 		this.initHomeButton();
 		this.initTitleLabel();
 		this.initExitButton();
@@ -70,34 +70,33 @@ public void init(Share share) {
 		this.initLevelNo5Label();
 		this.initJokerButton();
 	}
-	
+
 	private void next() {
 		this.question = this.state.next();
 		this.initQuestion(this.share);
 	}
-	
+
 	private void initQuestion(Share share) {
-		
+
 		ActionListener right = new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				share.put("KEY_GAME_WIN", new Object());
 				next();
 				if (question == null) {
-					switcher.next(Screen.SCREEN_RESULT);	
+					switcher.next(Screen.SCREEN_RESULT);
 				}
 			}
 		};
-		
+
 		ActionListener wrong = new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				share.put("KEY_GAME_QUESTION", question);
 				switcher.next(Screen.SCREEN_RESULT);
 			}
 		};
 
-
 		ArrayList<String> answers = this.question.getAnswers();
-		
+
 		this.initQuestionLabel(this.question.getQuestion());
 
 		this.initCurrentCategoryLabel(this.question.getCategory().toString());
@@ -126,7 +125,7 @@ public void actionPerformed(ActionEvent e) {
 			this.initAnswerNo3Button(answers.get(2), wrong);
 			this.initAnswerNo4Button(answers.get(3), right);
 			break;
-		default:		
+		default:
 		}
 	}
 

src/controller/Options.java

@@ -103,7 +103,7 @@ public void initQuestionRows(Share share) {
 		for (Question q : this.store.getAllQuestions()) {
 			OptionsQuestionRow oqr = new OptionsQuestionRow();
 			oqr.getQuestionLabel().setText(q.getQuestion());
-			var c = q.getCategory();
+			Category c = q.getCategory();
 			if (c == null) {
 				c = new Category("unknown");
 			}

src/controller/Result.java

@@ -29,7 +29,7 @@ public Result(Switcher s, QuestionStore store) {
 	 */
 	public void init(Share share) {
 		this.view = new view.Result();
-		
+
 		Question q = (Question) share.get("KEY_GAME_QUESTION");
 		boolean win = share.get("KEY_GAME_WIN") != null;
 		this.initResultLabel(win);
@@ -43,7 +43,7 @@ public void init(Share share) {
 			this.initPlayerAnswerLeftLabel();
 			this.initPlayerAnswerRightLabel();
 			this.initCorrectAnswerLeftLabel();
-			this.initCorrectAnswerRightLabel(q.getAnswers().get(q.getSolution()));			
+			this.initCorrectAnswerRightLabel(q.getAnswers().get(q.getSolution()));
 		}
 		this.initHomeButton();
 		this.initExitButton();
@@ -57,7 +57,7 @@ public void initResultLabel(boolean win) {
 		if (win) {
 			this.view.getResultLabel().setText("Gewonnen!");
 		}
-		
+
 	}
 
 	/**

src/controller/Screen.java

@@ -6,18 +6,11 @@
  * 
  */
 public enum Screen {
-	SCREEN_START("start"),
-	SCREEN_CATEGORY("category"),
-	SCREEN_GAME("game"),
-	SCREEN_RESULT("result"),
-	SCREEN_OPTIONS("options"),
-	SCREEN_EDIT("edit"),
-	SCREEN_CREATE("create"),
-	SCREEN_EXIT("exit"),
-	;
-
+	SCREEN_START("start"), SCREEN_CATEGORY("category"), SCREEN_GAME("game"), SCREEN_RESULT("result"),
+	SCREEN_OPTIONS("options"), SCREEN_EDIT("edit"), SCREEN_CREATE("create"), SCREEN_EXIT("exit"),;
+
 	private final String text;
-	
+
 	/**
 	 * Konstruktor mit einem uebergabe Parameter
 	 * 
@@ -26,7 +19,7 @@ public enum Screen {
 	Screen(final String text) {
 		this.text = text;
 	}
-	
+
 	/**
 	 * Gibt den screen namen als string zurueck.
 	 * 

src/controller/Switcher.java

@@ -2,10 +2,8 @@
 
 /**
  * 
- * Switcher.java
- * Interface Klasse wird von Switchern implementiert.
- * Ein next() call ueberfuehrt ein Objekt in den naechsten
- * Zustand.
+ * Switcher.java Interface Klasse wird von Switchern implementiert. Ein next()
+ * call ueberfuehrt ein Objekt in den naechsten Zustand.
  * 
  */
 public interface Switcher {

src/game/MissingQuestionsException.java

@@ -3,7 +3,7 @@
 /**
  * Erstellung einer Exception, weil keine passende zur Verfuegung stand.
  */
-public class MissingQuestionsException extends Exception{
+public class MissingQuestionsException extends Exception {
 	/**
 	 * 
 	 */

src/game/MockQuestionStoreTest.java

@@ -9,14 +9,14 @@
 /**
  * Klasse wird benoetigt um eine Datenbank zu simulieren in spaeteren verlaeufen
  */
-public class MockQuestionStoreTest implements QuestionStore{
+public class MockQuestionStoreTest implements QuestionStore {
 
 	private ArrayList<Question> db;
-	
+
 	public MockQuestionStoreTest(ArrayList<Question> db) {
 		this.db = db;
 	}
-	
+
 	@Override
 	public ArrayList<Question> getAllQuestions() {
 		// NOTE: unused
@@ -49,7 +49,7 @@ public ArrayList<Question> getByCategory(Category c) {
 	@Override
 	public void create(Question q) {
 		// NOTE: unused
-		
+
 	}
 
 	@Override
@@ -67,5 +67,5 @@ public ArrayList<Category> getCategories() {
 		// TODO Auto-generated method stub
 		return null;
 	}
-	
+
 }

src/game/State.java

@@ -15,6 +15,7 @@ public class State {
 
 	/**
 	 * Konstruktor mit zwei uebergabe Parametern
+	 * 
 	 * @param questions
 	 * @param levelfk
 	 */
@@ -28,6 +29,7 @@ public State(ArrayList<Question> questions, int levelfk) {
 
 	/**
 	 * Wenn eine Question beantwortet wurde, dann gehe zur naechsten
+	 * 
 	 * @return q
 	 */
 	public Question next() {
@@ -41,6 +43,7 @@ public Question next() {
 
 	/**
 	 * Methode sagt aus in welchem Level man momentan ist
+	 * 
 	 * @return
 	 */
 	public int getLevel() {

src/game/StateBuilder.java

@@ -108,11 +108,11 @@ private ArrayList<Question> limitQuestions(ArrayList<Question> input, int levelf
 			counter++;
 			result.add(input.get(i));
 		}
-		
-		if (result.size() < (levelMax-customLevel)*levelfk) {
+
+		if (result.size() < (levelMax - customLevel) * levelfk) {
 			throw new MissingQuestionsException();
 		}
-		
+
 		return result;
 	}
 }

src/game/StateTest.java

@@ -38,7 +38,7 @@ void tearDown() throws Exception {
 	final void testNext() {
 		State s = new State(new ArrayList<Question>(), 0);
 		assertNull(s.next());
-		
+
 		ArrayList<Question> questions = new ArrayList<Question>();
 		Category category = new Category("Test Kategory");
 		Question q1 = new Question(1, "wer", 2, null, 0, category);
@@ -65,7 +65,7 @@ final void testGetLevel() {
 		questions.add(q4);
 		State s = new State(questions, 2);
 		assertEquals(1, s.getLevel());
-		
+
 		s.next();
 		s.next();
 		assertEquals(2, s.getLevel());

src/model/Category.java

@@ -1,20 +1,20 @@
 package model;
 
 /**
- * Enum "Category" fuer die verschiedenen Kategorien
- * welche wir fuer die Fragen benutzen wollen
+ * Enum "Category" fuer die verschiedenen Kategorien welche wir fuer die Fragen
+ * benutzen wollen
  * 
  */
 
 public class Category {
-	
+
 	private final String text;
-	
+
 	public Category(final String text) {
-		
+
 		this.text = text;
 	}
-	
+
 	public String toString() {
 		return this.text;
 	}

src/model/Question.java

@@ -35,7 +35,7 @@ public int getID() {
 		return id;
 	}
 
-	public void setID(int id) {		
+	public void setID(int id) {
 		this.id = id;
 	}