From 47024a4df1d2ae292b90ff0b1e72f101962847e4 Mon Sep 17 00:00:00 2001
From: Dennis Eisold <de@itstall.de>
Date: Fri, 29 Nov 2019 10:06:39 +0100
Subject: [PATCH] Package Namen noch mal umbenannt damit die Tests wieder
 funktionieren

---
 pom.xml                                       |   4 +-
 src/main/java/{ => projekt}/enigma/App.java   |   5 +-
 .../{ => projekt}/enigma/GuiController.java   |   4 +-
 .../enigma/KenngruppeController.java          |   2 +-
 src/main/java/{ => projekt}/enigma/Main.java  |   2 +-
 .../enigma/database/DatenbankSqlite.java      |  11 ++--
 .../{ => projekt}/enigma/model/Codebuch.java  |   6 +--
 .../{ => projekt}/enigma/model/Codierer.java  |  47 ++++++++++++++++--
 .../{ => projekt}/enigma/model/Funkraum.java  |   2 +-
 .../{ => projekt}/enigma/model/Hardware.java  |   2 +-
 .../{ => projekt}/enigma/model/Morsecode.java |   2 +-
 .../{ => projekt}/enigma/model/Reflektor.java |   2 +-
 .../enigma/model/Steckbrett.java              |   2 +-
 .../{ => projekt}/enigma/model/Walze.java     |   2 +-
 .../{ => projekt}/enigma/codebuch.sqlite      | Bin
 .../resources/{ => projekt}/enigma/gui.fxml   |   2 +-
 .../{ => projekt}/enigma/kenngruppe.fxml      |   2 +-
 .../enigma/model/CodebuchTest.java            |  16 +++---
 .../enigma/model/HardwareTest.java            |   2 +-
 .../enigma/model/ReflektorTest.java           |   2 +-
 .../enigma/model/SteckbrettTest.java          |   2 +-
 .../{ => projekt}/enigma/model/WalzeTest.java |   2 +-
 22 files changed, 80 insertions(+), 41 deletions(-)
 rename src/main/java/{ => projekt}/enigma/App.java (92%)
 rename src/main/java/{ => projekt}/enigma/GuiController.java (99%)
 rename src/main/java/{ => projekt}/enigma/KenngruppeController.java (88%)
 rename src/main/java/{ => projekt}/enigma/Main.java (86%)
 rename src/main/java/{ => projekt}/enigma/database/DatenbankSqlite.java (95%)
 rename src/main/java/{ => projekt}/enigma/model/Codebuch.java (97%)
 rename src/main/java/{ => projekt}/enigma/model/Codierer.java (90%)
 rename src/main/java/{ => projekt}/enigma/model/Funkraum.java (99%)
 rename src/main/java/{ => projekt}/enigma/model/Hardware.java (99%)
 rename src/main/java/{ => projekt}/enigma/model/Morsecode.java (99%)
 rename src/main/java/{ => projekt}/enigma/model/Reflektor.java (98%)
 rename src/main/java/{ => projekt}/enigma/model/Steckbrett.java (98%)
 rename src/main/java/{ => projekt}/enigma/model/Walze.java (99%)
 rename src/main/resources/{ => projekt}/enigma/codebuch.sqlite (100%)
 rename src/main/resources/{ => projekt}/enigma/gui.fxml (99%)
 rename src/main/resources/{ => projekt}/enigma/kenngruppe.fxml (92%)
 rename src/test/java/{ => projekt}/enigma/model/CodebuchTest.java (56%)
 rename src/test/java/{ => projekt}/enigma/model/HardwareTest.java (98%)
 rename src/test/java/{ => projekt}/enigma/model/ReflektorTest.java (95%)
 rename src/test/java/{ => projekt}/enigma/model/SteckbrettTest.java (94%)
 rename src/test/java/{ => projekt}/enigma/model/WalzeTest.java (96%)

diff --git a/pom.xml b/pom.xml
index 6035d0d..680b9ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>Projektarbeit</groupId>
+    <groupId>projekt</groupId>
     <artifactId>enigma</artifactId>
     <version>0.0.1</version>
     <properties>
@@ -9,7 +9,7 @@
         <!--region[useage]-->
         <use.java.version>11</use.java.version>
         <use.javafx.version>11.0.2</use.javafx.version>
-        <use.app.main.class>${project.artifactId}.Main</use.app.main.class>
+        <use.app.main.class>${project.groupId}.${project.artifactId}.Main</use.app.main.class>
         <!--endregion[useage]-->
         <maven.compiler.source>${use.java.version}</maven.compiler.source>
         <maven.compiler.target>${use.java.version}</maven.compiler.target>
diff --git a/src/main/java/enigma/App.java b/src/main/java/projekt/enigma/App.java
similarity index 92%
rename from src/main/java/enigma/App.java
rename to src/main/java/projekt/enigma/App.java
index 7dd22d6..9475677 100644
--- a/src/main/java/enigma/App.java
+++ b/src/main/java/projekt/enigma/App.java
@@ -1,12 +1,11 @@
-package enigma;
+package projekt.enigma;
 
-import enigma.model.Codierer;
+import projekt.enigma.model.Codierer;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import org.apache.http.HttpException;
 
 import java.io.IOException;
 
diff --git a/src/main/java/enigma/GuiController.java b/src/main/java/projekt/enigma/GuiController.java
similarity index 99%
rename from src/main/java/enigma/GuiController.java
rename to src/main/java/projekt/enigma/GuiController.java
index 377cab1..7baccb4 100644
--- a/src/main/java/enigma/GuiController.java
+++ b/src/main/java/projekt/enigma/GuiController.java
@@ -1,6 +1,6 @@
-package enigma;
+package projekt.enigma;
 
-import enigma.model.Codierer;
+import projekt.enigma.model.Codierer;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
diff --git a/src/main/java/enigma/KenngruppeController.java b/src/main/java/projekt/enigma/KenngruppeController.java
similarity index 88%
rename from src/main/java/enigma/KenngruppeController.java
rename to src/main/java/projekt/enigma/KenngruppeController.java
index a1049e1..3371b0f 100644
--- a/src/main/java/enigma/KenngruppeController.java
+++ b/src/main/java/projekt/enigma/KenngruppeController.java
@@ -1,4 +1,4 @@
-package enigma;
+package projekt.enigma;
 
 import java.io.IOException;
 import javafx.fxml.FXML;
diff --git a/src/main/java/enigma/Main.java b/src/main/java/projekt/enigma/Main.java
similarity index 86%
rename from src/main/java/enigma/Main.java
rename to src/main/java/projekt/enigma/Main.java
index 22bb0df..f016016 100644
--- a/src/main/java/enigma/Main.java
+++ b/src/main/java/projekt/enigma/Main.java
@@ -1,4 +1,4 @@
-package enigma;
+package projekt.enigma;
 
 
 import java.sql.SQLException;
diff --git a/src/main/java/enigma/database/DatenbankSqlite.java b/src/main/java/projekt/enigma/database/DatenbankSqlite.java
similarity index 95%
rename from src/main/java/enigma/database/DatenbankSqlite.java
rename to src/main/java/projekt/enigma/database/DatenbankSqlite.java
index 00e88ea..401af57 100644
--- a/src/main/java/enigma/database/DatenbankSqlite.java
+++ b/src/main/java/projekt/enigma/database/DatenbankSqlite.java
@@ -1,4 +1,4 @@
-package enigma.database;
+package projekt.enigma.database;
 
 import java.sql.*;
 
@@ -40,11 +40,16 @@ public class DatenbankSqlite {
 	 * Anschließend wir eine Verbindung zur SQLite Datenbank aufgebaut und das Codebuch angefragt.
 	 * Dieses wird in ein Object vom Type Codebuch gepackt und zurück gegeben.
 	 *
-	 * TODO: Es wird kein Codebuch Objekt mehr erzeugt sondern ein String[] zurück gegeben
 	 * Hole den heutigen Eintrag aus der SQLite Datenbank und erstelle daraus ein Codebuch Objekt
 	 *
 	 * @param tag : int : Tag für welchen ein Codebuch benötigt wird.
-	 * @return Codebuch : Codebuch Object mit dem Codebuch des angefragten Tages
+	 * @return String : Die Einstellungen des angefragten Tages
+	 * <p>
+	 *     String[0] : Tag
+	 *     String[1] : Walzenlage
+	 *     String[2] : Ringstellung
+	 *     String[3] : Steckverbindung
+	 * </p>
 	 */
 	public String[] getCodebuch(int tag) {
 
diff --git a/src/main/java/enigma/model/Codebuch.java b/src/main/java/projekt/enigma/model/Codebuch.java
similarity index 97%
rename from src/main/java/enigma/model/Codebuch.java
rename to src/main/java/projekt/enigma/model/Codebuch.java
index 115ed44..aacb58c 100644
--- a/src/main/java/enigma/model/Codebuch.java
+++ b/src/main/java/projekt/enigma/model/Codebuch.java
@@ -1,6 +1,6 @@
-package enigma.model;
+package projekt.enigma.model;
 
-import enigma.database.DatenbankSqlite;
+import projekt.enigma.database.DatenbankSqlite;
 
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -55,7 +55,7 @@ public class Codebuch {
 	 * TODO: Dokumentieren
 	 * @param tag
 	 */
-	public void getTagesschluessel(int... tag) {
+	public void fetchTagesschluessel(int... tag) {
 		String[] walzenlage, ringstellung, db;
 
 		if(tag.length > 0) {
diff --git a/src/main/java/enigma/model/Codierer.java b/src/main/java/projekt/enigma/model/Codierer.java
similarity index 90%
rename from src/main/java/enigma/model/Codierer.java
rename to src/main/java/projekt/enigma/model/Codierer.java
index 8b1ff3b..bf095d7 100644
--- a/src/main/java/enigma/model/Codierer.java
+++ b/src/main/java/projekt/enigma/model/Codierer.java
@@ -1,4 +1,4 @@
-package enigma.model;
+package projekt.enigma.model;
 
 import org.apache.http.HttpException;
 
@@ -31,7 +31,7 @@ public class Codierer {
 		this.kenngruppe = "";
 		this.kenngruppeCodiert = "";
 		this.codebuch = new Codebuch();
-		this.codebuch.getTagesschluessel();
+		this.codebuch.fetchTagesschluessel();
 	}
 
 	/**
@@ -290,7 +290,7 @@ public class Codierer {
 
 		// Hardware reseten und Tageseinstellungen aus dem Codebuch laden
 		this.initialisiereHardware();
-		this.codebuch.getTagesschluessel(tag);
+		this.codebuch.fetchTagesschluessel(tag);
 
 		String[] nachricht = codierteNachricht.split(" ");
 		StringBuilder sb = new StringBuilder();
@@ -339,8 +339,47 @@ public class Codierer {
 	 * TODO: Dokumentieren
 	 */
 	public void resetHardware() {
-
 		this.initialisiereHardware();
 	}
 
+	/**
+	 * TODO: Dokumentieren
+	 *
+	 * @param walzenPosition
+	 * @param position
+	 */
+	public void setWalze(int walzenPosition, char position) {
+		this.hardware.setzePosition(walzenPosition, position);
+	}
+
+	/**
+	 * TODO: Dokumentieren
+	 *
+	 * @param walzenPosition
+	 * @param position
+	 */
+	public void setRing(int walzenPosition, int position) {
+		this.hardware.setzeRing(walzenPosition, position);
+	}
+
+	/**
+	 * TODO: Dokumentieren
+	 *
+	 * @param walzenPosition
+	 * @param walzeNr
+	 */
+	public void setWalzeNr(int walzenPosition, int walzeNr) {
+		this.hardware.setzeWalzenNr(walzenPosition, walzeNr, 1);
+	}
+
+	/**
+	 * TODO: Dokumentieren
+	 *
+	 * @param feldNr
+	 * @param verbindung
+	 */
+	public void setSteckbrett(int feldNr, String verbindung) {
+		this.hardware.getSteckbrett().setzeVertauschung(verbindung.charAt(0), verbindung.charAt(1));
+	}
+
 }
diff --git a/src/main/java/enigma/model/Funkraum.java b/src/main/java/projekt/enigma/model/Funkraum.java
similarity index 99%
rename from src/main/java/enigma/model/Funkraum.java
rename to src/main/java/projekt/enigma/model/Funkraum.java
index d3fe288..96a3a35 100644
--- a/src/main/java/enigma/model/Funkraum.java
+++ b/src/main/java/projekt/enigma/model/Funkraum.java
@@ -1,4 +1,4 @@
-package enigma.model;
+package projekt.enigma.model;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpException;
diff --git a/src/main/java/enigma/model/Hardware.java b/src/main/java/projekt/enigma/model/Hardware.java
similarity index 99%
rename from src/main/java/enigma/model/Hardware.java
rename to src/main/java/projekt/enigma/model/Hardware.java
index 1842e1e..b37ddd1 100644
--- a/src/main/java/enigma/model/Hardware.java
+++ b/src/main/java/projekt/enigma/model/Hardware.java
@@ -1,4 +1,4 @@
-package enigma.model;
+package projekt.enigma.model;
 
 /**
  * In dieser Klasse wird die Hardware zusammen gefasst.
diff --git a/src/main/java/enigma/model/Morsecode.java b/src/main/java/projekt/enigma/model/Morsecode.java
similarity index 99%
rename from src/main/java/enigma/model/Morsecode.java
rename to src/main/java/projekt/enigma/model/Morsecode.java
index 01df55d..7d99652 100644
--- a/src/main/java/enigma/model/Morsecode.java
+++ b/src/main/java/projekt/enigma/model/Morsecode.java
@@ -1,4 +1,4 @@
-package enigma.model;
+package projekt.enigma.model;
 
 import java.util.*;
 import java.util.Map.Entry;
diff --git a/src/main/java/enigma/model/Reflektor.java b/src/main/java/projekt/enigma/model/Reflektor.java
similarity index 98%
rename from src/main/java/enigma/model/Reflektor.java
rename to src/main/java/projekt/enigma/model/Reflektor.java
index 4aabb1b..ec821f3 100644
--- a/src/main/java/enigma/model/Reflektor.java
+++ b/src/main/java/projekt/enigma/model/Reflektor.java
@@ -1,4 +1,4 @@
-package enigma.model;
+package projekt.enigma.model;
 
 /**
  * Klasse Reflektor
diff --git a/src/main/java/enigma/model/Steckbrett.java b/src/main/java/projekt/enigma/model/Steckbrett.java
similarity index 98%
rename from src/main/java/enigma/model/Steckbrett.java
rename to src/main/java/projekt/enigma/model/Steckbrett.java
index 63bf834..c5e58e6 100644
--- a/src/main/java/enigma/model/Steckbrett.java
+++ b/src/main/java/projekt/enigma/model/Steckbrett.java
@@ -1,4 +1,4 @@
-package enigma.model;
+package projekt.enigma.model;
 
 /**
  *TODO: Dokumentieren
diff --git a/src/main/java/enigma/model/Walze.java b/src/main/java/projekt/enigma/model/Walze.java
similarity index 99%
rename from src/main/java/enigma/model/Walze.java
rename to src/main/java/projekt/enigma/model/Walze.java
index 42d9c87..e6da927 100644
--- a/src/main/java/enigma/model/Walze.java
+++ b/src/main/java/projekt/enigma/model/Walze.java
@@ -1,4 +1,4 @@
-package enigma.model;
+package projekt.enigma.model;
 
 /**
  * Klasse Walze
diff --git a/src/main/resources/enigma/codebuch.sqlite b/src/main/resources/projekt/enigma/codebuch.sqlite
similarity index 100%
rename from src/main/resources/enigma/codebuch.sqlite
rename to src/main/resources/projekt/enigma/codebuch.sqlite
diff --git a/src/main/resources/enigma/gui.fxml b/src/main/resources/projekt/enigma/gui.fxml
similarity index 99%
rename from src/main/resources/enigma/gui.fxml
rename to src/main/resources/projekt/enigma/gui.fxml
index fd53164..00924e8 100644
--- a/src/main/resources/enigma/gui.fxml
+++ b/src/main/resources/projekt/enigma/gui.fxml
@@ -8,7 +8,7 @@
 <?import javafx.scene.shape.Circle?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="677.0" prefWidth="967.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="enigma.GuiController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="677.0" prefWidth="967.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="projekt.enigma.GuiController">
    <children>
       <Circle fx:id="circQ" fill="#f0f3f5" layoutX="127.0" layoutY="309.0" radius="22.0" stroke="BLACK" strokeType="INSIDE" />
       <Circle fx:id="circE" fill="#f0f3f5" layoutX="315.0" layoutY="309.0" radius="22.0" stroke="BLACK" strokeType="INSIDE" />
diff --git a/src/main/resources/enigma/kenngruppe.fxml b/src/main/resources/projekt/enigma/kenngruppe.fxml
similarity index 92%
rename from src/main/resources/enigma/kenngruppe.fxml
rename to src/main/resources/projekt/enigma/kenngruppe.fxml
index 1f56aca..fff6072 100644
--- a/src/main/resources/enigma/kenngruppe.fxml
+++ b/src/main/resources/projekt/enigma/kenngruppe.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="257.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="enigma.KenngruppeController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="257.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="projekt.enigma.KenngruppeController">
    <children>
       <Label layoutX="81.0" layoutY="29.0" text="Bitte Kenngruppe eingeben!" AnchorPane.leftAnchor="70.0" AnchorPane.rightAnchor="70.0" AnchorPane.topAnchor="30.0" />
       <Button fx:id="secondaryButton" layoutX="72.0" layoutY="178.0" onAction="#switchToPrimary" text="Kenngruppe bestätigen!" AnchorPane.leftAnchor="70.0" AnchorPane.rightAnchor="70.0" AnchorPane.topAnchor="170.0" />
diff --git a/src/test/java/enigma/model/CodebuchTest.java b/src/test/java/projekt/enigma/model/CodebuchTest.java
similarity index 56%
rename from src/test/java/enigma/model/CodebuchTest.java
rename to src/test/java/projekt/enigma/model/CodebuchTest.java
index 5dd7d2e..ce7da24 100644
--- a/src/test/java/enigma/model/CodebuchTest.java
+++ b/src/test/java/projekt/enigma/model/CodebuchTest.java
@@ -1,9 +1,7 @@
-package enigma.model;
+package projekt.enigma.model;
 
-import enigma.database.DatenbankSqlite;
 import org.junit.Assert;
 import org.junit.Test;
-import java.sql.SQLException;
 
 public class CodebuchTest {
 
@@ -14,13 +12,11 @@ public class CodebuchTest {
 				"Ringstellung: 16,11,13\n" +
 				"Steckverbindung: E:U,O:H,T:Z,A:S,M:R,I:V,C:G,F:Q,B:X,Y:K\n";
 
-		try {
-			// Ausgabe auf der Konsole
-			String result = new DatenbankSqlite().getCodebuch(1).toString();
-			Assert.assertEquals(result, expected, result);
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
+		// Ausgabe auf der Konsole
+		Codebuch cb = new Codebuch();
+		cb.fetchTagesschluessel(1);
+		String result = cb.toString();
+		Assert.assertEquals(result, expected, result);
 	}
 
 	@Test
diff --git a/src/test/java/enigma/model/HardwareTest.java b/src/test/java/projekt/enigma/model/HardwareTest.java
similarity index 98%
rename from src/test/java/enigma/model/HardwareTest.java
rename to src/test/java/projekt/enigma/model/HardwareTest.java
index 5eaeec0..742e6ab 100644
--- a/src/test/java/enigma/model/HardwareTest.java
+++ b/src/test/java/projekt/enigma/model/HardwareTest.java
@@ -1,4 +1,4 @@
-package enigma.model;
+package projekt.enigma.model;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/enigma/model/ReflektorTest.java b/src/test/java/projekt/enigma/model/ReflektorTest.java
similarity index 95%
rename from src/test/java/enigma/model/ReflektorTest.java
rename to src/test/java/projekt/enigma/model/ReflektorTest.java
index 793b8cc..8cb11a9 100644
--- a/src/test/java/enigma/model/ReflektorTest.java
+++ b/src/test/java/projekt/enigma/model/ReflektorTest.java
@@ -1,4 +1,4 @@
-package enigma.model;
+package projekt.enigma.model;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/enigma/model/SteckbrettTest.java b/src/test/java/projekt/enigma/model/SteckbrettTest.java
similarity index 94%
rename from src/test/java/enigma/model/SteckbrettTest.java
rename to src/test/java/projekt/enigma/model/SteckbrettTest.java
index 0f3fedb..689b923 100644
--- a/src/test/java/enigma/model/SteckbrettTest.java
+++ b/src/test/java/projekt/enigma/model/SteckbrettTest.java
@@ -1,4 +1,4 @@
-package enigma.model;
+package projekt.enigma.model;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/enigma/model/WalzeTest.java b/src/test/java/projekt/enigma/model/WalzeTest.java
similarity index 96%
rename from src/test/java/enigma/model/WalzeTest.java
rename to src/test/java/projekt/enigma/model/WalzeTest.java
index 819a94e..354da34 100644
--- a/src/test/java/enigma/model/WalzeTest.java
+++ b/src/test/java/projekt/enigma/model/WalzeTest.java
@@ -1,4 +1,4 @@
-package enigma.model;
+package projekt.enigma.model;
 
 import org.junit.Assert;
 import org.junit.Test;
-- 
GitLab