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

Main und Tage_D erweitert um neue Menübutton und Funktionen optimiert auf Darstellung. Nun werden Zeilen auch direkt neben einander gezeigt.

new_repo
Hauch IT 6 years ago
parent
bc0e3610c9
commit
da51a41cfa
7 changed files with 284 additions and 182 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. 94
      .idea/libraries/Drools_6_2_0.xml
  2. 2
      .idea/misc.xml
  3. 229
      .idea/workspace.xml
  4. 15
      Alpha.iml
  5. 41
      src/Main.java
  6. 61
      src/Tage_D.java
  7. 24
      src/Tage_DTest.java

94
.idea/libraries/Drools_6_2_0.xml
View File

@ -0,0 +1,94 @@
<component name="libraryTable">
<library name="Drools-6.2.0" type="Drools">
<properties version="6.2.0" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/drools-decisiontables-6.2.0.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/drools-jsr94-6.2.0.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/drools-core-6.2.0.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/drools-compiler-6.2.0.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/drools-persistence-jpa-6.2.0.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/drools-templates-6.2.0.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kie-api-6.2.0.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kie-internal-6.2.0.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/drools-verifier-6.2.0.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kie-ci-6.2.0.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jboss-interceptors-api_1.1_spec-1.0.1.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jboss-transaction-api_1.1_spec-1.0.1.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/aether-api-1.0.0.v20140518.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/aether-connector-basic-1.0.0.v20140518.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/aether-impl-1.0.0.v20140518.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/aether-transport-file-1.0.0.v20140518.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/aether-spi-1.0.0.v20140518.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/aether-transport-http-1.0.0.v20140518.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/aether-transport-wagon-1.0.0.v20140518.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/aether-util-1.0.0.v20140518.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/ant-1.8.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/ant-launcher-1.8.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/aopalliance-1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/cdi-api-1.0-SP4.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-logging-1.1.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-codec-1.4.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/dom4j-1.6.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/antlr-runtime-3.5.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/ecj-4.3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/httpclient-4.3.6.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/itext-2.1.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/guava-13.0.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javassist-3.18.1-GA.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javax.inject-1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jcl-over-slf4j-1.7.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/httpcore-4.3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jsr250-api-1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/maven-artifact-3.2.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/maven-aether-provider-3.2.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jsoup-1.7.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/jsr94-1.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/maven-core-3.2.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/maven-model-builder-3.2.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/maven-model-3.2.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/maven-compat-3.2.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/maven-plugin-api-3.2.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/maven-repository-metadata-3.2.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/mvel2-2.2.4.Final.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/maven-settings-3.2.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/maven-settings-builder-3.2.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/plexus-cipher-1.4.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/plexus-component-annotations-1.5.5.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/org.eclipse.sisu.inject-0.0.0.M5.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/org.eclipse.sisu.plexus-0.0.0.M5.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/plexus-classworlds-2.5.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/plexus-interpolation-1.19.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/plexus-sec-dispatcher-1.3.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/poi-ooxml-3.10.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/poi-3.10.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/plexus-utils-3.0.17.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/sisu-guice-3.1.0-no_aop.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/slf4j-api-1.7.2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/poi-ooxml-schemas-3.10.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/stax-api-1.0.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/wagon-http-2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/wagon-http-shared4-2.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/wagon-provider-api-1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/xml-apis-1.3.04.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/xpp3_min-1.1.4c.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/xmlpull-1.1.3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/xmlbeans-2.3.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/xstream-1.4.7.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/protobuf-java-2.5.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/drools-compiler-6.2.0.Final-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/drools-core-6.2.0.Final-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/drools-decisiontables-6.2.0.Final-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/drools-jsr94-6.2.0.Final-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/drools-persistence-jpa-6.2.0.Final-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/drools-verifier-6.2.0.Final-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kie-api-6.2.0.Final-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/drools-templates-6.2.0.Final-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kie-internal-6.2.0.Final-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/kie-ci-6.2.0.Final-sources.jar!/" />
</SOURCES>
</library>
</component>

2
.idea/misc.xml
View File

@ -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>

229
.idea/workspace.xml
View File

@ -2,10 +2,13 @@
<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_SpielTest.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__Arquillian_TestNG_Release.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__Arquillian_TestNG_Release.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Drools_6_2_0.xml" afterDir="false" />
<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$/src/Quiz_Spiel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Quiz_Spiel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Alpha.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Alpha.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.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/Tage_DTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tage_DTest.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -19,32 +22,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="155">
<caret line="12" column="16" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Quiz_SpielTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<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="2159">
<caret line="131" column="20" selection-start-line="131" selection-start-column="20" selection-end-line="131" selection-end-column="46" />
<state relative-caret-position="315">
<caret line="55" column="22" selection-start-line="55" selection-start-column="22" selection-end-line="55" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -52,11 +34,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Tage_D.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="35" column="8" selection-start-line="35" selection-start-column="8" selection-end-line="35" selection-end-column="30" />
<state relative-caret-position="511">
<caret line="143" column="79" selection-start-line="143" selection-start-column="79" selection-end-line="143" selection-end-column="79" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -104,18 +86,17 @@
<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/Quiz_Spiel.java" />
<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/Quiz_Spiel.java" />
<option value="$PROJECT_DIR$/src/Quiz_SpielTest.java" />
<option value="$PROJECT_DIR$/src/Tage_D.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-7" />
<option name="width" value="974" />
<option name="height" value="1057" />
<option name="x" value="793" />
<option name="width" value="814" />
<option name="height" value="877" />
</component>
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
@ -125,8 +106,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -148,6 +127,8 @@
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -167,7 +148,7 @@
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="restartRequiresConfirmation" value="false" />
<property name="settings.editor.selected.configurable" value="preferences.sourceCode.Java" />
<property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
</component>
<component name="RecentsManager">
<key name="CreateTestDialog.RecentsKey">
@ -189,7 +170,14 @@
</list>
</option>
</component>
<component name="RunManager" selected="JUnit.Quiz_SpielTest.main">
<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="D_Test1" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="D_Test1" />
<module name="Alpha" />
@ -218,23 +206,13 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Quiz_SpielTest.main" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="Alpha" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="Quiz_SpielTest" />
<option name="METHOD_NAME" value="main" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<recent_temporary>
<list>
<item itemvalue="JUnit.Quiz_SpielTest.main" />
<item itemvalue="Application.Main" />
<item itemvalue="Application.Quiz_Spiel" />
<item itemvalue="Application.Tage_D" />
<item itemvalue="Application.D_Test1" />
<item itemvalue="Application.D_Geburtstag" />
</list>
</recent_temporary>
</component>
@ -262,8 +240,6 @@
<workItem from="1562856644601" duration="8772000" />
<workItem from="1562929796678" duration="3793000" />
<workItem from="1563047167511" duration="5798000" />
<workItem from="1563187286048" duration="707000" />
<workItem from="1563210526148" duration="2006000" />
</task>
<task id="LOCAL-00001" summary="neue master">
<created>1562341097724</created>
@ -412,49 +388,29 @@
<option name="project" value="LOCAL" />
<updated>1562934759261</updated>
</task>
<task id="LOCAL-00022" summary="jAVA Goooooggle Style importiert und angewendet">
<created>1563187501151</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1563187501151</updated>
</task>
<task id="LOCAL-00023" summary="Fehler behoben,,,,fehlt noch JArea Funktion für Gesamtgewinn">
<created>1563187869684</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1563187869684</updated>
</task>
<task id="LOCAL-00024" summary="JArea Funktion für Gesamtgewinn läuft">
<created>1563212329500</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1563212329500</updated>
</task>
<option name="localTasksCounter" value="25" />
<option name="localTasksCounter" value="22" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="44916000" />
<option name="totallyTimeSpent" value="44872000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
<frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22617246" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14712153" />
<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" sideWeight="0.49848714" weight="0.32718894" />
<window_info anchor="bottom" id="Java Enterprise" />
<window_info anchor="bottom" id="Messages" order="0" weight="0.3279743" />
<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.33179724" />
<window_info anchor="bottom" id="Debug" order="4" sideWeight="0.49924356" weight="0.39938557" />
<window_info anchor="bottom" id="Find" order="2" weight="0.3290461" />
<window_info active="true" anchor="bottom" id="Run" order="3" visible="true" weight="0.33440515" />
<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" />
@ -462,7 +418,8 @@
<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" sideWeight="0.50075644" side_tool="true" weight="0.33333334" />
<window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
<window_info anchor="right" id="CDI" />
<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" />
@ -473,6 +430,39 @@
<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.14712153" />
<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="Java Enterprise" order="0" />
<window_info anchor="bottom" id="Messages" order="1" weight="0.3279743" />
<window_info anchor="bottom" id="Message" order="2" />
<window_info anchor="bottom" id="Find" order="3" weight="0.3290461" />
<window_info active="true" anchor="bottom" id="Run" order="4" visible="true" weight="0.33466136" />
<window_info anchor="bottom" id="Debug" order="5" weight="0.3997344" />
<window_info anchor="bottom" id="Cvs" order="6" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="8" />
<window_info anchor="bottom" id="Docker" order="9" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="10" weight="0.32802126" />
<window_info anchor="bottom" id="Database Changes" order="11" />
<window_info anchor="bottom" id="Terminal" order="12" weight="0.3290461" />
<window_info anchor="bottom" id="Event Log" order="13" side_tool="true" />
<window_info anchor="right" id="CDI" order="0" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
<window_info anchor="right" id="Palette" order="4" />
<window_info anchor="right" id="Theme Preview" order="5" />
<window_info anchor="right" id="Maven" order="6" />
<window_info anchor="right" id="Capture Analysis" order="7" />
<window_info anchor="right" id="Palette&#9;" order="8" />
<window_info anchor="right" id="Database" order="9" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
@ -491,10 +481,8 @@
<MESSAGE value="Verbesserung Main und Erweiterung Tage_D" />
<MESSAGE value="Tage_D Zufallsgenerator erstellt." />
<MESSAGE value="Tage_D Generator angepasst mit Zeitpunkt Änderung größer dieses Jahres" />
<MESSAGE value="jAVA Goooooggle Style importiert und angewendet" />
<MESSAGE value="Fehler behoben,,,,fehlt noch JArea Funktion für Gesamtgewinn" />
<MESSAGE value="JArea Funktion für Gesamtgewinn läuft" />
<option name="LAST_COMMIT_MESSAGE" value="JArea Funktion für Gesamtgewinn läuft" />
<MESSAGE value="Main und Tage_D erweitert um neue Menübutton und Funktionen optimiert auf Darstellung. Nun werden Zeilen auch direkt neben einander gezeigt." />
<option name="LAST_COMMIT_MESSAGE" value="Main und Tage_D erweitert um neue Menübutton und Funktionen optimiert auf Darstellung. Nun werden Zeilen auch direkt neben einander gezeigt." />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/testJFrame.java" />
@ -524,69 +512,74 @@
<entry file="file://$PROJECT_DIR$/src/MainGUI.form" />
<entry file="file://$PROJECT_DIR$/src/D_Test2.java" />
<entry file="file://$PROJECT_DIR$/src/D_Test3.java" />
<entry file="file://$PROJECT_DIR$/JunitTest/JunitTest.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/JunitTest/src/Tage_DTest.java" />
<entry file="jar://C:/Program Files/Java/jdk1.8.0_111/src.zip!/javax/swing/JFrame.java" />
<entry file="jar://C:/Program Files/Java/jdk1.8.0_111/src.zip!/javax/swing/JRootPane.java" />
<entry file="file://$PROJECT_DIR$/src/bild.jpg" />
<entry file="file://$PROJECT_DIR$/src/bild.gif" />
<entry file="file://$PROJECT_DIR$/src/bild1.jpg" />
<entry file="file://$PROJECT_DIR$/src/bild2.jpg" />
<entry file="file://$PROJECT_DIR$/src/Quiz.java" />
<entry file="file://$PROJECT_DIR$/src/Main.java">
<entry file="jar://C:/Program Files/Java/jdk1.8.0_111/src.zip!/javax/swing/JFrame.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2159">
<caret line="131" column="20" selection-start-line="131" selection-start-column="20" selection-end-line="131" selection-end-column="46" />
<state relative-caret-position="151">
<caret line="697" column="22" selection-start-line="697" selection-start-column="22" selection-end-line="697" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#24496#24497#0" expanded="true" />
<element signature="e#24553#24554#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Tage_D.java">
<entry file="jar://C:/Program Files/Java/jdk1.8.0_111/src.zip!/javax/swing/JRootPane.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="35" column="8" selection-start-line="35" selection-start-column="8" selection-end-line="35" selection-end-column="30" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="814">
<caret line="620" column="18" selection-start-line="620" selection-start-column="18" selection-end-line="620" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="jar://C:/Program Files/Java/jdk-11.0.2/lib/src.zip!/java.desktop/java/awt/LayoutManager.java">
<entry file="file://$PROJECT_DIR$/src/bild.jpg" />
<entry file="file://$PROJECT_DIR$/src/bild.gif" />
<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/Quiz_Spiel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="768">
<caret line="69" column="14" selection-start-line="69" selection-start-column="14" selection-end-line="69" selection-end-column="14" />
<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="jar://C:/Program Files/Java/jdk-11.0.2/lib/src.zip!/java.desktop/java/awt/event/ActionListener.java">
<entry file="file://$PROJECT_DIR$/src/Tage_DTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="50" column="16" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="16" />
<state relative-caret-position="238">
<caret line="18" column="5" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/JunitTest/JunitTest.iml">
<entry file="file://$PROJECT_DIR$/src/Quiz_SpielTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="9" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
<state>
<caret column="35" selection-start-column="35" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Quiz_Spiel.java">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="155">
<caret line="12" column="16" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
<state relative-caret-position="315">
<caret line="55" column="22" selection-start-line="55" selection-start-column="22" selection-end-line="55" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Quiz_SpielTest.java">
<entry file="file://$PROJECT_DIR$/src/Tage_D.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
<state relative-caret-position="511">
<caret line="143" column="79" selection-start-line="143" selection-start-column="79" selection-end-line="143" selection-end-column="79" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>

15
Alpha.iml
View File

@ -42,5 +42,20 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Maven: Arquillian JUnit:Release" level="project" />
<orderEntry type="library" name="Drools-6.2.0" level="project" />
<orderEntry type="library" name="Drools-6.2.0" level="project" />
<orderEntry type="module-library" scope="TEST">
<library name="JUnit5.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.5.0/junit-jupiter-api-5.5.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.5.0/junit-platform-commons-1.5.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

41
src/Main.java
View File

@ -12,6 +12,7 @@ public class Main {
JMenuItem menuItem1 = null;
JMenuItem menuItem2 = null;
JMenuItem menuItem3 = null;
JMenuBar bar =null;
JMenu mF= null;
JMenu mH = null;
@ -38,30 +39,48 @@ public class Main {
bar.add(mH);
bar.add(mI);
menuItem1 = new JMenuItem("Exit"); mF.add(menuItem1);
menuItem2 = new JMenuItem("Über"); mI.add(menuItem2);
menuItem1 = new JMenuItem("Hauptprogramm"); mF.add(menuItem1);
menuItem2 = new JMenuItem("Exit"); mF.add(menuItem2);
menuItem3 = new JMenuItem("Über"); mI.add(menuItem3);
menuItem1.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ie) {
try {
System.exit(-1);
JOptionPane.showMessageDialog(fr, "Wir wechseln zum Hauptprogramm");
Main mn = new Main();
fr.setVisible((false));
Panele.setVisible(false);
mn.fr.setVisible(true);
//System.exit(0);
}catch (Exception ex) {
JOptionPane.showMessageDialog(null, "Fehler");
}
}
});
menuItem2.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ie) {
try {
JOptionPane.showMessageDialog(fr, "Tools entwickelt für CI 2019 Copyright by DEM Consulting");
System.exit(-1);
}catch (Exception ex) {
JOptionPane.showMessageDialog(null, "Fehler");
}
}
});
menuItem3.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ie) {
try {
JOptionPane.showMessageDialog(fr, "Tools entwickelt für CI 2019 Copyright by DEM Consulting");
}catch (Exception ex) {
JOptionPane.showMessageDialog(null, "Fehler");
}
}
});
@ -71,10 +90,7 @@ public class Main {
}
});
Panele.add(new JLabel("CI Tools von "));
ButtonGroup buttonGroup = new ButtonGroup();
JButton DTools = new JButton("Daniel"); DTools.setBounds(100, 100, 100, 40);
@ -94,11 +110,9 @@ public class Main {
fr.setVisible(false);
Tage_D gb = new Tage_D();
}catch (Exception ex) {
JOptionPane.showMessageDialog(null, "Fehler beim Aufruf von Daniels Tools");
}
}
});
@ -108,18 +122,14 @@ public class Main {
JOptionPane.showMessageDialog(fr, "Aufruf von Eugens Tools");
//fr.setVisible(false);
Quiz_Spiel window = new Quiz_Spiel();
window.setTitle("Quiz_Spiel");
window.pack();
window.show();
}catch (Exception ex) {
JOptionPane.showMessageDialog(null, "Fehler beim Aufruf von Eugens Tools");
}
}
});
@ -135,13 +145,11 @@ public class Main {
}catch (Exception ex) {
JOptionPane.showMessageDialog(null, "Fehler beim Aufruf von Michaels Tools");
}
}
});
Panele.setVisible(true);
this.fr.setVisible(true);
this.fr.setAlwaysOnTop(true);
this.fr.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
}
@ -149,5 +157,4 @@ public class Main {
Main mn = new Main();
}
}

61
src/Tage_D.java
View File

@ -15,20 +15,17 @@ public class Tage_D extends JFrame {
JFrame fr = null;
JPanel Panele = null;
JButton button1 = null;
JTextField j1 = null;
JTextField j2 = null;
JTextField j3 = null;
JTextField j4 = null;
JTextField j5 = null;
JTextField j6 = null;
JMenuItem menuItem1 = null;
JMenuItem menuItem2 = null;
JMenuItem menuItem3 = null;
JMenuBar bar =null;
JMenu mF= null;
JMenu mH = null;
JMenu mI = null;
Date datum = null;
public Tage_D() {
@ -38,10 +35,8 @@ public class Tage_D extends JFrame {
fr.setLayout(new FlowLayout());
Panele = new JPanel();
fr.setContentPane(Panele);
bar = new JMenuBar();
fr.setJMenuBar(bar);
mF = new JMenu("File");
@ -51,30 +46,45 @@ public class Tage_D extends JFrame {
bar.add(mH);
bar.add(mI);
menuItem1 = new JMenuItem("Exit"); mF.add(menuItem1);
menuItem2 = new JMenuItem("Über"); mI.add(menuItem2);
menuItem1 = new JMenuItem("Hauptprogramm"); mF.add(menuItem1);
menuItem2 = new JMenuItem("Exit"); mF.add(menuItem2);
menuItem3 = new JMenuItem("Über"); mI.add(menuItem3);
menuItem1.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ie) {
try {
System.exit(-1);
JOptionPane.showMessageDialog(fr, "Wir wechseln zum Hauptprogramm");
Main mn = new Main();
fr.setVisible((false));
Panele.setVisible(false);
mn.fr.setVisible(true);
//System.exit(0);
}catch (Exception ex) {
JOptionPane.showMessageDialog(null, "Fehler");
}
}
});
menuItem2.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ie) {
try {
JOptionPane.showMessageDialog(fr, "Tools entwickelt für CI 2019 Copyright by DEM Consulting");
System.exit(-1);
}catch (Exception ex) {
JOptionPane.showMessageDialog(null, "Fehler");
}
}
});
menuItem3.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ie) {
try {
JOptionPane.showMessageDialog(fr, "Tools entwickelt für CI 2019 Copyright by DEM Consulting");
}catch (Exception ex) {
JOptionPane.showMessageDialog(null, "Fehler");
}
}
});
@ -84,21 +94,12 @@ public class Tage_D extends JFrame {
}
});
Date datum=new Date();
int year=datum.getYear() + 1900;
/*
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); ; bar.add(j1);
j2 = new JTextField("Geben Sie hier jeweils nach Auswahl: Geburtsjahr, Hohchzeitsjahr, aktuelles Jahr ein! Bsp. 1969"); j2.setEditable(false); Panele.add(j2); j2.setSize(450,30); Panele.add(j2);
j3 = new JTextField("1969"); j3.setEditable(true); Panele.add(j2); j3.setSize(450,30); Panele.add(j3);
int year=datum.getYear() + 1900;
j1 = new JTextField("Tools von Daniel Hauch",10); j1.setEditable(false); j1.setSize(450,30); ; bar.add(j1);
j2 = new JTextField("Geben Sie hier jeweils nach Auswahl: Geburtsjahr, Hohchzeitsjahr, aktuelles Jahr ein! Bsp. 1969",50); j2.setEditable(false); Panele.add(j2); j2.setSize(450,30); Panele.add(j2);
j3 = new JTextField("1969",10); j3.setEditable(true); Panele.add(j2); j3.setSize(450,30); Panele.add(j3);
ButtonGroup buttonGroup = new ButtonGroup();
JButton szeit= new JButton("Sterbezeitpunkt Erfahren");
@ -109,9 +110,7 @@ public class Tage_D extends JFrame {
public void actionPerformed(ActionEvent ie) {
int ergebnis, zufall, zahl, i;
zahl = Integer.parseInt(j3.getText());
zufall= gibZufall(zahl);
while(zufall<=year){
@ -121,7 +120,6 @@ public class Tage_D extends JFrame {
}
String resultat = new String("Sie werden im Jahre "+zufall+" möglicherweise sterben!");
j4.setText(resultat);
}
});
@ -134,25 +132,18 @@ public class Tage_D extends JFrame {
public void actionPerformed(ActionEvent ie) {
int diamant, gold, silber, zufall, zahl, i;
zahl = Integer.parseInt(j3.getText());
diamant=zahl+60;
gold=zahl+50;
silber=zahl+25;
String resultat = new String("Sie werden im Jahr "+silber+" Ihre Silberhochzeit, im Jahr "+gold+" Ihre Goldene Hochzeit und im Jahr "+diamant+" Diamanten Hochzeit feiern.");
j4.setText(resultat);
}
});
j4 = new JTextField("Hier erfahren Sie Ergebnisse aus Ihrer Auswahl"); Panele.add(j4);
j4 = new JTextField("Hier erfahren Sie Ergebnisse aus Ihrer Auswahl",8 0); Panele.add(j4);
fr.setVisible(true);
fr.setAlwaysOnTop(true);
fr.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
}
//Methode gibt eine ganze Zahl (int) zurück

24
src/Tage_DTest.java
View File

@ -1,18 +1,20 @@
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
class Tage_DTest {
import static org.junit.jupiter.api.Assertions.*;
@Test
void main() {
class Tage_DTest {
try{
Tage_D window = new Tage_D();
}catch(Exception e){
System.out.println(e.toString());
@BeforeEach
void setUp() {
}
@AfterEach
void tearDown() {
}
}
}
@Test
void gibZufall() {
}
}
Write Preview
Loading…
Cancel
Save