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

Fehler behoben,,,,fehlt noch JArea Funktion für Gesamtgewinn

new_repo
Komlovski 6 years ago
parent
05ffd28219
commit
81181d91f5
2 changed files with 28 additions and 32 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. 50
      .idea/workspace.xml
  2. 10
      src/Quiz_Spiel.java

50
.idea/workspace.xml
View File

@ -2,12 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="41dc023d-0769-466f-850a-8e3eed9fe5fa" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.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/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Quiz.form" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Quiz.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/Quiz_Spiel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Quiz_Spiel.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -24,8 +20,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Quiz_Spiel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="39" column="21" lean-forward="true" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
<state relative-caret-position="-1437">
<caret line="272" column="56" selection-start-line="272" selection-start-column="56" selection-end-line="272" selection-end-column="56" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -48,7 +44,7 @@
<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="-1688">
<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" />
@ -97,9 +93,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/Quiz_Spiel.java" />
<option value="$PROJECT_DIR$/src/Tage_D.java" />
<option value="$PROJECT_DIR$/src/Main.java" />
<option value="$PROJECT_DIR$/src/Quiz_Spiel.java" />
</list>
</option>
</component>
@ -116,7 +112,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -139,6 +134,7 @@
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -245,6 +241,7 @@
<workItem from="1562856644601" duration="8772000" />
<workItem from="1562929796678" duration="3793000" />
<workItem from="1563047167511" duration="5798000" />
<workItem from="1563187286048" duration="518000" />
</task>
<task id="LOCAL-00001" summary="neue master">
<created>1562341097724</created>
@ -393,17 +390,24 @@
<option name="project" value="LOCAL" />
<updated>1562934759261</updated>
</task>
<option name="localTasksCounter" value="22" />
<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>
<option name="localTasksCounter" value="23" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="42203000" />
<option name="totallyTimeSpent" value="42721000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22012103" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22314675" />
<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" />
@ -451,7 +455,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" />
<option name="LAST_COMMIT_MESSAGE" value="Tage_D Generator angepasst mit Zeitpunkt Änderung größer dieses Jahres" />
<MESSAGE value="jAVA Goooooggle Style importiert und angewendet" />
<option name="LAST_COMMIT_MESSAGE" value="jAVA Goooooggle Style importiert und angewendet" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/testJFrame.java" />
@ -491,19 +496,10 @@
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2320">
<caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Quiz.java" />
<entry file="file://$PROJECT_DIR$/src/Tage_D.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1688">
<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" />
@ -523,8 +519,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/Quiz_Spiel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="39" column="21" lean-forward="true" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
<state relative-caret-position="-1437">
<caret line="272" column="56" selection-start-line="272" selection-start-column="56" selection-end-line="272" selection-end-column="56" />
<folding>
<element signature="imports" expanded="true" />
</folding>

10
src/Quiz_Spiel.java
View File

@ -173,7 +173,7 @@ public class Quiz_Spiel extends JFrame {
if(textfield_4.getText().startsWith("C") || textfield_4.getText().startsWith("c") ) {
System.out.println("ja");
textfield_4.setText("Richtig ! Gewinn 1000 Euro");
textfield_4.setText("Richtig ! Gewinn 2000 Euro");
JOptionPane.showMessageDialog(null,
"Herzlichen Glückwunsch , Sie sind nicht so dumm, wie ich dachte !",
"Eine Nachricht",
@ -197,7 +197,7 @@ public class Quiz_Spiel extends JFrame {
if(textfield_9.getText().startsWith("C") || textfield_9.getText().startsWith("c") ) {
System.out.println("ja");
textfield_9.setText("Richtig ! Gewinn 1000 Euro");
textfield_9.setText("Richtig ! Gewinn 2000 Euro");
JOptionPane.showMessageDialog(null,
"Herzlichen Glückwunsch, Sie haben 10000 Euro gewonnen!",
"Eine Nachricht",
@ -221,7 +221,7 @@ public class Quiz_Spiel extends JFrame {
if(textfield_8.getText().startsWith("A") || textfield_8.getText().startsWith("a") ) {
System.out.println("ja");
textfield_8.setText("Richtig ! Gewinn 1000 Euro");
textfield_8.setText("Richtig ! Gewinn 2000 Euro");
JOptionPane.showMessageDialog(null,
"Gut gemacht, Egal wie leer du bist - es gibt Menschen die sind Lehrer!",
"Eine Nachricht",
@ -245,7 +245,7 @@ public class Quiz_Spiel extends JFrame {
if(textfield_7.getText().startsWith("C") || textfield_7.getText().startsWith("c") ) {
System.out.println("ja");
textfield_7.setText("Richtig ! Gewinn 1000 Euro");
textfield_7.setText("Richtig ! Gewinn 2000 Euro");
JOptionPane.showMessageDialog(null,
"HA, gut geraten! Wo ist der beste Ort um eine Leiche zu verstecken? Seite 2 auf Google ",
"Eine Nachricht",
@ -270,7 +270,7 @@ public class Quiz_Spiel extends JFrame {
if(textfield_5.getText().startsWith("B") || textfield_5.getText().startsWith("b") ) {
System.out.println("ja");
textfield_5.setText("Richtig ! Gewinn 1000 Euro");
textfield_5.setText("Richtig ! Gewinn 2000 Euro");
JOptionPane.showMessageDialog(null,
"Wie viele Windows-Anwender braucht man, um eine Glühbirne zu wechseln? – 100. Einer schraubt und 99 klicken die Fehlermeldungen weg.",
"Eine Nachricht",

Write Preview
Loading…
Cancel
Save