Umbennung Deutsch --> Englisch

src/main/java/org/kryptojagd/fileprocessing/ReadJSON.java

@@ -11,10 +11,14 @@
 
 import com.google.gson.Gson;
 
+<<<<<<< HEAD:src/main/java/org/kryptojagd/fileprocessing/ReadJSON.java
 import org.kryptojagd.level.DecryptionTask;
 import org.kryptojagd.level.MultipleChoiceQuestion;
 
 public class ReadJSON {
+=======
+public class AufgabenEinlesen {
+>>>>>>> 720278078edb37aa760bdf7d21f5ca5bec41b96c:src/main/java/org/kryptojagd/dateiverarbeitung/AufgabenEinlesen.java
 
 	// gibt Mul
 	public static MultipleChoiceQuestion createMultiChoiceQuestion() {

src/main/java/org/kryptojagd/level/Level.java

@@ -7,14 +7,48 @@
 
 import java.util.LinkedList;
 
+/**
+ * The class describes a level in the game
+ *
+ * @author Sonja
+ */
 public class Level {
 
-	private LinkedList<Task> level = new LinkedList<>();
-
+	private final LinkedList<Task> level = new LinkedList<>();
+	private Task currentTask;
+
+	/**
+	 * Creates a {@link Level}
+	 *
+	 * @param decryptionTask first task in level is a decryptionTask
+	 * @param encryptionTask second task in level is a encryptionTask
+	 * @param multipleChoiceTask third and last task is a Collection of multiple choice questions
+	 */
 	public Level(DecryptionTask decryptionTask, EncryptionTask encryptionTask, MultipleChoiceTask multipleChoiceTask) {
 		level.add(decryptionTask);
 		level.add(encryptionTask);
 		level.add(multipleChoiceTask);
+		this.currentTask = level.getFirst();
+	}
+
+	/**
+	 * Gives the next Task in the chronology of the level
+	 *
+	 * @return the current task in level
+	 */
+	public Task giveNextTask() {
+		currentTask = level.iterator().next();
+		return currentTask;
+	}
+
+	/**
+	 * Checks the answer to the current task
+	 *
+	 * @param answer the answer which is given
+	 * @return trur, if the answer is correct
+	 */
+	public boolean proofCurrentTask(String answer) {
+		return currentTask.proofAnswer(answer);
 	}
 
 }

src/main/java/org/kryptojagd/level/tasks/DecryptionTask.java

@@ -2,11 +2,20 @@
 
 import org.kryptojagd.encryptionmethods.Encryption;
 
-
+/**
+ * The class describes a task, where you have to decrypt text
+ *
+ * @author Sonja
+ */
 public class DecryptionTask implements Task {
 
     private Encryption encryption;
 
+    /**
+     * Creates a {@link DecryptionTask}
+     *
+     * @param encryption the encryption, in which you have to decrypt the text
+     */
     public DecryptionTask(Encryption encryption) {
         this.encryption = encryption;
     }

src/main/java/org/kryptojagd/level/tasks/EncryptionTask.java

@@ -2,11 +2,20 @@
 
 import org.kryptojagd.encryptionmethods.Encryption;
 
-
+/**
+ * The class describes a task, where you have to encrypt text
+ *
+ * @author Sonja
+ */
 public class EncryptionTask implements Task {
 
     private Encryption encryption;
 
+    /**
+     * Creates a {@link EncryptionTask}
+     *
+     * @param encryption the encryption, in which you have to encrypt the text
+     */
     public EncryptionTask(Encryption encryption) {
         this.encryption = encryption;
     }

src/main/java/org/kryptojagd/level/tasks/MultipleChoiceTask.java

@@ -1,14 +1,40 @@
 package org.kryptojagd.level.tasks;
 
-import java.util.HashMap;
+import org.kryptojagd.level.Level;
 
+/**
+ * The class describes a task, where you have to answer multiple choice questions
+ *
+ * @author Sonja
+ */
 public class MultipleChoiceTask implements Task {
 
-    public MultipleChoiceTask(HashMap<String,Object> input) {
+    private String question;
+    private String answer;
+    private String[] possibilities;
+
+    /**
+     * Creates a {@link MultipleChoiceTask}
+     *
+     * @param question the question, which you have to answer
+     * @param answer the right answer of the question
+     * @param possibilities the possibilities to answer
+     */
+    public MultipleChoiceTask(String question, String answer, String[] possibilities) {
+        this.question = question;
+        this.answer = answer;
+        this.possibilities = possibilities;
     }
 
     @Override
     public boolean proofAnswer(String answer) {
-        return false;
+        return this.answer.equals(answer);
     }
+
+    @Override
+    public String toString() {
+        String multipleChoice = "";
+        return multipleChoice;
+    }
+
 }

src/main/java/org/kryptojagd/level/tasks/Task.java

@@ -1,7 +1,10 @@
 package org.kryptojagd.level.tasks;
 
+<<<<<<< HEAD
 import org.kryptojagd.encryptionmethods.Encryption;
 
+=======
+>>>>>>> 720278078edb37aa760bdf7d21f5ca5bec41b96c
 /**
  * The interface describes the form of a task in the game
  *

src/test/java/org/kryptojagd/level/LevelTest.java

@@ -0,0 +1,25 @@
+package org.kryptojagd.level;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.kryptojagd.level.tasks.DecryptionTask;
+import org.kryptojagd.level.tasks.EncryptionTask;
+import org.kryptojagd.level.tasks.MultipleChoiceTask;
+import org.kryptojagd.verschluesselungsverfahren.Caesar;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class LevelTest {
+
+    private DecryptionTask decryptionTask;
+    private EncryptionTask encryptionTask;
+    private MultipleChoiceTask multipleChoiceTask;
+
+    @BeforeEach
+    void setUp() {
+        decryptionTask = new DecryptionTask(new Caesar());
+        encryptionTask = new EncryptionTask(new Caesar());
+        multipleChoiceTask = new MultipleChoiceTask(null, null, null);
+    }
+
+}