From 853599a21b1c611d8726a8b539196c82548c4142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20D=C3=BCrr?= Date: Sun, 10 Jan 2021 13:15:13 +0100 Subject: [PATCH] added serializable to Figure --- TEST | 0 src/mvcgrafik/controller/BtnController.java | 4 ++-- src/mvcgrafik/controller/GrafikController.java | 1 - src/mvcgrafik/model/Figure.java | 3 ++- src/mvcgrafik/model/GrafikModel.java | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 TEST diff --git a/TEST b/TEST deleted file mode 100644 index e69de29..0000000 diff --git a/src/mvcgrafik/controller/BtnController.java b/src/mvcgrafik/controller/BtnController.java index ebfc133..ad6e062 100644 --- a/src/mvcgrafik/controller/BtnController.java +++ b/src/mvcgrafik/controller/BtnController.java @@ -65,7 +65,7 @@ public class BtnController implements ActionListener try { //model.datenSpeichern(selectedFile); - model.speichereDatei("TEST"); + model.speichereDatei(selectedFile.getAbsolutePath()); } catch (UnsupportedEncodingException ex) { @@ -92,7 +92,7 @@ public class BtnController implements ActionListener try { //model.datenLesen(selectedFile); - model.ladeDatei("TEST"); + model.ladeDatei(selectedFile.getAbsolutePath()); } catch (UnsupportedEncodingException ex) { diff --git a/src/mvcgrafik/controller/GrafikController.java b/src/mvcgrafik/controller/GrafikController.java index a7ec53f..f9468d1 100755 --- a/src/mvcgrafik/controller/GrafikController.java +++ b/src/mvcgrafik/controller/GrafikController.java @@ -51,7 +51,6 @@ public class GrafikController implements MouseMotionListener, MouseListener } Point p = evt.getPoint(); if(p_old != null){ -// view.drawLine(p, p_old); view.drawLine(p, p_old); } p_old = p; diff --git a/src/mvcgrafik/model/Figure.java b/src/mvcgrafik/model/Figure.java index 677bc35..58db352 100644 --- a/src/mvcgrafik/model/Figure.java +++ b/src/mvcgrafik/model/Figure.java @@ -7,6 +7,7 @@ package mvcgrafik.model; import java.awt.Point; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -15,7 +16,7 @@ import java.util.List; * * @author chris, hd */ -public class Figure +public class Figure implements Serializable { private ArrayList punkte; diff --git a/src/mvcgrafik/model/GrafikModel.java b/src/mvcgrafik/model/GrafikModel.java index b69d6c3..8851d42 100755 --- a/src/mvcgrafik/model/GrafikModel.java +++ b/src/mvcgrafik/model/GrafikModel.java @@ -59,7 +59,6 @@ public class GrafikModel FileInputStream fis = new FileInputStream(dateiname); BufferedInputStream buffin = new BufferedInputStream(fis); ObjectInputStream ois = new ObjectInputStream(buffin); - Object obj = ois.readObject(); // if (obj instanceof ArrayList) // { // punkte = (ArrayList) obj;