From 774d52afea271c8d85b567eaac2b9642c08ba273 Mon Sep 17 00:00:00 2001
From: Hauch IT <Daniel.Hauch@ai.hs-fulda.de>
Date: Thu, 11 Jul 2019 19:02:15 +0200
Subject: [PATCH] Verbesserung Main und Erweiterung Tage_D

---
 .idea/misc.xml      |   2 +-
 .idea/workspace.xml | 136 +++++++++++++++++++++++++++-----------------
 src/Main.java       |  15 +++--
 src/Quiz_Spiel.java |   6 --
 src/Tage_D.java     |  10 ++++
 src/bild.gif        |   0
 src/pic.jpg         |   0
 7 files changed, 105 insertions(+), 64 deletions(-)
 delete mode 100644 src/bild.gif
 delete mode 100644 src/pic.jpg

diff --git a/.idea/misc.xml b/.idea/misc.xml
index e0844bc..0548357 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c4484a9..5f633b1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="41dc023d-0769-466f-850a-8e3eed9fe5fa" name="Default Changelist" comment="Main Menü angepasst mit Auswahl und Action Listener erstellt. So das Unterklassen Objekte erzeugt werden">
-      <change afterPath="$PROJECT_DIR$/src/bild.gif" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/pic.jpg" afterDir="false" />
+    <list default="true" id="41dc023d-0769-466f-850a-8e3eed9fe5fa" name="Default Changelist" comment="Entwicklung eines ButtonGroup Aktoren und der Verwendung der Klassen Quiz und Tage">
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/JunitTest/src/Tage_DTest.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Quiz_Spiel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Quiz_Spiel.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Tage_D.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tage_D.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/bild.gif" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/pic.jpg" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -21,35 +22,40 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="204">
-              <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="62" selection-end-column="34" />
+            <state relative-caret-position="187">
+              <caret line="105" column="34" selection-start-line="105" selection-start-column="34" selection-end-line="105" selection-end-column="34" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#1337#1470#0" expanded="true" />
-                <element signature="e#1469#1470#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Quiz_Spiel.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="93">
+              <caret line="159" column="1" lean-forward="true" selection-start-line="159" selection-start-column="1" selection-end-line="163" selection-end-column="22" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/Tage_D.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1001">
-              <caret line="70" column="34" selection-start-line="70" selection-start-column="34" selection-end-line="70" selection-end-column="34" />
+            <state relative-caret-position="804">
+              <caret line="52" column="51" selection-start-line="52" selection-start-column="51" selection-end-line="52" selection-end-column="51" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#1717#1850#0" expanded="true" />
-                <element signature="e#1849#1850#0" expanded="true" />
-                <element signature="e#3120#3121#0" expanded="true" />
-                <element signature="e#3173#3174#0" expanded="true" />
-                <element signature="e#3298#3299#0" expanded="true" />
-                <element signature="e#3353#3354#0" expanded="true" />
-                <element signature="e#3479#3480#0" expanded="true" />
-                <element signature="e#3534#3535#0" expanded="true" />
+                <element signature="e#3538#3539#0" expanded="true" />
+                <element signature="e#3591#3592#0" expanded="true" />
+                <element signature="e#3716#3717#0" expanded="true" />
+                <element signature="e#3771#3772#0" expanded="true" />
+                <element signature="e#3897#3898#0" expanded="true" />
+                <element signature="e#3952#3953#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -83,6 +89,7 @@
     </replaceStrings>
   </component>
   <component name="Git.Settings">
+    <option name="UPDATE_TYPE" value="MERGE" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="IdeDocumentHistory">
@@ -94,8 +101,9 @@
         <option value="$PROJECT_DIR$/src/Geburtstag.java" />
         <option value="$PROJECT_DIR$/src/MainGUI.form" />
         <option value="$PROJECT_DIR$/src/Tage_DTest.java" />
-        <option value="$PROJECT_DIR$/src/Main.java" />
         <option value="$PROJECT_DIR$/src/Tage_D.java" />
+        <option value="$PROJECT_DIR$/src/Quiz_Spiel.java" />
+        <option value="$PROJECT_DIR$/src/Main.java" />
       </list>
     </option>
   </component>
@@ -131,6 +139,12 @@
               <item name="Alpha" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="Alpha" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Alpha" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="Quiz_Spiel.java" type="529ef68f:ClassesTreeStructureProvider$PsiClassOwnerTreeNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -144,9 +158,10 @@
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="Arquillian JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.Arquillian JUnit4" value="" />
     <property name="create.test.in.the.same.root" value="true" />
-    <property name="project.structure.last.edited" value="Modules" />
+    <property name="nodejs_package_manager_path" value="npm" />
+    <property name="project.structure.last.edited" value="Project" />
     <property name="project.structure.proportion" value="0.15" />
-    <property name="project.structure.side.proportion" value="0.0" />
+    <property name="project.structure.side.proportion" value="0.2" />
     <property name="restartRequiresConfirmation" value="false" />
     <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
   </component>
@@ -192,15 +207,15 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="Tage_D" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Tage_D" />
+    <configuration name="Quiz_Spiel" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Quiz_Spiel" />
       <module name="Alpha" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="main" />
+    <configuration name="Tage_D" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Tage_D" />
       <module name="Alpha" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -209,10 +224,10 @@
     <recent_temporary>
       <list>
         <item itemvalue="Application.Main" />
+        <item itemvalue="Application.Quiz_Spiel" />
         <item itemvalue="Application.Tage_D" />
         <item itemvalue="Application.D_Test1" />
         <item itemvalue="Application.D_Geburtstag" />
-        <item itemvalue="Application.main" />
       </list>
     </recent_temporary>
   </component>
@@ -237,7 +252,7 @@
       <workItem from="1562781684319" duration="923000" />
       <workItem from="1562789348995" duration="2654000" />
       <workItem from="1562848572975" duration="6651000" />
-      <workItem from="1562856644601" duration="3700000" />
+      <workItem from="1562856644601" duration="6634000" />
     </task>
     <task id="LOCAL-00001" summary="neue master">
       <created>1562341097724</created>
@@ -358,17 +373,24 @@
       <option name="project" value="LOCAL" />
       <updated>1562853765189</updated>
     </task>
-    <option name="localTasksCounter" value="18" />
+    <task id="LOCAL-00018" summary="Entwicklung eines ButtonGroup Aktoren und der Verwendung der Klassen Quiz und Tage">
+      <created>1562861654490</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1562861654490</updated>
+    </task>
+    <option name="localTasksCounter" value="19" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="26477000" />
+    <option name="totallyTimeSpent" value="29411000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1616" height="886" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.11503856" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14203085" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Image Layers" order="2" />
       <window_info id="Designer" order="3" />
@@ -378,13 +400,13 @@
       <window_info anchor="bottom" id="Messages" order="0" weight="0.32802126" />
       <window_info anchor="bottom" id="Message" order="1" />
       <window_info anchor="bottom" id="Find" order="2" />
-      <window_info active="true" anchor="bottom" id="Run" order="3" visible="true" weight="0.33466136" />
+      <window_info anchor="bottom" id="Run" order="3" visible="true" weight="0.33466136" />
       <window_info anchor="bottom" id="Debug" order="4" weight="0.3997344" />
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="7" />
       <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="9" weight="0.3290461" />
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.32802126" />
       <window_info anchor="bottom" id="Database Changes" order="10" />
       <window_info anchor="bottom" id="Terminal" order="11" weight="0.3290461" />
       <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
@@ -412,7 +434,8 @@
     <MESSAGE value="neue GUI erstellt zum testen" />
     <MESSAGE value="Junit für Tage_D erzeugt" />
     <MESSAGE value="Main Menü angepasst mit Auswahl und Action Listener erstellt. So das Unterklassen Objekte erzeugt werden" />
-    <option name="LAST_COMMIT_MESSAGE" value="Main Menü angepasst mit Auswahl und Action Listener erstellt. So das Unterklassen Objekte erzeugt werden" />
+    <MESSAGE value="Entwicklung eines ButtonGroup Aktoren und der Verwendung der Klassen Quiz und Tage" />
+    <option name="LAST_COMMIT_MESSAGE" value="Entwicklung eines ButtonGroup Aktoren und der Verwendung der Klassen Quiz und Tage" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/testJFrame.java" />
@@ -464,38 +487,47 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/pic.jpg">
+    <entry file="file://$PROJECT_DIR$/src/bild.jpg">
       <provider selected="true" editor-type-id="images" />
     </entry>
     <entry file="file://$PROJECT_DIR$/src/bild.gif">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Main.java">
+    <entry file="file://$PROJECT_DIR$/src/bild1.jpg">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/bild2.jpg">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Tage_D.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="62" selection-end-column="34" />
+        <state relative-caret-position="804">
+          <caret line="52" column="51" selection-start-line="52" selection-start-column="51" selection-end-line="52" selection-end-column="51" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1337#1470#0" expanded="true" />
-            <element signature="e#1469#1470#0" expanded="true" />
+            <element signature="e#3538#3539#0" expanded="true" />
+            <element signature="e#3591#3592#0" expanded="true" />
+            <element signature="e#3716#3717#0" expanded="true" />
+            <element signature="e#3771#3772#0" expanded="true" />
+            <element signature="e#3897#3898#0" expanded="true" />
+            <element signature="e#3952#3953#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/Tage_D.java">
+    <entry file="file://$PROJECT_DIR$/src/Quiz_Spiel.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="93">
+          <caret line="159" column="1" lean-forward="true" selection-start-line="159" selection-start-column="1" selection-end-line="163" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1001">
-          <caret line="70" column="34" selection-start-line="70" selection-start-column="34" selection-end-line="70" selection-end-column="34" />
+        <state relative-caret-position="187">
+          <caret line="105" column="34" selection-start-line="105" selection-start-column="34" selection-end-line="105" selection-end-column="34" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#1717#1850#0" expanded="true" />
-            <element signature="e#1849#1850#0" expanded="true" />
-            <element signature="e#3120#3121#0" expanded="true" />
-            <element signature="e#3173#3174#0" expanded="true" />
-            <element signature="e#3298#3299#0" expanded="true" />
-            <element signature="e#3353#3354#0" expanded="true" />
-            <element signature="e#3479#3480#0" expanded="true" />
-            <element signature="e#3534#3535#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/Main.java b/src/Main.java
index 9cc4ceb..402b1a1 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -21,7 +21,7 @@ public class Main {
     public Main(){
 
         fr = new JFrame("Coutinius Integration SS 2019");
-        fr.setSize(600,800);
+        fr.setSize(400,400);
         fr.setFont(new Font("Helvetica", Font.PLAIN, 12));
         fr.setLayout(new FlowLayout());
 
@@ -41,7 +41,6 @@ public class Main {
         menuItem1  = new JMenuItem("Exit");    mF.add(menuItem1);
         menuItem2  = new JMenuItem("Über");    mI.add(menuItem2);
 
-
         menuItem2.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent ie) {
                 try {
@@ -62,6 +61,8 @@ public class Main {
 
         fr.setContentPane(Panele);
 
+
+
         Panele.add(new JLabel("CI Tools von "));
 
         ButtonGroup buttonGroup = new ButtonGroup();
@@ -75,7 +76,6 @@ public class Main {
         JButton MTools = new JButton("Michael"); MTools.setBounds(300, 300, 100, 20);
         buttonGroup.add(MTools);  Panele.add(MTools);
 
-
         DTools.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent ie) {
                 try {
@@ -98,7 +98,12 @@ public class Main {
 
                     JOptionPane.showMessageDialog(fr, "Aufruf von Eugens Tools");
                     //fr.setVisible(false);
-                    Quiz q = new Quiz();
+
+                    Quiz_Spiel window = new Quiz_Spiel();
+
+                    window.setTitle("Quiz_Spiel");
+                    window.pack();
+                    window.show();
 
 
                 }catch (Exception ex) {
@@ -114,7 +119,7 @@ public class Main {
 
                     JOptionPane.showMessageDialog(fr, "Aufruf von Michaels Tools");
                     fr.setVisible(false);
-                    Quiz q = new Quiz();
+                    Quiz qwqqq = new Quiz();
 
 
                 }catch (Exception ex) {
diff --git a/src/Quiz_Spiel.java b/src/Quiz_Spiel.java
index 5962b40..d3b7c40 100644
--- a/src/Quiz_Spiel.java
+++ b/src/Quiz_Spiel.java
@@ -154,12 +154,6 @@ public class Quiz_Spiel extends JFrame {
             }
         });
 
-
-
-
-
-
-
     }
 
     public static void main(String args[]) {
diff --git a/src/Tage_D.java b/src/Tage_D.java
index 6841e15..7ce5c30 100644
--- a/src/Tage_D.java
+++ b/src/Tage_D.java
@@ -9,6 +9,10 @@ import java.util.concurrent.ThreadLocalRandom;
 
 public class Tage_D extends JFrame {
 
+    Icon icon1,icon2,icon3;
+
+    JLabel bild1,bild2,bild3;
+
     JFrame fr = null;
     JPanel Panele = null;
     JButton button1 = null;
@@ -70,6 +74,12 @@ public class Tage_D extends JFrame {
 
         fr.setContentPane(Panele);
 
+        /*
+        icon1 = new ImageIcon(getClass().getResource("bild1.jpg")); bild1 = new JLabel(icon1); fr.add(icon1);
+        icon2 = new ImageIcon(getClass().getResource("bild2.jpg")); bild2 = new JLabel(icon2); fr.add(icon2);
+        icon3 = new ImageIcon(getClass().getResource("bild3.gif")); bild3 = new JLabel(icon3); fr.add(icon3);
+         */
+
         j1 = new JTextField("Tools von Daniel Hauch"); j1.setEditable(false);   j1.setSize(450,30); ;   Panele.add(j1);
         j2 = new JTextField("Wie ist Ihr Name?");   j2.setEditable(false); Panele.add(j2); j2.setSize(450,30);   Panele.add(j2);
         j3 = new JTextField("");   j3.setEditable(true); Panele.add(j2); j3.setSize(450,30);   Panele.add(j3);
diff --git a/src/bild.gif b/src/bild.gif
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pic.jpg b/src/pic.jpg
deleted file mode 100644
index e69de29..0000000