From 2f34e1b8b49749f54dc737b78ada6f5610e3c828 Mon Sep 17 00:00:00 2001
From: Komlovski <evgeny.komlovsky@gmx.de>
Date: Fri, 5 Jul 2019 19:41:34 +0200
Subject: [PATCH] Merge branch 'master' of C:\Users\Komlovski\Desktop\Alpha
 with conflicts.

---
 .idea/workspace.xml                           | 136 +++++++++---------
 .../Alpha/Main$ActionListener1.class          | Bin 779 -> 645 bytes
 src/D_Test1.java                              |  53 -------
 3 files changed, 69 insertions(+), 120 deletions(-)
 delete mode 100644 src/D_Test1.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f276c2f..bf9bf94 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="41dc023d-0769-466f-850a-8e3eed9fe5fa" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/D_Test1.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/D_Test1.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/out/production/Alpha/Main$ActionListener1.class" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -15,22 +15,28 @@
     <option name="isMigrated" value="true" />
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/D_Test1.java">
+    <leaf>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="14" column="24" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
+            <state relative-caret-position="185">
+              <caret line="43" column="27" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#191#192#0" expanded="true" />
-                <element signature="e#1397#1398#0" expanded="true" />
-                <element signature="e#1600#1601#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/D_Test.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="136">
+              <caret line="10" column="12" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -46,11 +52,11 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+        <option value="$PROJECT_DIR$/src/Main.java" />
         <option value="$PROJECT_DIR$/src/testFrame.java" />
         <option value="$PROJECT_DIR$/src/fenster.java" />
         <option value="$PROJECT_DIR$/src/geburtstag.java" />
         <option value="$PROJECT_DIR$/src/Geburtstag.java" />
-        <option value="$PROJECT_DIR$/src/Main.java" />
       </list>
     </option>
   </component>
@@ -60,14 +66,12 @@
     <option name="width" value="1346" />
     <option name="height" value="728" />
   </component>
-  <component name="ProjectLevelVcsManager">
-    <ConfirmationsSetting value="2" id="Add" />
-  </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -85,7 +89,6 @@
         </subPane>
       </pane>
       <pane id="PackagesPane" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -108,16 +111,9 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.D_Test1">
-    <configuration name="D_Geburtstag" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="D_Geburtstag" />
-      <module name="Alpha" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="D_Test1" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="D_Test1" />
+  <component name="RunManager" selected="Application.Geburtstag">
+    <configuration name="Geburtstag" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Geburtstag" />
       <module name="Alpha" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -146,9 +142,8 @@
     </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.D_Test1" />
+        <item itemvalue="Application.Geburtstag" />
         <item itemvalue="Application.Main" />
-        <item itemvalue="Application.D_Geburtstag" />
         <item itemvalue="Application.main" />
         <item itemvalue="Application.fenster" />
       </list>
@@ -167,8 +162,7 @@
       <workItem from="1562340912093" duration="26000" />
       <workItem from="1562341014848" duration="1785000" />
       <workItem from="1562343569757" duration="85000" />
-      <workItem from="1562343774281" duration="2056000" />
-      <workItem from="1562347057096" duration="199000" />
+      <workItem from="1562343774281" duration="241000" />
     </task>
     <task id="LOCAL-00001" summary="neue master">
       <created>1562341097724</created>
@@ -199,36 +193,22 @@
       <updated>1562343454615</updated>
     </task>
     <task id="LOCAL-00005" summary="geburtstag sauber">
-      <created>1562344148629</created>
+      <created>1562348349515</created>
       <option name="number" value="00005" />
       <option name="presentableId" value="LOCAL-00005" />
       <option name="project" value="LOCAL" />
-      <updated>1562344148629</updated>
+      <updated>1562348349515</updated>
     </task>
-    <task id="LOCAL-00006" summary="Main bereinigt">
-      <created>1562344619215</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1562344619215</updated>
-    </task>
-    <task id="LOCAL-00007" summary="junit klassen erst mal entfernen">
-      <created>1562346483053</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1562346483053</updated>
-    </task>
-    <option name="localTasksCounter" value="8" />
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="4694000" />
+    <option name="totallyTimeSpent" value="2546000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1616" height="886" extended-state="6" />
+    <frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17287917" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25416037" />
       <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" />
@@ -238,7 +218,7 @@
       <window_info anchor="bottom" id="Messages" order="0" weight="0.32934928" />
       <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.32934928" />
+      <window_info anchor="bottom" id="Run" order="3" weight="0.32934928" />
       <window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
@@ -246,8 +226,8 @@
       <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="9" />
       <window_info anchor="bottom" id="Database Changes" order="10" />
-      <window_info anchor="bottom" id="Terminal" order="11" weight="0.32934928" />
-      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
+      <window_info anchor="bottom" id="Terminal" order="11" sideWeight="0.49924356" weight="0.32872504" />
+      <window_info active="true" anchor="bottom" id="Event Log" order="12" sideWeight="0.50075644" side_tool="true" visible="true" weight="0.32872504" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -258,6 +238,37 @@
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Database" order="8" />
     </layout>
+    <layout-to-restore>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25416037" />
+      <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" />
+      <window_info id="UI Designer" order="4" />
+      <window_info id="Capture Tool" order="5" />
+      <window_info id="Favorites" order="6" side_tool="true" />
+      <window_info anchor="bottom" id="Messages" order="0" weight="0.32934928" />
+      <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" sideWeight="0.49924356" visible="true" weight="0.32872504" />
+      <window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
+      <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" />
+      <window_info anchor="bottom" id="Database Changes" order="10" />
+      <window_info anchor="bottom" id="Terminal" order="11" weight="0.32934928" />
+      <window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50075644" side_tool="true" visible="true" weight="0.32872504" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Theme Preview" order="4" />
+      <window_info anchor="right" id="Maven" order="5" />
+      <window_info anchor="right" id="Capture Analysis" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+      <window_info anchor="right" id="Database" order="8" />
+    </layout-to-restore>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
@@ -265,9 +276,7 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="neue master" />
     <MESSAGE value="geburtstag sauber" />
-    <MESSAGE value="Main bereinigt" />
-    <MESSAGE value="junit klassen erst mal entfernen" />
-    <option name="LAST_COMMIT_MESSAGE" value="junit klassen erst mal entfernen" />
+    <option name="LAST_COMMIT_MESSAGE" value="geburtstag sauber" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/testJFrame.java" />
@@ -275,24 +284,17 @@
     <entry file="file://$PROJECT_DIR$/Alpha.iml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/TestBmi.java" />
     <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="236">
-          <caret line="29" column="5" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/D_Geburtstag.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="15" selection-start-line="15" selection-end-line="15" />
+        <state relative-caret-position="185">
+          <caret line="43" column="27" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/D_Test.java" />
-    <entry file="file://$PROJECT_DIR$/src/M_Test.java" />
-    <entry file="file://$PROJECT_DIR$/src/E_Test.java" />
+    <entry file="file://$PROJECT_DIR$/src/Geburtstag.java" />
   </component>
   <component name="masterDetails">
     <states>
diff --git a/out/production/Alpha/Main$ActionListener1.class b/out/production/Alpha/Main$ActionListener1.class
index eef8589b278d289527ab4cae376d4ec66d921ba0..d2e0bf3563ca07ff7091a9ba6f7d079c2706b73d 100644
GIT binary patch
delta 292
zcmYL@yH3ME6hzOiz1es%U|s?9iV2UP038w)5*4BV{(*vm1`4OAqM}0n5()&Oprqhm
z_yxpdiG)^~duKE=dmmd5uJ`rx{sA1ZlaaC<aI6GYS@W!Wx}NH(|J|IJvNE(Uuj}F2
zT|M+{<apXS89mQt&KBEEZO&bKadmUse473}mHHfp7N#ghZhd3*GJ@0zvBStA4EA0y
zgIDZx^yEUNgu6@%^SB45m=QC~GB<8G*0j=G@<#F>4%kzv`?}yDHgx`6;|BSeXF=J7
Uj(nCymf|caG)MQPluToP0XD)JTL1t6

delta 427
zcmZvXy-veG5QM)w$9KtLf)gM>_%k8k#7-n4(M5C=6rrW3q@kuuMMZ^N@fZ{+h=K>;
zU3dk=o?}tb%<ima=H?#5CzF2te0&1uj2$5d4S_?4A#ohhv-B+|mec3ncWy})t-<X2
z_U?XKVt+Cn-YE3LnTLs@UY(1k>UJX>D-m@Xej8YZ5g8IQDz4Pb8lTgj6fY{BD{7vR
z$nyq;Ma8jqO0@v(gX9{OMYV8nS^kF376h-tG^>K%2?LsfQMo(TXbV%Uvr#2n$n*(e
z@J?-Mo_n_|uOn)V%Y@ESRV9d?O*+!cE4QnxOVI@4HCetu{of>6D*kc|JMu5z)X-&D
Y5_H0zP|ZFqnQhrZj)`S%2`8@q0uY=e>Hq)$

diff --git a/src/D_Test1.java b/src/D_Test1.java
deleted file mode 100644
index 09c0bcb..0000000
--- a/src/D_Test1.java
+++ /dev/null
@@ -1,53 +0,0 @@
-import java.awt .*;
-import javax.swing .*;
-import java.awt.event .*;
-
-public class D_Test {
-
-
-    public class NewStudent {
-        public static void main(String[] args) {
-            NewStudent st = new NewStudent();
-        }
-
-        public NewStudent() {
-            JFrame frame = new JFrame("STUDENT REGISTRATION FORM");
-            frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-            frame.setSize(800, 600);
-            frame.setVisible(true);
-
-            JPanel p1 = new JPanel();
-            p1.setLayout(null);
-            p1.setBackground(Color.CYAN);
-
-            frame.add(p1);
-            ButtonGroup buttonGroup = new ButtonGroup();
-            JRadioButton male = new JRadioButton("MALE");
-            male.setBounds(100, 170, 100, 20);
-            buttonGroup.add(male);
-            p1.add(male);
-            JRadioButton female = new JRadioButton("FEMALE");
-            female.setBounds(250, 170, 100, 20);
-            buttonGroup.add(female);
-            p1.add(female);
-            JLabel sex = new JLabel("SEX:");
-            sex.setBounds(10, 200, 100, 20);
-            p1.add(sex);
-            final JTextField gender = new JTextField();
-            gender.setBounds(100, 200, 300, 20);
-            p1.add(gender);
-
-            male.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent ie) {
-                    gender.setText("MALE");
-                }
-            });
-
-            female.addActionListener(new ActionListener() {
-                public void actionPerformed(ActionEvent ie) {
-                    gender.setText("FEMALE");
-                }
-            });
-        }
-    }
-}