Continous_Integration_in_der_Praxis
/
CIiP-2019-SoSe-Projektarbeit_Alpha
forked from Hauch/Alpha
2
0
Fork 0
Code Releases Activity
Browse Source

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	.idea/workspace.xml
new_repo
Komlovski 6 years ago
parent
bad024afc5 d666adc762
commit
1b0eab64dc
8 changed files with 258 additions and 255 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 313
      .idea/workspace.xml
  2. 12
      JunitTest/JunitTest.iml
  3. 2
      src/D_Test2.java
  4. 2
      src/D_Test3.java
  5. 123
      src/Main.java
  6. 28
      src/MainGUI.form
  7. 5
      src/MainGUI.java
  8. 28
      src/Tage_D.java

313
.idea/workspace.xml
View File

@ -2,10 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="41dc023d-0769-466f-850a-8e3eed9fe5fa" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Quiz.form" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/JunitTest/JunitTest.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Quiz.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Quiz.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/D_Test2.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/D_Test3.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/MainGUI.form" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/MainGUI.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Tage_D.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tage_D.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -17,18 +21,17 @@
<component name="DefaultGradleProjectSettings">
<option name="isMigrated" value="true" />
</component>
<component name="ExportToHTMLSettings">
<option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/../Alpha\exportToHTML" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Quiz.java">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="86" column="111" selection-start-line="86" selection-start-column="111" selection-end-line="86" selection-end-column="111" />
<state relative-caret-position="202">
<caret line="54" column="36" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1181#1313#0" expanded="true" />
<element signature="e#1312#1313#0" expanded="true" />
</folding>
</state>
</provider>
@ -40,9 +43,24 @@
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
<option value="Arquillian JUnit Test Class" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>pa.</find>
<find>contantPane</find>
<find>ETools</find>
<find>this.</find>
</findStrings>
<replaceStrings>
<replace>this.</replace>
<replace>this.panel</replace>
<replace>Panele</replace>
<replace>MTools</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
@ -53,22 +71,17 @@
<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/MainGUI.form" />
<option value="$PROJECT_DIR$/src/Tage_DTest.java" />
<option value="$PROJECT_DIR$/src/Tage_D.java" />
<option value="$PROJECT_DIR$/src/Main.java" />
<option value="$PROJECT_DIR$/src/TicTakToc_E_K.java" />
<option value="$PROJECT_DIR$/src/Quiz_E.java" />
<option value="$PROJECT_DIR$/src/RadioQuestion.java" />
<option value="$PROJECT_DIR$/src/QuizGame.form" />
<option value="$PROJECT_DIR$/src/Quizjjj.form" />
<option value="$PROJECT_DIR$/src/Quiz.java" />
<option value="$PROJECT_DIR$/src/Quiz_Spiel.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="488" />
<option name="y" value="92" />
<option name="width" value="1346" />
<option name="height" value="728" />
<option name="x" value="-7" />
<option name="width" value="974" />
<option name="height" value="1057" />
</component>
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
@ -85,6 +98,11 @@
<item name="Alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="Alpha" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="Alpha" type="462c0819:PsiDirectoryNode" />
<item name="JunitTest" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="Alpha" type="462c0819:PsiDirectoryNode" />
@ -102,12 +120,23 @@
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.0" />
<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="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.0" />
<property name="restartRequiresConfirmation" value="false" />
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
</component>
<component name="RecentsManager">
<key name="CreateTestDialog.RecentsKey">
<recent name="" />
</key>
<key name="CreateTestDialog.Recents.Supers">
<recent name="" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
@ -120,37 +149,37 @@
</list>
</option>
</component>
<component name="RunManager" selected="Application.Quiz_Spiel">
<configuration name="TicTakToc_E_K" type="Applet" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="TicTakToc_E_K" />
<component name="RunManager" selected="Application.Main">
<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="Quiz" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Quiz" />
<configuration name="D_Test1" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="D_Test1" />
<module name="Alpha" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Quiz_E" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Quiz_E" />
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Main" />
<module name="Alpha" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Quiz_Spiel" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Quiz_Spiel" />
<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" />
</method>
</configuration>
<configuration name="TicTakToc_E_K" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="TicTakToc_E_K" />
<configuration name="main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="main" />
<module name="Alpha" />
<method v="2">
<option name="Make" enabled="true" />
@ -158,11 +187,11 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Application.Quiz_Spiel" />
<item itemvalue="Application.Quiz" />
<item itemvalue="Application.Quiz_E" />
<item itemvalue="Applet.TicTakToc_E_K" />
<item itemvalue="Application.TicTakToc_E_K" />
<item itemvalue="Application.Main" />
<item itemvalue="Application.Tage_D" />
<item itemvalue="Application.D_Test1" />
<item itemvalue="Application.D_Geburtstag" />
<item itemvalue="Application.main" />
</list>
</recent_temporary>
</component>
@ -181,8 +210,12 @@
<workItem from="1562343569757" duration="85000" />
<workItem from="1562343774281" duration="2056000" />
<workItem from="1562347057096" duration="199000" />
<workItem from="1562363354568" duration="615000" />
<workItem from="1562414362573" duration="942000" />
<workItem from="1562379817416" duration="627000" />
<workItem from="1562534024971" duration="213000" />
<workItem from="1562718828390" duration="103000" />
<workItem from="1562781684319" duration="923000" />
<workItem from="1562789348995" duration="2654000" />
<workItem from="1562848572975" duration="3638000" />
</task>
<task id="LOCAL-00001" summary="neue master">
<created>1562341097724</created>
@ -240,80 +273,92 @@
<option name="project" value="LOCAL" />
<updated>1562348184129</updated>
</task>
<task id="LOCAL-00009" summary="Beginn mit Quiz Spiel.&#10;//erste Giu elemente">
<created>1562415232279</created>
<task id="LOCAL-00009" summary="Fenster wird um Auswahl Fenster erweitert">
<created>1562349172389</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1562415232279</updated>
<updated>1562349172389</updated>
</task>
<task id="LOCAL-00010" summary="Quiz Spiel. 1 Frage und Antwort">
<created>1562611989228</created>
<task id="LOCAL-00010" summary="Fenster wird um Auswahl Fenster erweitert">
<created>1562349989934</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1562611989228</updated>
<updated>1562349989934</updated>
</task>
<task id="LOCAL-00011" summary="neue Tage Script">
<created>1562537775488</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1562537775489</updated>
</task>
<task id="LOCAL-00012" summary="neue Tage Script">
<created>1562537854358</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1562537854358</updated>
</task>
<task id="LOCAL-00013" summary="neue GUI erstellt zum testen">
<created>1562717415095</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1562717415095</updated>
</task>
<task id="LOCAL-00014" summary="neue GUI erstellt zum testen">
<created>1562717535565</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1562717535565</updated>
</task>
<option name="localTasksCounter" value="11" />
<task id="LOCAL-00015" summary="Junit für Tage_D erzeugt">
<created>1562804519991</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1562804519991</updated>
</task>
<task id="LOCAL-00016" summary="Junit für Tage_D erzeugt">
<created>1562804715949</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1562804715949</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="21621000" />
<option name="totallyTimeSpent" value="19764000" />
</component>
<component name="ToolWindowManager">
<frame x="619" y="60" width="1346" height="728" extended-state="0" />
<frame x="-8" y="-8" width="1616" height="886" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49343833" visible="true" weight="0.28538102" />
<window_info id="Structure" order="1" sideWeight="0.5065617" side_tool="true" visible="true" weight="0.28538102" />
<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" sideWeight="0.48755834" weight="0.3277311" />
<window_info anchor="bottom" id="Message" order="1" />
<window_info anchor="bottom" id="Find" order="2" />
<window_info anchor="bottom" id="Run" order="3" sideWeight="0.4860031" visible="true" weight="0.35966387" />
<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" sideWeight="0.49924356" weight="0.32872504" />
<window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.5139969" side_tool="true" visible="true" weight="0.35966387" />
<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>
<layout-to-restore>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25416037" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.113753214" />
<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 active="true" anchor="bottom" id="Messages" order="0" visible="true" 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" sideWeight="0.49924356" visible="true" weight="0.32872504" />
<window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
<window_info anchor="bottom" id="Run" order="3" weight="0.3306773" />
<window_info anchor="bottom" id="Debug" order="4" weight="0.39978564" />
<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="Version Control" order="9" weight="0.3290461" />
<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="bottom" id="Terminal" order="11" weight="0.3290461" />
<window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
<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" />
@ -323,7 +368,7 @@
<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>
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
@ -333,12 +378,11 @@
<MESSAGE value="geburtstag sauber" />
<MESSAGE value="Main bereinigt" />
<MESSAGE value="junit klassen erst mal entfernen" />
<MESSAGE value="Beginn mit Quiz Spiel.&#10;//erste Giu elemente" />
<MESSAGE value="Quiz Spiel. 1 Frage und Antwort" />
<option name="LAST_COMMIT_MESSAGE" value="Quiz Spiel. 1 Frage und Antwort" />
</component>
<component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/Alpha$Quiz.ic" NAME="Quiz Coverage Results" MODIFIED="1562358075708" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
<MESSAGE value="Fenster wird um Auswahl Fenster erweitert" />
<MESSAGE value="neue Tage Script" />
<MESSAGE value="neue GUI erstellt zum testen" />
<MESSAGE value="Junit für Tage_D erzeugt" />
<option name="LAST_COMMIT_MESSAGE" value="Junit für Tage_D erzeugt" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/testJFrame.java" />
@ -355,70 +399,65 @@
</entry>
<entry file="file://$PROJECT_DIR$/out/production/Alpha/Main.class" />
<entry file="file://$PROJECT_DIR$/src/D_Test1.java" />
<entry file="file://$PROJECT_DIR$/src/D_Test2.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="13" selection-start-column="13" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/D_Test3.java">
<entry file="file://$PROJECT_DIR$/Info Datei Nur für Alpha">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="13" selection-start-column="13" selection-end-column="13" />
<state relative-caret-position="143">
<caret line="33" column="20" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/D_Geburtstag.java" />
<entry file="file://$PROJECT_DIR$/src/RadioQuestion.java" />
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="610">
<caret line="97" selection-start-line="97" selection-end-line="97" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/MainGUI.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/Quizjjj.java">
<entry file="file://$PROJECT_DIR$/src/Quiz_E.java" />
<entry file="file://$PROJECT_DIR$/src/MainGUI.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/Quizjjj.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/QuizGame.form">
<entry file="file://$PROJECT_DIR$/src/MainGUI.form">
<provider selected="true" editor-type-id="ui-designer" />
</entry>
<entry file="file://$PROJECT_DIR$/src/QuizGame.java">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/MainGUI.java">
<entry file="file://$PROJECT_DIR$/src/D_Test2.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
<caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Quiz_Spiel.java">
<entry file="file://$PROJECT_DIR$/src/D_Test3.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="64">
<caret line="62" lean-forward="true" selection-start-line="62" selection-end-line="62" />
<state relative-caret-position="17">
<caret line="1" column="1" lean-forward="true" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Tage_D.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1275">
<caret line="79" column="55" lean-forward="true" selection-start-line="79" selection-start-column="55" selection-end-line="79" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2602#2603#0" expanded="true" />
<element signature="e#2655#2656#0" expanded="true" />
<element signature="e#2780#2781#0" expanded="true" />
<element signature="e#2835#2836#0" expanded="true" />
<element signature="e#2961#2962#0" expanded="true" />
<element signature="e#3016#3017#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Quiz.java">
<entry file="file://$PROJECT_DIR$/JunitTest/src/Tage_DTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="5" column="23" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="86" column="111" selection-start-line="86" selection-start-column="111" selection-end-line="86" selection-end-column="111" />
<state relative-caret-position="202">
<caret line="54" column="36" selection-start-line="54" selection-start-column="36" selection-end-line="54" selection-end-column="36" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1181#1313#0" expanded="true" />
<element signature="e#1312#1313#0" expanded="true" />
</folding>
</state>
</provider>
@ -473,10 +512,12 @@
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
<last-edited>JunitTest</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
<option value="0.6" />
</list>
</option>
</splitter-proportions>

12
JunitTest/JunitTest.iml
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: Arquillian JUnit:Release" level="project" />
</component>
</module>

2
src/D_Test2.java
View File

@ -1,2 +0,0 @@
public class D_Test2 {
}

2
src/D_Test3.java
View File

@ -1,2 +0,0 @@
public class D_Test3 {
}

123
src/Main.java
View File

@ -1,6 +1,6 @@
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.*;
import java.awt.event.*;
public class Main {
//Variablen GUI
@ -11,90 +11,105 @@ public class Main {
JPanel contantPane = null;
JLabel label = null;
JMenuItem jmI = null;
JComboBox combobox_1;
//Konstruktor Gui
public Main(){
this.fr = new JFrame("Coutinius Integration");
this.fr.setSize(666,900);
this.jmb = new JMenuBar();
this.fr.setJMenuBar(jmb);
this.jm = new JMenu("Menu");
this.jmb.add(jm);
this.jmI = new JMenuItem("Exit");
this.jm.add(jmI);
this.jmI.addActionListener(new ActionListener1());
this.jm1 = new JMenu("Info");
this.jmb.add(jm1);
fr = new JFrame("Coutinius Integration SS 2019");
fr.setSize(600,900);
fr.setFont(new Font("Helvetica", Font.PLAIN, 12));
jmb = new JMenuBar();
fr.setJMenuBar(jmb);
jm = new JMenu("Menu");
jmb.add(jm);
jmI = new JMenuItem("Exit");
jm.add(jmI);
jmI.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ie) {
this.contantPane = new JPanel();
System.exit(-1);
}
});
jm1 = new JMenu("Info");
jmb.add(jm1);
this.fr.setContentPane(contantPane);
contantPane = new JPanel();
fr.setContentPane(contantPane);
this.contantPane.add(new JLabel("Ein Tool der CI!"));
contantPane.add(new JLabel("Ein Tool der CI!"));
this.contantPane.add(new JLabel("1) Tools von Daniel"));
contantPane.add(new JLabel("Tools von Daniel, Eugen, Michael"));
ButtonGroup buttonGroup = new ButtonGroup();
JRadioButton hzeit = new JRadioButton("Hochzeit");
hzeit.setBounds(100, 170, 100, 20);
buttonGroup.add(hzeit);
this.contantPane.add(hzeit);
JRadioButton gtag = new JRadioButton("Geburtstag");
gtag.setBounds(250, 170, 100, 20);
buttonGroup.add(gtag);
this.contantPane.add(gtag);
fr.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
System.exit(0);
}
});
combobox_1 = new JComboBox();
combobox_1.addItem("Daniels Tools");
combobox_1.addItem("Eugen Tools");
combobox_1.addItem("Michaels Tools");
fr.add(combobox_1);
JRadioButton DTools = new JRadioButton("Daniels Tools"); DTools.setBounds(100, 100, 100, 20);
buttonGroup.add(DTools); contantPane.add(DTools);
JRadioButton ETools = new JRadioButton("Eugen Tools"); ETools.setBounds(200, 100, 100, 20);
buttonGroup.add(ETools); contantPane.add(ETools);
JRadioButton MTools = new JRadioButton("Eugen Tools"); MTools.setBounds(300, 100, 100, 20);
buttonGroup.add(MTools); contantPane.add(MTools);
JLabel auswahl = new JLabel("Ihre Auswahl:");
auswahl.setBounds(10, 200, 100, 20);
this.contantPane.add(auswahl);
final JTextField text1 = new JTextField();
contantPane.add(auswahl);
final JTextField text1 = new JTextField("..Bisher keine Auswahl!..");
text1.setBounds(100, 200, 300, 20);
this.contantPane.add(text1);
contantPane.add(text1);
hzeit.addActionListener(new ActionListener() {
DTools.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ie) {
text1.setText("MALE");
}
});
text1.setText("Daniel Tools");
gtag.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ie) {
text1.setText("FEMALE");
}
});
ETools.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ie) {
text1.setText("Eugens Tools");
}
});
this.contantPane.add(new JLabel("2) Tools von Eugen"));
MTools.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ie) {
text1.setText("Michaels Tools");
}
});
contantPane.setVisible(true);
fr.setVisible(true);
fr.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
}
public static void main(String[] args) {
Main mn = new Main();
}
this.contantPane.add(new JLabel("3) Tools von Michael"));
}
this.contantPane.setVisible(true);
this.fr.setVisible(true);
}
public static void main(String[] args) {
System.out.println("Hello World!");
Main mn = new Main();
}
// Action Listener
private class ActionListener1 implements ActionListener{
@Override
public void actionPerformed(ActionEvent e) {
System.exit(0);
}
}
}

28
src/MainGUI.form
View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="MainGUI">
<grid id="27dc6" binding="panel1" default-binding="true" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="618" height="613"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<toolbar id="57dfb">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="-1" height="20"/>
</grid>
</constraints>
<properties/>
<border type="none"/>
<children/>
</toolbar>
<vspacer id="e597a">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
</children>
</grid>
</form>

5
src/MainGUI.java
View File

@ -1,5 +0,0 @@
import javax.swing.*;
public class MainGUI {
private JPanel panel1;
}

28
src/Tage_D.java
View File

@ -98,37 +98,9 @@ public class Tage_D extends JFrame {
this.fr.setVisible(true);
this.fr.setAlwaysOnTop(true);
DerHandler handler = new DerHandler();
menuItem1.addActionListener(handler);
gtag.addActionListener(handler);
hzeit.addActionListener(handler);
}
// Action Listener
private class DerHandler implements ActionListener {
@Override
public void actionPerformed(ActionEvent event) {
String string = "";
/*
if(event.getSource()=hzeit)
string=String.format("Name: %s", event.getActionCommand());
else if(event.getSource()==gtag)
string=String.format("passwortFeld2: %s", event.getActionCommand());
JOptionPane.showMessageDialog(null, string);
}
}
*/
}
}
public static void main(String[] args) {
Tage_D gb = new Tage_D();

Write Preview
Loading…
Cancel
Save