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

Commit #13.

master
MSeibert97 5 years ago
parent
e6b9033a56
commit
a72ed233dd
2 changed files with 25 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      .idea/workspace.xml
  2. 2
      src/FitnessTest_M.java

34
.idea/workspace.xml
View File

@ -32,8 +32,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/FitnessTest_M.java"> <entry file="file://$PROJECT_DIR$/src/FitnessTest_M.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="556">
<caret line="304" lean-forward="true" selection-start-line="304" selection-end-line="304" />
<state relative-caret-position="573">
<caret line="305" column="37" lean-forward="true" selection-start-line="305" selection-start-column="37" selection-end-line="305" selection-end-column="37" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#2063#2525#0" expanded="true" /> <element signature="e#2063#2525#0" expanded="true" />
@ -246,8 +246,8 @@
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.FitnessTest_M" /> <item itemvalue="Application.FitnessTest_M" />
<item itemvalue="JUnit.FitnessTest_M_Test" />
<item itemvalue="Application.Main" /> <item itemvalue="Application.Main" />
<item itemvalue="JUnit.FitnessTest_M_Test" />
<item itemvalue="Application.Quiz_Spiel" /> <item itemvalue="Application.Quiz_Spiel" />
<item itemvalue="Application.Tage_D" /> <item itemvalue="Application.Tage_D" />
</list> </list>
@ -509,7 +509,21 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1563283451442</updated> <updated>1563283451442</updated>
</task> </task>
<option name="localTasksCounter" value="34" />
<task id="LOCAL-00034" summary="Commit #11. Erste Berechnungsfunktionen für das Gesammtergebnis erstellt.">
<created>1563284513496</created>
<option name="number" value="00034" />
<option name="presentableId" value="LOCAL-00034" />
<option name="project" value="LOCAL" />
<updated>1563284513496</updated>
</task>
<task id="LOCAL-00035" summary="Commit #12 (Wiederholungscommit). Der Fitnesstest ist im Grunde Fertig. Eine Gesammtpunktzahl wird nun berechnet, falls der Bmi und die Fragen bestätigt wurden.">
<created>1563284689038</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1563284689038</updated>
</task>
<option name="localTasksCounter" value="36" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
@ -530,7 +544,7 @@
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17270789" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17270789" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" /> <window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" /> <window_info id="Designer" order="3" />
@ -540,7 +554,7 @@
<window_info anchor="bottom" id="Messages" order="0" sideWeight="0.49573562" weight="0.3261105" /> <window_info anchor="bottom" id="Messages" order="0" sideWeight="0.49573562" weight="0.3261105" />
<window_info anchor="bottom" id="Message" order="1" /> <window_info anchor="bottom" id="Message" order="1" />
<window_info anchor="bottom" id="Find" order="2" weight="0.3290461" /> <window_info anchor="bottom" id="Find" order="2" weight="0.3290461" />
<window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.4978678" visible="true" weight="0.1744312" />
<window_info anchor="bottom" id="Run" order="3" sideWeight="0.4978678" visible="true" weight="0.1744312" />
<window_info anchor="bottom" id="Debug" order="4" weight="0.3997344" /> <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="Cvs" order="5" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="6" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
@ -601,7 +615,6 @@
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="neue master" />
<MESSAGE value="geburtstag sauber" /> <MESSAGE value="geburtstag sauber" />
<MESSAGE value="Main bereinigt" /> <MESSAGE value="Main bereinigt" />
<MESSAGE value="junit klassen erst mal entfernen" /> <MESSAGE value="junit klassen erst mal entfernen" />
@ -626,7 +639,8 @@
<MESSAGE value="Der neunte Commit. Textfelder zu den Fragen wurden eingefügt" /> <MESSAGE value="Der neunte Commit. Textfelder zu den Fragen wurden eingefügt" />
<MESSAGE value="Commit #10. Bestätigungsbuttons eingefügt." /> <MESSAGE value="Commit #10. Bestätigungsbuttons eingefügt." />
<MESSAGE value="Commit #11. Erste Berechnungsfunktionen für das Gesammtergebnis erstellt." /> <MESSAGE value="Commit #11. Erste Berechnungsfunktionen für das Gesammtergebnis erstellt." />
<option name="LAST_COMMIT_MESSAGE" value="Commit #11. Erste Berechnungsfunktionen für das Gesammtergebnis erstellt." />
<MESSAGE value="Commit #12 (Wiederholungscommit). Der Fitnesstest ist im Grunde Fertig. Eine Gesammtpunktzahl wird nun berechnet, falls der Bmi und die Fragen bestätigt wurden." />
<option name="LAST_COMMIT_MESSAGE" value="Commit #12 (Wiederholungscommit). Der Fitnesstest ist im Grunde Fertig. Eine Gesammtpunktzahl wird nun berechnet, falls der Bmi und die Fragen bestätigt wurden." />
</component> </component>
<component name="com.intellij.coverage.CoverageDataManagerImpl"> <component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/Alpha_GOGS$Main.ic" NAME="Main Coverage Results" MODIFIED="1563229577210" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" /> <SUITE FILE_PATH="coverage/Alpha_GOGS$Main.ic" NAME="Main Coverage Results" MODIFIED="1563229577210" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
@ -731,8 +745,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/FitnessTest_M.java"> <entry file="file://$PROJECT_DIR$/src/FitnessTest_M.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="556">
<caret line="304" lean-forward="true" selection-start-line="304" selection-end-line="304" />
<state relative-caret-position="573">
<caret line="305" column="37" lean-forward="true" selection-start-line="305" selection-start-column="37" selection-end-line="305" selection-end-column="37" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#2063#2525#0" expanded="true" /> <element signature="e#2063#2525#0" expanded="true" />

2
src/FitnessTest_M.java
View File

@ -296,7 +296,7 @@ public class FitnessTest_M extends JFrame {
if(e.getSource() == totalscore_submit) { if(e.getSource() == totalscore_submit) {
float sum = (points1+points2+points3+points4+points5)/5; float sum = (points1+points2+points3+points4+points5)/5;
JOptionPane.showMessageDialog(null, JOptionPane.showMessageDialog(null,
"Ihre Gesammtfitnesspunktzahl betraegt:\n" + sum,
"Ihre Gesammtfitnesspunktzahl betraegt:\n" + sum + "\n (Skala von 1-10)",
"Testergebnis", "Testergebnis",
JOptionPane.WARNING_MESSAGE); JOptionPane.WARNING_MESSAGE);
} }

Write Preview
Loading…
Cancel
Save