Add
This commit is contained in:
parent
a160d96046
commit
69653e2de9
28 changed files with 312 additions and 44 deletions
13
.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
generated
Normal file
13
.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml
generated
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<component name="libraryTable">
|
||||
<library name="Maven: org.apiguardian:apiguardian-api:1.1.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
||||
13
.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml
generated
Normal file
13
.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml
generated
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<component name="libraryTable">
|
||||
<library name="Maven: org.junit.jupiter:junit-jupiter-api:5.7.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.7.0/junit-jupiter-api-5.7.0.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.7.0/junit-jupiter-api-5.7.0-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.7.0/junit-jupiter-api-5.7.0-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
||||
13
.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml
generated
Normal file
13
.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml
generated
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<component name="libraryTable">
|
||||
<library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.7.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.7.0/junit-jupiter-engine-5.7.0.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.7.0/junit-jupiter-engine-5.7.0-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.7.0/junit-jupiter-engine-5.7.0-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
||||
13
.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml
generated
Normal file
13
.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml
generated
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<component name="libraryTable">
|
||||
<library name="Maven: org.junit.platform:junit-platform-commons:1.7.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.7.0/junit-platform-commons-1.7.0.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.7.0/junit-platform-commons-1.7.0-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.7.0/junit-platform-commons-1.7.0-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
||||
13
.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml
generated
Normal file
13
.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml
generated
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<component name="libraryTable">
|
||||
<library name="Maven: org.junit.platform:junit-platform-engine:1.7.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.7.0/junit-platform-engine-1.7.0.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.7.0/junit-platform-engine-1.7.0-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.7.0/junit-platform-engine-1.7.0-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
||||
13
.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
generated
Normal file
13
.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml
generated
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<component name="libraryTable">
|
||||
<library name="Maven: org.opentest4j:opentest4j:1.2.0">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
||||
13
.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
generated
Normal file
13
.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
generated
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<component name="libraryTable">
|
||||
<library name="Maven: org.slf4j:slf4j-api:1.7.25">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
||||
13
.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_25.xml
generated
Normal file
13
.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_25.xml
generated
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<component name="libraryTable">
|
||||
<library name="Maven: org.slf4j:slf4j-simple:1.7.25">
|
||||
<CLASSES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.7.25/slf4j-simple-1.7.25.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.7.25/slf4j-simple-1.7.25-javadoc.jar!/" />
|
||||
</JAVADOC>
|
||||
<SOURCES>
|
||||
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-simple/1.7.25/slf4j-simple-1.7.25-sources.jar!/" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
||||
12
.idea/misc.xml
generated
12
.idea/misc.xml
generated
|
|
@ -1,5 +1,17 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="JavadocGenerationManager">
|
||||
<option name="OUTPUT_DIRECTORY" value="$PROJECT_DIR$/documentation/javadoc" />
|
||||
<option name="OPTION_SCOPE" value="private" />
|
||||
<option name="OTHER_OPTIONS" value="-encoding utf8 -docencoding utf8 -charset utf8" />
|
||||
</component>
|
||||
<component name="MavenProjectsManager">
|
||||
<option name="originalFiles">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/pom.xml" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="false" project-jdk-name="15" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
|
|
|
|||
2
.idea/modules.xml
generated
2
.idea/modules.xml
generated
|
|
@ -2,7 +2,7 @@
|
|||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/ProjetGenieLogicielLoto.iml" filepath="$PROJECT_DIR$/.idea/ProjetGenieLogicielLoto.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/ProjetGenieLogicielLoto.iml" filepath="$PROJECT_DIR$/ProjetGenieLogicielLoto.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
107
.idea/workspace.xml
generated
107
.idea/workspace.xml
generated
|
|
@ -1,19 +1,68 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AnalysisUIOptions">
|
||||
<option name="SCOPE_TYPE" value="3" />
|
||||
</component>
|
||||
<component name="AutoImportSettings">
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="ee2b29f3-c65a-4562-a15d-1c69b8d607f3" name="Default Changelist" comment="" />
|
||||
<list default="true" id="ee2b29f3-c65a-4562-a15d-1c69b8d607f3" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_simple_1_7_25.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/test/java/fr/myny/gui/GuiTest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/fr/myny/gui/Gui.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/fr/myny/gui/Gui.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/fr/myny/gui/PrimaryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/fr/myny/gui/SceneController.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/java/module-info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/module-info.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/fr/myny/gui/popup.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fr/myny/gui/popup.fxml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/fr/myny/gui/primary.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fr/myny/gui/primary.fxml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/fr/myny/gui/scene1.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fr/myny/gui/scene1.fxml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/fr/myny/gui/scene2.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fr/myny/gui/scene2.fxml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/fr/myny/gui/scene3.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fr/myny/gui/scene3.fxml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main/resources/fr/myny/gui/scene4.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/fr/myny/gui/scene4.fxml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/test/java/fr/myny/data/DataCsvTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/fr/myny/data/DataCsvTest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/test/java/fr/myny/data/ImportDataTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/fr/myny/data/ImportDataTest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/test/java/fr/myny/database/DataBaseTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/fr/myny/database/DataBaseTest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/test/java/fr/myny/grid/BuildGridTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/fr/myny/grid/BuildGridTest.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/test/java/fr/myny/stats/StatisticsTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/fr/myny/stats/StatisticsTest.java" afterDir="false" />
|
||||
</list>
|
||||
<list id="82b9050f-91f2-4c9a-ad00-c2f040dc8ec8" name="Revert "Revert "Useless""" comment="Revert "Revert "Useless"" This reverts commit 1e892228">
|
||||
<change beforePath="$PROJECT_DIR$/apiguardian-api-1.1.0.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/junit-jupiter-5.5.2.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/junit-jupiter-api-5.5.2.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/junit-jupiter-engine-5.5.2.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/junit-jupiter-params-5.5.2.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/junit-platform-commons-1.5.2.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/junit-platform-engine-1.5.2.jar" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/opentest4j-1.2.0.jar" beforeDir="false" />
|
||||
</list>
|
||||
<list id="790c1f6e-aa4f-4783-b5b4-eb64a57ba738" name="Revert "Useless"" comment="Revert "Useless" This reverts commit ff9c3448" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
<list>
|
||||
<option value="JUnit5 Test Class" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||
<map>
|
||||
<entry key="$PROJECT_DIR$" value="Branch_Yann" />
|
||||
<entry key="$PROJECT_DIR$" value="Branch_Maxime" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
|
|
@ -26,6 +75,13 @@
|
|||
</set>
|
||||
</option>
|
||||
</component>
|
||||
<component name="MavenImportPreferences">
|
||||
<option name="generalSettings">
|
||||
<MavenGeneralSettings>
|
||||
<option name="mavenHome" value="F:\IntelliJ IDEA 2020.2.3\plugins\maven\lib\maven3" />
|
||||
</MavenGeneralSettings>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectId" id="1ntDQmqLJGs5fsryTRt4xCMXGP8" />
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectViewState">
|
||||
|
|
@ -38,13 +94,25 @@
|
|||
<component name="PropertiesComponent">
|
||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
||||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="aspect.path.notification.shown" value="true" />
|
||||
<property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit5" />
|
||||
<property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit5" value="" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
|
||||
<property name="project.structure.last.edited" value="Project" />
|
||||
<property name="project.structure.proportion" value="0.15" />
|
||||
<property name="project.structure.side.proportion" value="0.0" />
|
||||
<property name="project.structure.side.proportion" value="0.35776892" />
|
||||
</component>
|
||||
<component name="RunManager" selected="Application.Gui">
|
||||
<component name="RecentsManager">
|
||||
<key name="CreateTestDialog.Recents.Supers">
|
||||
<recent name="" />
|
||||
</key>
|
||||
<key name="CreateTestDialog.RecentsKey">
|
||||
<recent name="fr.myny.gui" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager" selected="Application.test">
|
||||
<configuration name="Gui" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="fr.myny.gui.Gui" />
|
||||
<module name="ProjetGenieLogicielLoto" />
|
||||
|
|
@ -79,6 +147,8 @@
|
|||
<list>
|
||||
<item itemvalue="Application.test" />
|
||||
<item itemvalue="Application.Gui" />
|
||||
<item itemvalue="Application.test" />
|
||||
<item itemvalue="Application.Gui" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
|
|
@ -91,7 +161,30 @@
|
|||
<option name="presentableId" value="Default" />
|
||||
<updated>1612200481836</updated>
|
||||
<workItem from="1612200485023" duration="372000" />
|
||||
<workItem from="1612205058383" duration="1316000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="Useless">
|
||||
<created>1612204835577</created>
|
||||
<option name="number" value="00001" />
|
||||
<option name="presentableId" value="LOCAL-00001" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1612204835577</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00002" summary="Revert "Useless" This reverts commit ff9c3448">
|
||||
<created>1612205010813</created>
|
||||
<option name="number" value="00002" />
|
||||
<option name="presentableId" value="LOCAL-00002" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1612205010813</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00003" summary="Revert "Revert "Useless"" This reverts commit 1e892228">
|
||||
<created>1612205027500</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1612205027500</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="4" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
|
|
@ -109,4 +202,10 @@
|
|||
</option>
|
||||
<option name="oldMeFiltersMigrated" value="true" />
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="Useless" />
|
||||
<MESSAGE value="Revert "Useless" This reverts commit ff9c3448" />
|
||||
<MESSAGE value="Revert "Revert "Useless"" This reverts commit 1e892228" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Revert "Revert "Useless"" This reverts commit 1e892228" />
|
||||
</component>
|
||||
</project>
|
||||
14
pom.xml
14
pom.xml
|
|
@ -39,9 +39,11 @@
|
|||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.release>11</maven.compiler.release>
|
||||
<maven.compiler.source>13</maven.compiler.source>
|
||||
<maven.compiler.target>13</maven.compiler.target>
|
||||
<junit.jupiter.version>5.7.0</junit.jupiter.version>
|
||||
<javafx.version>15</javafx.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
|
|
@ -68,10 +70,14 @@
|
|||
<version>1.7.25</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter-api</artifactId>
|
||||
<version>5.7.0</version>
|
||||
<scope>compile</scope>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-controls</artifactId>
|
||||
<version>${javafx.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.openjfx</groupId>
|
||||
<artifactId>javafx-fxml</artifactId>
|
||||
<version>${javafx.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ public class Gui extends Application {
|
|||
|
||||
@Override
|
||||
public void start(Stage stage) throws IOException {
|
||||
scene = new Scene(loadFXML("primary"));
|
||||
scene = new Scene(loadFXML("scene1"));
|
||||
stage.setScene(scene);
|
||||
stage.show();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
package fr.myny.gui;
|
||||
|
||||
import javafx.fxml.FXML;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
public class PrimaryController {
|
||||
|
||||
@FXML
|
||||
private void switchToSecondary() throws IOException {
|
||||
Gui.setRoot("secondary");
|
||||
}
|
||||
}
|
||||
56
src/main/java/fr/myny/gui/SceneController.java
Normal file
56
src/main/java/fr/myny/gui/SceneController.java
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
package fr.myny.gui;
|
||||
|
||||
import javafx.fxml.FXML;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
* Classe permettant le changement de scène ou de l'affichage de la popup
|
||||
*/
|
||||
public class SceneController {
|
||||
|
||||
/**
|
||||
* Permet l'affichage de la scène 1
|
||||
* @throws IOException
|
||||
*/
|
||||
@FXML
|
||||
private void switchToScene1() throws IOException {
|
||||
Gui.setRoot("scene1");
|
||||
}
|
||||
|
||||
/**
|
||||
* Permet l'affichage de la scène 2
|
||||
* @throws IOException
|
||||
*/
|
||||
@FXML
|
||||
private void switchToScene2() throws IOException {
|
||||
Gui.setRoot("scene2");
|
||||
}
|
||||
|
||||
/**
|
||||
* Permet l'affichage de la scène 3
|
||||
* @throws IOException
|
||||
*/
|
||||
@FXML
|
||||
private void switchToScene3() throws IOException {
|
||||
Gui.setRoot("scene3");
|
||||
}
|
||||
|
||||
/**
|
||||
* Permet l'affichage de la scène 4
|
||||
* @throws IOException
|
||||
*/
|
||||
@FXML
|
||||
private void switchToScene4() throws IOException {
|
||||
Gui.setRoot("scene4");
|
||||
}
|
||||
|
||||
/**
|
||||
* Permet l'affichage de la PopUp
|
||||
* @throws IOException
|
||||
*/
|
||||
@FXML
|
||||
private void showPopUp() throws IOException {
|
||||
Gui.setRoot("popup1");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
module fr.myny.gui {
|
||||
requires javafx.controls;
|
||||
requires javafx.fxml;
|
||||
requires java.sql;
|
||||
|
||||
opens fr.myny.gui to javafx.fxml;
|
||||
exports fr.myny.gui;
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<VBox alignment="CENTER" prefHeight="241.0" prefWidth="397.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.myny.gui.PrimaryController">
|
||||
<VBox alignment="CENTER" prefHeight="241.0" prefWidth="397.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.myny.gui.SceneController">
|
||||
<Label prefHeight="167.0" prefWidth="69.0" text="Primary View" />
|
||||
<Button onAction="#switchToSecondary" prefHeight="109.0" prefWidth="152.0" text="Switch to Secondary View" />
|
||||
<Button onAction="#switchToScene2" prefHeight="109.0" prefWidth="152.0" text="Switch to Secondary View" />
|
||||
<padding>
|
||||
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
|
||||
</padding>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<VBox alignment="CENTER" prefHeight="241.0" prefWidth="397.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.myny.gui.PrimaryController">
|
||||
<VBox alignment="CENTER" prefHeight="241.0" prefWidth="397.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.myny.gui.SceneController">
|
||||
<Label prefHeight="167.0" prefWidth="69.0" text="Primary View" />
|
||||
<Button onAction="#switchToSecondary" prefHeight="109.0" prefWidth="152.0" text="Switch to Secondary View" />
|
||||
<Button onAction="#switchToScene2" prefHeight="109.0" prefWidth="152.0" text="Switch to Secondary View" />
|
||||
<padding>
|
||||
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
|
||||
</padding>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<VBox alignment="CENTER" prefHeight="241.0" prefWidth="397.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.myny.gui.PrimaryController">
|
||||
<VBox alignment="CENTER" prefHeight="241.0" prefWidth="397.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.myny.gui.SceneController">
|
||||
<Label prefHeight="167.0" prefWidth="69.0" text="Primary View" />
|
||||
<Button onAction="#switchToSecondary" prefHeight="109.0" prefWidth="152.0" text="Switch to Secondary View" />
|
||||
<Button onAction="#switchToScene2" prefHeight="109.0" prefWidth="152.0" text="Switch to Secondary View" />
|
||||
<padding>
|
||||
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
|
||||
</padding>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<VBox alignment="CENTER" prefHeight="241.0" prefWidth="397.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.myny.gui.PrimaryController">
|
||||
<VBox alignment="CENTER" prefHeight="241.0" prefWidth="397.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.myny.gui.SceneController">
|
||||
<Label prefHeight="167.0" prefWidth="69.0" text="Primary View" />
|
||||
<Button onAction="#switchToSecondary" prefHeight="109.0" prefWidth="152.0" text="Switch to Secondary View" />
|
||||
<Button onAction="#switchToScene2" prefHeight="109.0" prefWidth="152.0" text="Switch to Secondary View" />
|
||||
<padding>
|
||||
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
|
||||
</padding>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<VBox alignment="CENTER" prefHeight="241.0" prefWidth="397.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.myny.gui.PrimaryController">
|
||||
<VBox alignment="CENTER" prefHeight="241.0" prefWidth="397.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.myny.gui.SceneController">
|
||||
<Label prefHeight="167.0" prefWidth="69.0" text="Primary View" />
|
||||
<Button onAction="#switchToSecondary" prefHeight="109.0" prefWidth="152.0" text="Switch to Secondary View" />
|
||||
<Button onAction="#switchToScene2" prefHeight="109.0" prefWidth="152.0" text="Switch to Secondary View" />
|
||||
<padding>
|
||||
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
|
||||
</padding>
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<VBox alignment="CENTER" prefHeight="241.0" prefWidth="397.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.myny.gui.PrimaryController">
|
||||
<VBox alignment="CENTER" prefHeight="241.0" prefWidth="397.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.myny.gui.SceneController">
|
||||
<Label prefHeight="167.0" prefWidth="69.0" text="Primary View" />
|
||||
<Button onAction="#switchToSecondary" prefHeight="109.0" prefWidth="152.0" text="Switch to Secondary View" />
|
||||
<Button onAction="#switchToScene2" prefHeight="109.0" prefWidth="152.0" text="Switch to Secondary View" />
|
||||
<padding>
|
||||
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
|
||||
</padding>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
package fr.myny.data;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
class DataCsvTest {
|
||||
@Test
|
||||
void getCSV() throws IOException {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ package fr.myny.data;
|
|||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
class ImportDataTest {
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package fr.myny.database;
|
|||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.sql.*;
|
||||
import java.io.*;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
class DataBaseTest {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,8 @@
|
|||
package fr.myny.grid;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
class BuildGridTest {
|
||||
|
||||
@Test
|
||||
|
|
|
|||
10
src/test/java/fr/myny/gui/GuiTest.java
Normal file
10
src/test/java/fr/myny/gui/GuiTest.java
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
package fr.myny.gui;
|
||||
|
||||
import org.junit.jupiter.api.*;
|
||||
|
||||
class GuiTest {
|
||||
@Test
|
||||
void start(){
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
package fr.myny.stats;
|
||||
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.sql.SQLException;
|
||||
|
|
|
|||
Reference in a new issue