Skip to content
Snippets Groups Projects
Commit 8c050464 authored by MasterPyo's avatar MasterPyo
Browse files

merge solved, JESPERE MDR

parent ba3ed4e5
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 232 deletions
MavenChess/.idea/MavenChess.iml
+ 1
− 29
View file @ 8c050464
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="$MODULE_DIR$/MavenChess/pom.xml" external.system.module.type="SINGLE_MODULE" external.system.module.version="223-2" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module version="4">
<component name="AdditionalModuleElements"> <component name="AdditionalModuleElements">
<content url="file://$MODULE_DIR$" /> <content url="file://$MODULE_DIR$" />
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_18">
<output url="file://$MODULE_DIR$/MavenChess/target/classes" />
<output-test url="file://$MODULE_DIR$/MavenChess/target/test-classes" />
<content url="file://$MODULE_DIR$" />
<content url="file://$MODULE_DIR$/MavenChess">
<sourceFolder url="file://$MODULE_DIR$/MavenChess/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/MavenChess/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/MavenChess/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/MavenChess/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/MavenChess/target" />
</content>
<orderEntry type="jdk" jdkName="openjdk-20" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls:18.0.2" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-controls:win:18.0.2" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:18.0.2" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:win:18.0.2" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-base:18.0.2" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-base:win:18.0.2" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:18.0.2" level="project" />
<orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:win:18.0.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.9.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.2.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.9.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-engine:5.9.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-engine:1.9.1" level="project" />
</component>
</module> </module>
\ No newline at end of file
MavenChess/.idea/compiler.xml
+ 0
− 3
View file @ 8c050464
...@@ -9,8 +9,5 @@ ...@@ -9,8 +9,5 @@
<module name="MavenChess" /> <module name="MavenChess" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel>
<module name="MavenChess" target="18" />
</bytecodeTargetLevel>
</component> </component>
</project> </project>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_2.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.apiguardian:apiguardian-api:1.1.2" type="java-imported" external-system-id="Maven">
<properties groupId="org.apiguardian" artifactId="apiguardian-api" version="1.1.2" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_9_1.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.junit.jupiter:junit-jupiter-api:5.9.1" type="java-imported" external-system-id="Maven">
<properties groupId="org.junit.jupiter" artifactId="junit-jupiter-api" version="5.9.1" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.9.1/junit-jupiter-api-5.9.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.9.1/junit-jupiter-api-5.9.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.9.1/junit-jupiter-api-5.9.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_9_1.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.junit.jupiter:junit-jupiter-engine:5.9.1" type="java-imported" external-system-id="Maven">
<properties groupId="org.junit.jupiter" artifactId="junit-jupiter-engine" version="5.9.1" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.9.1/junit-jupiter-engine-5.9.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.9.1/junit-jupiter-engine-5.9.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.9.1/junit-jupiter-engine-5.9.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_9_1.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.junit.platform:junit-platform-commons:1.9.1" type="java-imported" external-system-id="Maven">
<properties groupId="org.junit.platform" artifactId="junit-platform-commons" version="1.9.1" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.9.1/junit-platform-commons-1.9.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.9.1/junit-platform-commons-1.9.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.9.1/junit-platform-commons-1.9.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_9_1.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.junit.platform:junit-platform-engine:1.9.1" type="java-imported" external-system-id="Maven">
<properties groupId="org.junit.platform" artifactId="junit-platform-engine" version="1.9.1" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.9.1/junit-platform-engine-1.9.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.9.1/junit-platform-engine-1.9.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.9.1/junit-platform-engine-1.9.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_openjfx_javafx_base_18_0_2.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-base:18.0.2" type="java-imported" external-system-id="Maven">
<properties groupId="org.openjfx" artifactId="javafx-base" version="18.0.2" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/18.0.2/javafx-base-18.0.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/18.0.2/javafx-base-18.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/18.0.2/javafx-base-18.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_openjfx_javafx_base_win_18_0_2.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-base:win:18.0.2" type="java-imported" external-system-id="Maven">
<properties groupId="org.openjfx" artifactId="javafx-base" version="18.0.2" classifier="win" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/18.0.2/javafx-base-18.0.2-win.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/18.0.2/javafx-base-18.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-base/18.0.2/javafx-base-18.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_openjfx_javafx_controls_18_0_2.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-controls:18.0.2" type="java-imported" external-system-id="Maven">
<properties groupId="org.openjfx" artifactId="javafx-controls" version="18.0.2" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/18.0.2/javafx-controls-18.0.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/18.0.2/javafx-controls-18.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/18.0.2/javafx-controls-18.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_openjfx_javafx_controls_win_18_0_2.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-controls:win:18.0.2" type="java-imported" external-system-id="Maven">
<properties groupId="org.openjfx" artifactId="javafx-controls" version="18.0.2" classifier="win" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/18.0.2/javafx-controls-18.0.2-win.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/18.0.2/javafx-controls-18.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-controls/18.0.2/javafx-controls-18.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_openjfx_javafx_fxml_18_0_2.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-fxml:18.0.2" type="java-imported" external-system-id="Maven">
<properties groupId="org.openjfx" artifactId="javafx-fxml" version="18.0.2" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/18.0.2/javafx-fxml-18.0.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/18.0.2/javafx-fxml-18.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/18.0.2/javafx-fxml-18.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_openjfx_javafx_fxml_win_18_0_2.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-fxml:win:18.0.2" type="java-imported" external-system-id="Maven">
<properties groupId="org.openjfx" artifactId="javafx-fxml" version="18.0.2" classifier="win" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/18.0.2/javafx-fxml-18.0.2-win.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/18.0.2/javafx-fxml-18.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-fxml/18.0.2/javafx-fxml-18.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_openjfx_javafx_graphics_18_0_2.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-graphics:18.0.2" type="java-imported" external-system-id="Maven">
<properties groupId="org.openjfx" artifactId="javafx-graphics" version="18.0.2" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/18.0.2/javafx-graphics-18.0.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/18.0.2/javafx-graphics-18.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/18.0.2/javafx-graphics-18.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_openjfx_javafx_graphics_win_18_0_2.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.openjfx:javafx-graphics:win:18.0.2" type="java-imported" external-system-id="Maven">
<properties groupId="org.openjfx" artifactId="javafx-graphics" version="18.0.2" classifier="win" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/18.0.2/javafx-graphics-18.0.2-win.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/18.0.2/javafx-graphics-18.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/openjfx/javafx-graphics/18.0.2/javafx-graphics-18.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
MavenChess/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml deleted 100644 → 0
+ 0
− 14
View file @ ba3ed4e5
<component name="libraryTable">
<library name="Maven: org.opentest4j:opentest4j:1.2.0" type="java-imported" external-system-id="Maven">
<properties groupId="org.opentest4j" artifactId="opentest4j" version="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>
\ No newline at end of file
MavenChess/.idea/misc.xml
+ 0
− 4
View file @ 8c050464
...@@ -8,11 +8,7 @@ ...@@ -8,11 +8,7 @@
</list> </list>
</option> </option>
</component> </component>
<<<<<<< HEAD
<component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK">
=======
<component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="openjdk-20" project-jdk-type="JavaSDK">
>>>>>>> bd8213bd1d1d691deb6588ae3b615e08779789b8
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>
\ No newline at end of file
MavenChess/MavenChess/target/classes/main/mavenchess/HelloApplication.class
+ 0
− 0
View file @ 8c050464
No preview for this file type
MavenChess/MavenChess/target/classes/model/Board.class 0 → 100644
+ 0
− 0
View file @ 8c050464
File added
MavenChess/MavenChess/target/classes/model/Move.class 0 → 100644
+ 0
− 0
View file @ 8c050464
File added
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment