diff --git a/pom.xml b/pom.xml
index 6035d0d533e8fbf2fb4c5162451d781cb11c4989..680b9ad5b923a384115bb376c477879ec0abd7d2 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 93%
rename from src/main/java/enigma/App.java
rename to src/main/java/projekt/enigma/App.java
index 5d078d0fa9d532dec6b8ea972abe90408a6b69ca..e79cc92af33f37660507d02f94e7f6fe348f770f 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 97de4806560fcc0ac3fbb247dcdb50376eaf5e01..f1a209c4842352bd3ba4e5af97be1e944fb2551b 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 a1049e199af8e9f5f698d8a4acb6f8b673fa076c..3371b0f647ea6f27a72082ae0f18a44b79faf489 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 22bb0df9e78ca242102994c499a059a629b4c57a..f016016d5dd3ebc14cae30918487a14eec35ac8e 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 00e88ea8e5293d287074570f9f020d161fea6c76..401af573f4c4c30bd1e8e04c18ca79f647348cb0 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 115ed442dfbebc191cbe532998cfa47833987acf..aacb58c97a1dfad19a89cd97cb8fe963aecf5371 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 8b1ff3bb4ba9a89def61d34a21be45df40f9d748..bf095d794970221c3d89fb3e452823807ca645a0 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 d3fe2883fd86fb468ce832cfd64cf460176b6a99..96a3a35b3fa9391afad8d5193ff4923bb368c391 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 1842e1e6725e2cf6c1aa669db1a9e85ac6b6d818..b37ddd166c98d2274e0722e401418c81d354bc16 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 01df55dcd0c655202208e050cf11cb4d75af4971..7d99652547325b95631bb82dc8216ff4bdf5bc25 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 4aabb1b6841b475125ee7fd8c5df1feb0a158f86..ec821f3b09aea45cfe0d3ebfdc1f57283f7497d6 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 63bf834938258d61db0c6dfa2e555ce1ec2c20e4..c5e58e67b5ea6a9e146edf5fb30cfc82b3cb84b0 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 42d9c8715a3ce319622489b3fa98bfadcc83dc4e..e6da927da669c5ba8a31d1709d802d46f50d81c0 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 32d90e59765987fa30ac32353d1ad2069c58e295..6e7793b2ec24cf48079c1078ed642c50ce5aa9cb 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 2494b0530fec509d2a3807969c43ca299537588c..9fdf84fcf078371cdbd282413287ab8a60150aed 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?>
<?import javafx.scene.layout.Pane?>
-<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!" />
<Button fx:id="secondaryButton" layoutX="72.0" layoutY="178.0" onAction="#switchToPrimary" text="Kenngruppe bestätigen!" />
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 5dd7d2ed0157a2ce26dbea07d991b90065608785..ce7da24a9153fcda79ae1811ac3759e58327a21a 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 5eaeec04b8fc5e4b8fdcf726e901998350f04e31..742e6aba1b8679f81f8729a183fc7dd377616aa9 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 793b8cc987f4eabdeda5b27b6e363b5157add7d4..8cb11a94b3c94191e9d0cdec15ddfbf97f5d27ea 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 0f3fedb099afdc45ce8b57c766dabefd577dff3c..689b923f05fa2261a0b75ce33b9905221eb3fac6 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 94%
rename from src/test/java/enigma/model/WalzeTest.java
rename to src/test/java/projekt/enigma/model/WalzeTest.java
index 819a94e25da96eafaa0e47901ca0a1be22ad12cc..7a898dd9c28224efe22df8d49726af786ed9e3db 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;
@@ -23,7 +23,7 @@ public class WalzeTest {
}
@Test
- public void walzenPoition() {
+ public void getAnzeige() {
Walze w = new Walze(1, 1);
char temp = w.getAnzeige();
Assert.assertEquals('A', temp);