From d6c664f0e78b1d371acfe9d67f7d1a23a1d65b49 Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Mon, 23 Nov 2020 08:40:15 +0100
Subject: [PATCH] +Alles zusammen

---
 .idea/workspace.xml                      | 75 +++++++++---------------
 src/com/company/EinkaufswagenNummer.java |  6 +-
 2 files changed, 32 insertions(+), 49 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0f144de..63c70fe 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,14 +6,29 @@
         <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
         <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
       </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
     </expand>
-    <select />
+    <select>
+      <path>
+        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
+        <item name="BRANCH:master" type="e8cecc67:BranchNodeDescriptor" />
+      </path>
+    </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="86f42963-ed9f-4d18-9c81-a4cf18fa27c4" name="Default Changelist" comment="test">
-      <change afterPath="$PROJECT_DIR$/src/com/company/PayBack_LOL.java" afterDir="false" />
+    <list default="true" id="86f42963-ed9f-4d18-9c81-a4cf18fa27c4" name="Default Changelist" comment="+Jasmins Version EinkaufwagenNummer">
+      <change afterPath="$PROJECT_DIR$/src/com/company/BundeswehrPruefnummern.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/company/BundeswehrPruefnummern.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/company/BundeswehrPruefnummern.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/JAVA-Aufgaben/com/company/EinkaufswagenNummer.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/JAVA-Aufgaben/com/company/EinkaufswagenNummer.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/company/EinkaufswagenNummer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/company/EinkaufswagenNummer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -40,7 +55,7 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
   </component>
-  <component name="RunManager" selected="Application.EinkaufswagenNummer">
+  <component name="RunManager" selected="Application.BundeswehrPruefnummern">
     <configuration name="BundeswehrPruefnummern" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.company.BundeswehrPruefnummern" />
       <module name="JAVA-Aufgaben" />
@@ -80,15 +95,10 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <list>
-      <item itemvalue="Application.BundeswehrPruefnummern" />
-      <item itemvalue="Application.EinkaufswagenNummer" />
-      <item itemvalue="Application.EinkaufwagenNummerJasminFehler" />
-    </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.EinkaufswagenNummer" />
         <item itemvalue="Application.BundeswehrPruefnummern" />
+        <item itemvalue="Application.EinkaufswagenNummer" />
         <item itemvalue="Application.EinkaufwagenNummerJasminFehler" />
       </list>
     </recent_temporary>
@@ -156,53 +166,37 @@
     <option name="LAST_COMMIT_MESSAGE" value="+Jasmins Version EinkaufwagenNummer" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="690" y="267" key="#com.intellij.refactoring.typeMigration.ui.FailedConversionsDialog" timestamp="1605684382606">
-      <screen x="0" y="0" width="1920" height="1040" />
-    </state>
-    <state x="690" y="267" key="#com.intellij.refactoring.typeMigration.ui.FailedConversionsDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1605684382606" />
-    <state width="1877" height="282" key="GridCell.Tab.0.bottom" timestamp="1605685855270">
+    <state width="1877" height="186" key="GridCell.Tab.0.bottom" timestamp="1605033112583">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="282" key="GridCell.Tab.0.bottom/0.0.1920.1040/0.-1080.1920.1040@0.0.1920.1040" timestamp="1605077469838" />
-    <state width="1877" height="282" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1605685855270" />
     <state width="1877" height="186" key="GridCell.Tab.0.bottom/3840.0.1920.1040/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1605033112583" />
-    <state width="1877" height="282" key="GridCell.Tab.0.center" timestamp="1605685855270">
+    <state width="1877" height="186" key="GridCell.Tab.0.center" timestamp="1605033112583">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="282" key="GridCell.Tab.0.center/0.0.1920.1040/0.-1080.1920.1040@0.0.1920.1040" timestamp="1605077469838" />
-    <state width="1877" height="282" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1605685855270" />
     <state width="1877" height="186" key="GridCell.Tab.0.center/3840.0.1920.1040/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1605033112583" />
-    <state width="1877" height="282" key="GridCell.Tab.0.left" timestamp="1605685855269">
+    <state width="1877" height="186" key="GridCell.Tab.0.left" timestamp="1605033112583">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="282" key="GridCell.Tab.0.left/0.0.1920.1040/0.-1080.1920.1040@0.0.1920.1040" timestamp="1605077469837" />
-    <state width="1877" height="282" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1605685855269" />
     <state width="1877" height="186" key="GridCell.Tab.0.left/3840.0.1920.1040/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1605033112583" />
-    <state width="1877" height="282" key="GridCell.Tab.0.right" timestamp="1605685855270">
+    <state width="1877" height="186" key="GridCell.Tab.0.right" timestamp="1605033112583">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="282" key="GridCell.Tab.0.right/0.0.1920.1040/0.-1080.1920.1040@0.0.1920.1040" timestamp="1605077469838" />
-    <state width="1877" height="282" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1605685855270" />
     <state width="1877" height="186" key="GridCell.Tab.0.right/3840.0.1920.1040/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1605033112583" />
-    <state width="1877" height="347" key="GridCell.Tab.1.bottom" timestamp="1605685796652">
+    <state width="1877" height="262" key="GridCell.Tab.1.bottom" timestamp="1605022562079">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="347" key="GridCell.Tab.1.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1605685796652" />
     <state width="1877" height="262" key="GridCell.Tab.1.bottom/3840.0.1920.1040/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1605022562079" />
-    <state width="1877" height="347" key="GridCell.Tab.1.center" timestamp="1605685796652">
+    <state width="1877" height="262" key="GridCell.Tab.1.center" timestamp="1605022562079">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="347" key="GridCell.Tab.1.center/0.0.1920.1040@0.0.1920.1040" timestamp="1605685796652" />
     <state width="1877" height="262" key="GridCell.Tab.1.center/3840.0.1920.1040/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1605022562079" />
-    <state width="1877" height="347" key="GridCell.Tab.1.left" timestamp="1605685796652">
+    <state width="1877" height="262" key="GridCell.Tab.1.left" timestamp="1605022562079">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="347" key="GridCell.Tab.1.left/0.0.1920.1040@0.0.1920.1040" timestamp="1605685796652" />
     <state width="1877" height="262" key="GridCell.Tab.1.left/3840.0.1920.1040/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1605022562079" />
-    <state width="1877" height="347" key="GridCell.Tab.1.right" timestamp="1605685796652">
+    <state width="1877" height="262" key="GridCell.Tab.1.right" timestamp="1605022562079">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="347" key="GridCell.Tab.1.right/0.0.1920.1040@0.0.1920.1040" timestamp="1605685796652" />
     <state width="1877" height="262" key="GridCell.Tab.1.right/3840.0.1920.1040/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1605022562079" />
     <state x="686" y="240" key="RollbackChangesDialog" timestamp="1605007609774">
       <screen x="0" y="0" width="1920" height="1040" />
@@ -225,15 +219,4 @@
     </state>
     <state x="682" y="431" key="vcs.readOnlyHandler.ReadOnlyStatusDialog/3840.0.1920.1040/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1604905992254" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/src/com/company/EinkaufswagenNummer.java</url>
-          <line>34</line>
-          <option name="timeStamp" value="8" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
 </project>
\ No newline at end of file
diff --git a/src/com/company/EinkaufswagenNummer.java b/src/com/company/EinkaufswagenNummer.java
index 4fafe6c..d1829ed 100644
--- a/src/com/company/EinkaufswagenNummer.java
+++ b/src/com/company/EinkaufswagenNummer.java
@@ -13,8 +13,8 @@ public class EinkaufswagenNummer {
         System.out.println("Bitte geben sie die Kennnummer ein: ");
         String wagenNummer = scanner.nextLine().replace("-", "");
 
-        while (wagenNummer.length() != 4) {
-            System.out.println("Die Nummer muss 4 Stellen lang sein. Bitte erneut eingeben");
+        while (wagenNummer.length() != 16) {
+            System.out.println("Die Nummer muss 16 Stellen lang sein. Bitte erneut eingeben");
             wagenNummer = scanner.nextLine().replace("-", "");
         }
 
@@ -23,7 +23,7 @@ public class EinkaufswagenNummer {
     }
 
     public static boolean pruefungNummer(String nummer){
-        int gewichtung = 0;
+        String gewichtung = "";
         for (int i = 0; i < nummer.length() - 1; i++) {
             char stelle = nummer.charAt(i);
             gewichtung += Character.getNumericValue(stelle) * (i % 2 == 0 ? 1 : 1);