diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index ef50131..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1604858401120
-
-
- 1604858401120
-
-
- 1604874532810
-
-
-
- 1604874532810
-
-
- 1604908336396
-
-
-
- 1604908336396
-
-
- 1604908350915
-
-
-
- 1604908350915
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/out/production/JAVA-Aufgaben/com/company/AnalogUhr.class b/out/production/JAVA-Aufgaben/com/company/AnalogUhr.class
deleted file mode 100644
index 19849ae..0000000
Binary files a/out/production/JAVA-Aufgaben/com/company/AnalogUhr.class and /dev/null differ
diff --git a/out/production/JAVA-Aufgaben/com/company/Main.class b/out/production/JAVA-Aufgaben/com/company/Main.class
deleted file mode 100644
index f47093f..0000000
Binary files a/out/production/JAVA-Aufgaben/com/company/Main.class and /dev/null differ
diff --git a/out/production/JAVA-Aufgaben/com/company/Rotieren.class b/out/production/JAVA-Aufgaben/com/company/Rotieren.class
deleted file mode 100644
index 6531125..0000000
Binary files a/out/production/JAVA-Aufgaben/com/company/Rotieren.class and /dev/null differ
diff --git a/out/production/JAVA-Aufgaben/com/company/addierenZwierGanzzahlen.class b/out/production/JAVA-Aufgaben/com/company/addierenZwierGanzzahlen.class
deleted file mode 100644
index 9e49a39..0000000
Binary files a/out/production/JAVA-Aufgaben/com/company/addierenZwierGanzzahlen.class and /dev/null differ
diff --git a/src/com/company/HealthKlasse.java b/src/com/company/bmi/HealthKlasse.java
similarity index 95%
rename from src/com/company/HealthKlasse.java
rename to src/com/company/bmi/HealthKlasse.java
index 2d6c37d..2f554ba 100644
--- a/src/com/company/HealthKlasse.java
+++ b/src/com/company/bmi/HealthKlasse.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.bmi;
public class HealthKlasse {
diff --git a/src/com/company/bmiEingabe.java b/src/com/company/bmi/bmiEingabe.java
similarity index 97%
rename from src/com/company/bmiEingabe.java
rename to src/com/company/bmi/bmiEingabe.java
index 346e833..9bf70dd 100644
--- a/src/com/company/bmiEingabe.java
+++ b/src/com/company/bmi/bmiEingabe.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.bmi;
import java.util.Scanner;
diff --git a/src/com/company/Fernbedinung.java b/src/com/company/fernbedinung/Fernbedinung.java
similarity index 77%
rename from src/com/company/Fernbedinung.java
rename to src/com/company/fernbedinung/Fernbedinung.java
index db9ef43..0f3220f 100644
--- a/src/com/company/Fernbedinung.java
+++ b/src/com/company/fernbedinung/Fernbedinung.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.fernbedinung;
import java.util.Scanner;
@@ -32,13 +32,13 @@ public class Fernbedinung {
senderPosition = sA.senderWechsel("DOWN", senderPosition);
System.out.println(senderPosition);
}
- if (programmAuswahl.equals("rename")) {
- System.out.println("Welcher Name soll der Sender haben? ");
- String neuerSenderName = scanner.nextLine().replace("-", "");
- sA.nameSpeichern(senderPosition, neuerSenderName);
- System.out.println("Neur Name lautet: "+neuerSenderName);
- }
if (programmAuswahl.equals("name")) {
+ if (programmAuswahl.equals("rename")) {
+ System.out.println("Welcher Name soll der Sender haben? ");
+ String neuerSenderName = scanner.nextLine().replace("-", "");
+ sA.nameSpeichern(senderPosition, neuerSenderName);
+ System.out.println("Neur Name lautet: "+neuerSenderName);
+ }
System.out.println(sA.nameAusgeben(senderPosition));
}
if (programmAuswahl.equals("x")) {
diff --git a/src/com/company/senderAuswahl.java b/src/com/company/fernbedinung/senderAuswahl.java
similarity index 96%
rename from src/com/company/senderAuswahl.java
rename to src/com/company/fernbedinung/senderAuswahl.java
index a7b2ce8..b90c69a 100644
--- a/src/com/company/senderAuswahl.java
+++ b/src/com/company/fernbedinung/senderAuswahl.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.fernbedinung;
public class senderAuswahl {
diff --git a/src/com/company/AnalogUhr.java b/src/com/company/jvaBasics/AnalogUhr.java
similarity index 94%
rename from src/com/company/AnalogUhr.java
rename to src/com/company/jvaBasics/AnalogUhr.java
index bfe63d9..52d321e 100644
--- a/src/com/company/AnalogUhr.java
+++ b/src/com/company/jvaBasics/AnalogUhr.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.jvaBasics;
public class AnalogUhr {
diff --git a/src/com/company/Main.java b/src/com/company/jvaBasics/Main.java
similarity index 96%
rename from src/com/company/Main.java
rename to src/com/company/jvaBasics/Main.java
index 18f7ce2..b5d7af7 100644
--- a/src/com/company/Main.java
+++ b/src/com/company/jvaBasics/Main.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.jvaBasics;
public class Main {
diff --git a/src/com/company/Rotieren.java b/src/com/company/jvaBasics/Rotieren.java
similarity index 96%
rename from src/com/company/Rotieren.java
rename to src/com/company/jvaBasics/Rotieren.java
index c41bb03..5974be3 100644
--- a/src/com/company/Rotieren.java
+++ b/src/com/company/jvaBasics/Rotieren.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.jvaBasics;
public class Rotieren {
diff --git a/src/com/company/addierenZwierGanzzahlen.java b/src/com/company/jvaBasics/addierenZwierGanzzahlen.java
similarity index 90%
rename from src/com/company/addierenZwierGanzzahlen.java
rename to src/com/company/jvaBasics/addierenZwierGanzzahlen.java
index b046c8d..6fe66dd 100644
--- a/src/com/company/addierenZwierGanzzahlen.java
+++ b/src/com/company/jvaBasics/addierenZwierGanzzahlen.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.jvaBasics;
public class addierenZwierGanzzahlen {
diff --git a/src/com/company/MultiplicationQuiz.java b/src/com/company/kopffitness/MultiplicationQuiz.java
similarity index 93%
rename from src/com/company/MultiplicationQuiz.java
rename to src/com/company/kopffitness/MultiplicationQuiz.java
index f24dacd..e52a5bd 100644
--- a/src/com/company/MultiplicationQuiz.java
+++ b/src/com/company/kopffitness/MultiplicationQuiz.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.kopffitness;
import java.util.concurrent.ThreadLocalRandom;
diff --git a/src/com/company/mainAusgabe.java b/src/com/company/kopffitness/mainAusgabe.java
similarity index 96%
rename from src/com/company/mainAusgabe.java
rename to src/com/company/kopffitness/mainAusgabe.java
index d00c674..751efa0 100644
--- a/src/com/company/mainAusgabe.java
+++ b/src/com/company/kopffitness/mainAusgabe.java
@@ -1,4 +1,5 @@
-package com.company;
+package com.company.kopffitness;
+
import java.util.Scanner;
public class mainAusgabe {
diff --git a/src/com/company/passwort/Password.java b/src/com/company/passwort/Password.java
new file mode 100644
index 0000000..d55b167
--- /dev/null
+++ b/src/com/company/passwort/Password.java
@@ -0,0 +1,79 @@
+package com.company.passwort;
+
+public class Password {
+
+ private char[] passwordaktuell;
+
+ public Password(char[] passwordAktuell) {
+ this.passwordaktuell = passwordAktuell;
+ }
+
+ boolean isStrong(String password) {
+ // Enthält mindestens acht Zeichen
+ if (password.length() < 8) {
+ return false;
+ }
+ // Zähle einzelne Zeichentypen
+ int lowercase = 0;
+ int uppercase = 0;
+ int number = 0;
+ int special = 0;
+ // Gehe String durch
+ for (int i = 0; i < password.length(); i++) {
+ char c = password.charAt(i);
+ // Bestimme Character-Code
+ int charCode = charToNumber(c);
+ // ist ein Kleinbuchstabe
+ if (charCode >= charToNumber('a') && charCode <= charToNumber('z'))
+ lowercase += 1;
+ // ist ein Großbuchstabe
+ else if (charCode >= charToNumber('A') && charCode <= charToNumber('Z'))
+ uppercase += 1;
+ // ist eine Ziffer
+ else if (charCode >= charToNumber('0') && charCode <= charToNumber('9'))
+ number += 1;
+ // ist ein Sonderzeichen (! oder *)
+ else if (charCode == charToNumber('!') || charCode == charToNumber('*'))
+ special += 1;
+ }
+ // Sind alle Zeichen gezählt, werte aus
+ // Gebe true zurück, wenn alle Bedingungen erfüllt sind
+ if (lowercase > 0 && uppercase > 0 && number > 0 && special > 0) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ // Funktion zum Konvertieren eines Buchstabens in Character-Code. Die
+ // Funktion erhält das Zeichen, für den der Code zurückgeliefert wird.
+ int charToNumber(char c) {
+ return (int) c;
+ }
+
+ public boolean isCorrect(char[] passwordEingabe){
+ if(passwordEingabe.equals(passwordaktuell)){
+ return true;
+ } else{
+ return false;
+ }
+ }
+
+ public boolean changePassword(char[] passwordOld, char[] passwordNew){
+ if(isCorrect(passwordOld)){
+ if(isStrong(String.valueOf(passwordNew))){
+ return true;
+ }else{
+ return false;
+ }
+ }else{
+ return false;
+ }
+ }
+
+ public void deletePassword(char[] passwordOld){
+ if(isCorrect(passwordOld)){
+ //Löschen
+ }
+ }
+}
+
diff --git a/src/com/company/passwort/einUndAusgabe.java b/src/com/company/passwort/einUndAusgabe.java
new file mode 100644
index 0000000..08eb523
--- /dev/null
+++ b/src/com/company/passwort/einUndAusgabe.java
@@ -0,0 +1,39 @@
+package com.company.passwort;
+
+public class einUndAusgabe {
+
+ public static void main(String[] args){
+
+ char[] pwd_first = "PassWD15!!".toCharArray();
+ char[] pwd_weak = "1234567890".toCharArray();
+ char[] pwd_strong = "NewPWD16!!".toCharArray();
+
+ // Erzeuge ein neues Passwortobjekt und setze das
+ // Passwort auf "PassW15!!"
+ Password pwd = new Password(pwd_first);
+
+ // Ändere Passwort auf "1234567890"
+ // Klappt nicht, weil das neue Passwort schwach ist
+ System.out.println(pwd.changePassword(pwd_first, pwd_weak));
+
+ // Verändern der lokalen pwd_first-Variablen
+ // Darf keine Auswirkungen auf das Passwort im pwd-Objekt haben.
+ pwd_first[0] = 'p';
+
+ // Ändere Passwort auf "NewPWD16!!"
+ // Klappt nicht, weil das alte Passwort nicht stimmt
+ System.out.println(pwd.changePassword(pwd_first, pwd_strong));
+
+ // Zurücksetzen der lokalen pwd_first-Variablen
+ // Darf keine Auswirkungen auf das Passwort im pwd-Objekt haben.
+ pwd_first[0] = 'P';
+
+ // Ändere Passwort auf "NewPWD16!!"
+ // Klappt, weil das alte Passwort stimmt und
+ // das neue Passwort stark ist
+ System.out.println(pwd.changePassword(pwd_first, pwd_strong));
+
+
+
+ }
+}
diff --git a/src/com/company/BundeswehrPruefnummern.java b/src/com/company/pruefnummern/BundeswehrPruefnummern.java
similarity index 98%
rename from src/com/company/BundeswehrPruefnummern.java
rename to src/com/company/pruefnummern/BundeswehrPruefnummern.java
index f575e88..37c3bfd 100644
--- a/src/com/company/BundeswehrPruefnummern.java
+++ b/src/com/company/pruefnummern/BundeswehrPruefnummern.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.pruefnummern;
import java.util.Scanner;
public class BundeswehrPruefnummern {
diff --git a/src/com/company/EinkaufwagenNummerJasminFehler.java b/src/com/company/pruefnummern/EinkaufwagenNummerJasminFehler.java
similarity index 97%
rename from src/com/company/EinkaufwagenNummerJasminFehler.java
rename to src/com/company/pruefnummern/EinkaufwagenNummerJasminFehler.java
index 414dd9c..4433cbe 100644
--- a/src/com/company/EinkaufwagenNummerJasminFehler.java
+++ b/src/com/company/pruefnummern/EinkaufwagenNummerJasminFehler.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.pruefnummern;
import java.util.Scanner;
public class EinkaufwagenNummerJasminFehler {
diff --git a/src/com/company/PayBack_LOL.java b/src/com/company/pruefnummern/PayBack_LOL.java
similarity index 98%
rename from src/com/company/PayBack_LOL.java
rename to src/com/company/pruefnummern/PayBack_LOL.java
index bdebb45..5d64cd3 100644
--- a/src/com/company/PayBack_LOL.java
+++ b/src/com/company/pruefnummern/PayBack_LOL.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.pruefnummern;
import java.util.Scanner;
diff --git a/src/com/company/StepCounter.java b/src/com/company/schrittzähler/StepCounter.java
similarity index 92%
rename from src/com/company/StepCounter.java
rename to src/com/company/schrittzähler/StepCounter.java
index 13d3e15..7829997 100644
--- a/src/com/company/StepCounter.java
+++ b/src/com/company/schrittzähler/StepCounter.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.schrittzähler;
public class StepCounter {
diff --git a/src/com/company/schrittzähler.java b/src/com/company/schrittzähler/schrittzähler.java
similarity index 93%
rename from src/com/company/schrittzähler.java
rename to src/com/company/schrittzähler/schrittzähler.java
index feb5253..279c0d5 100644
--- a/src/com/company/schrittzähler.java
+++ b/src/com/company/schrittzähler/schrittzähler.java
@@ -1,4 +1,4 @@
-package com.company;
+package com.company.schrittzähler;
public class schrittzähler {