gitignore

.gitignore

+.gradle/
+.idea/
+idea/
+build/
+*.iml
+*.ipr
+*.iws
+gradle/wrapper/gradle-wrapper.jar
+out/

.idea/gradle.xml

@@ -4,8 +4,11 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="delegatedBuild" value="true" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/misc.xml

-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="corretto-16" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file

.idea/runConfigurations.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file

build.gradle

@@ -15,19 +15,17 @@ javafx {
 
 version '1.0-SNAPSHOT'
 
-sourceCompatibility = "11"
-targetCompatibility = "11"
+
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile 'org.hamcrest:hamcrest-library:1.3'
+
 }
 
-mainClassName = "shape.App"
+mainClassName = "serializer.App"
 
 
 test {

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip

src/main/java/serializer/App.java

@@ -3,6 +3,7 @@ package serializer;
 import javafx.application.Application;
 import javafx.scene.Group;
 import javafx.scene.Scene;
+import javafx.scene.control.Button;
 import javafx.stage.Stage;
 
 public class App extends Application {
@@ -18,5 +19,13 @@ public class App extends Application {
         root.getChildren().add(container);
         primaryStage.setScene(new Scene(root));
         primaryStage.show();
+        Button save = new Button("save");
+        root.getChildren().add(save);
+        save.setLayoutX(0);
+        save.setLayoutY(0);
+        root.setOnKeyPressed(event->container.context.keyPressed(event));
+        //save.setOnKeyPressed(event->container.context.keyPressed(event));
+        save.setOnAction(event -> container.write());
+
     }
 }
\ No newline at end of file

src/main/java/serializer/DrawerWithSave.java

@@ -39,7 +39,7 @@ public class DrawerWithSave extends state.Drawer {
         File file = fileChooser.showOpenDialog(getScene().getWindow());
         if (file == null) return;
         try {
-            super.shapes = ShapeReader.read(file, Collectors.toList());
+            super.shapes = ShapeReader.read(file);
             repaint();
         } catch (IOException e) {
             Alert alert = new Alert(Alert.AlertType.INFORMATION);

src/main/java/serializer/ShapeReader.java

@@ -2,13 +2,19 @@ package serializer;
 
 import shape.Shape;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collector;
 
 public class ShapeReader {
-    public static List<Shape> read(File file, Collector<Object,?, List<Object>> toList) throws IOException {
+    public static List<Shape> read(File file) throws IOException {
+        BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
+        /*for(String line : bufferedReader.lines().toList()) {
+            System.out.println(line);
+        }*/
         return null;
     }
 }

src/main/java/serializer/ShapeWriter.java

@@ -4,9 +4,12 @@ import shape.Shape;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.List;
 
 public class ShapeWriter {
     public static void write (File file, List<Shape> shapes) throws IOException {
+        PrintWriter printWriter = new PrintWriter(file);
+        printWriter.println("Coucou");
     }
 }

src/main/java/state/Drawer.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 public class Drawer extends Canvas {
     protected List<Shape> shapes = new ArrayList<>();
-    DrawerContext context = new DrawerContext(this);
+    public DrawerContext context = new DrawerContext(this);
 
     public Drawer(int width, int height) {
         super(width,height);
@@ -19,7 +19,7 @@ public class Drawer extends Canvas {
         setOnMouseReleased(event->context.mouseReleased(event));
         setOnMouseMoved(event->context.mouseMoved(event));
         setOnMouseDragged(event->context.mouseMoved(event));
-        setOnKeyPressed(event -> context.keyPressed(event));
+        //setOnKeyPressed(event -> context.keyPressed(event));
     }
 
     public void repaint(){

src/main/java/state/DrawerContext.java

@@ -24,7 +24,7 @@ public class DrawerContext {
 
     void mouseMoved(MouseEvent event){}
 
-    void keyPressed(KeyEvent event) {
+    public void keyPressed(KeyEvent event) {
         switch (event.getText()) {
             case "c":
                 currentState = new StateCircle0();