Browse Source

Merge remote-tracking branch 'origin/master'

master
MSeibert97 5 years ago
parent
commit
6245971700
  1. 2
      .idea/misc.xml
  2. 9
      .idea/workspace.xml
  3. 2
      src/FitnessTest_M.java
  4. 17
      src/Quiz_SpielTest_2.java

2
.idea/misc.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="true" project-jdk-name="9" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

9
.idea/workspace.xml

@ -190,7 +190,7 @@
</method> </method>
</configuration> </configuration>
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="ALTERNATIVE_JRE_PATH" value="9" />
<option name="ALTERNATIVE_JRE_PATH" value="11" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="MAIN_CLASS_NAME" value="Main" /> <option name="MAIN_CLASS_NAME" value="Main" />
<module name="Alpha" /> <module name="Alpha" />
@ -212,6 +212,13 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<list>
<item itemvalue="Application.D_Geburtstag" />
<item itemvalue="Application.D_Test1" />
<item itemvalue="Application.Main" />
<item itemvalue="Application.Quiz_Spiel" />
<item itemvalue="Application.Tage_D" />
</list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.FitnessTest_M" /> <item itemvalue="Application.FitnessTest_M" />

2
src/FitnessTest_M.java

@ -1,5 +1,5 @@
import javax.swing.*; import javax.swing.*;
import java.awt.*;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;

17
src/Quiz_SpielTest_2.java

@ -0,0 +1,17 @@
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
class Quiz_SpielTest_2 {
@Test
void main() {
try{
Main mn = new Main();
}catch(Exception e){
System.out.println(e.toString());
}
}
}
Loading…
Cancel
Save