fix maven build problem in code

BME-MIT-IET · May 18, 2024 · 13f7cbf · 13f7cbf
1 parent 84d092e
commit 13f7cbf
Show file tree

Hide file tree

Showing 55 changed files with 134 additions and 22 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_0.xml b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_3_0.xml
diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_9_2.xml b/.idea/libraries/Maven__joda_time_joda_time_2_9_2.xml
diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml
diff --git a/.idea/libraries/Maven__org_apache_commons_commons_imaging_1_0_alpha2.xml b/.idea/libraries/Maven__org_apache_commons_commons_imaging_1_0_alpha2.xml
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/gs-maven.iml b/gs-maven.iml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.9.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-imaging:1.0-alpha2" level="project" />
+    <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.0" level="project" />
+  </component>
+</module>
diff --git a/src/main/java/program/main/Field.java b/src/main/java/program/main/Field.java
@@ -5,6 +5,8 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 
+
+
 /**
  * A pálya ezekből az elemekből áll. Ez egy absztrakt osztály.
  */

diff --git a/src/main/java/program/main/Greeter.java b/src/main/java/program/main/Greeter.java
diff --git a/src/main/java/program/main/HelloWorld.java b/src/main/java/program/main/HelloWorld.java
diff --git a/src/main/java/program/main/Pipe.java b/src/main/java/program/main/Pipe.java
@@ -9,10 +9,10 @@
 import java.time.LocalDateTime;
 import java.util.Random;
 
-
+import static program.main.Main.game;
 
 public class Pipe extends Field implements Serializable {
-    private static Game game = Main.game;
+
     int x1;
     int y1;
     int x2;

diff --git a/target/classes/program/main/Cactus.class b/target/classes/program/main/Cactus.class
diff --git a/target/classes/program/main/Cistern.class b/target/classes/program/main/Cistern.class
diff --git a/target/classes/program/main/Controller.class b/target/classes/program/main/Controller.class
diff --git a/target/classes/program/main/Field.class b/target/classes/program/main/Field.class
diff --git a/target/classes/program/main/Game.class b/target/classes/program/main/Game.class
diff --git a/target/classes/program/main/GamePanel.class b/target/classes/program/main/GamePanel.class
diff --git a/target/classes/program/main/GameWindow.class b/target/classes/program/main/GameWindow.class
diff --git a/target/classes/program/main/Greeter.class b/target/classes/program/main/Greeter.class
diff --git a/target/classes/program/main/ImagePanel.class b/target/classes/program/main/ImagePanel.class
diff --git a/target/classes/program/main/InGame.class b/target/classes/program/main/InGame.class
diff --git a/target/classes/program/main/LoadSave.class b/target/classes/program/main/LoadSave.class
diff --git a/target/classes/program/main/Main.class b/target/classes/program/main/Main.class
diff --git a/target/classes/program/main/Nomad.class b/target/classes/program/main/Nomad.class
diff --git a/target/classes/program/main/NomadButtonPanel.class b/target/classes/program/main/NomadButtonPanel.class
diff --git a/target/classes/program/main/NomadMoveWindow.class b/target/classes/program/main/NomadMoveWindow.class
diff --git a/target/classes/program/main/NomadPipeInWindow.class b/target/classes/program/main/NomadPipeInWindow.class
diff --git a/target/classes/program/main/NomadPipeInteraction.class b/target/classes/program/main/NomadPipeInteraction.class
diff --git a/target/classes/program/main/NomadPipeOutWindow.class b/target/classes/program/main/NomadPipeOutWindow.class
diff --git a/target/classes/program/main/Pipe.class b/target/classes/program/main/Pipe.class
diff --git a/target/classes/program/main/Player.class b/target/classes/program/main/Player.class
diff --git a/target/classes/program/main/Plumber.class b/target/classes/program/main/Plumber.class
diff --git a/target/classes/program/main/PlumberButtonPanel.class b/target/classes/program/main/PlumberButtonPanel.class
diff --git a/target/classes/program/main/PlumberMoveWindow.class b/target/classes/program/main/PlumberMoveWindow.class
diff --git a/target/classes/program/main/PlumberPickUpWindow.class b/target/classes/program/main/PlumberPickUpWindow.class
diff --git a/target/classes/program/main/PlumberPipeInWindow.class b/target/classes/program/main/PlumberPipeInWindow.class
diff --git a/target/classes/program/main/PlumberPipeInteraction.class b/target/classes/program/main/PlumberPipeInteraction.class
diff --git a/target/classes/program/main/PlumberPipeOutWindow.class b/target/classes/program/main/PlumberPipeOutWindow.class
diff --git a/target/classes/program/main/Pump.class b/target/classes/program/main/Pump.class
diff --git a/target/classes/program/main/Round.class b/target/classes/program/main/Round.class
diff --git a/target/classes/program/main/Spring.class b/target/classes/program/main/Spring.class
diff --git a/target/classes/program/main/State.class b/target/classes/program/main/State.class
diff --git a/target/classes/program/main/restart_menu$1.class b/target/classes/program/main/restart_menu$1.class
diff --git a/target/classes/program/main/restart_menu$2.class b/target/classes/program/main/restart_menu$2.class
diff --git a/target/classes/program/main/restart_menu.class b/target/classes/program/main/restart_menu.class
diff --git a/target/classes/program/main/settings$1.class b/target/classes/program/main/settings$1.class
diff --git a/target/classes/program/main/settings$2.class b/target/classes/program/main/settings$2.class
diff --git a/target/classes/program/main/settings.class b/target/classes/program/main/settings.class
diff --git a/target/classes/program/main/startMenu$1.class b/target/classes/program/main/startMenu$1.class
diff --git a/target/classes/program/main/startMenu$2.class b/target/classes/program/main/startMenu$2.class
diff --git a/target/classes/program/main/startMenu$3.class b/target/classes/program/main/startMenu$3.class
diff --git a/target/classes/program/main/startMenu.class b/target/classes/program/main/startMenu.class
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,8 @@ @@
     import java.io.Serializable;
     import java.util.ArrayList;
     /**
      * A pálya ezekből az elemekből áll. Ez egy absztrakt osztály.
      */
@@ Expand Down @@