diff --git a/src/main/java/com/jesuspinar/miobjeto/App.java b/src/main/java/com/jesuspinar/miobjeto/App.java index 41c8a33..588f7c0 100644 --- a/src/main/java/com/jesuspinar/miobjeto/App.java +++ b/src/main/java/com/jesuspinar/miobjeto/App.java @@ -11,8 +11,8 @@ public class App extends Application { @Override public void start(Stage stage) throws IOException { - FXMLLoader fxmlLoader = new FXMLLoader(App.class.getResource("student-list.fxml")); - + FXMLLoader fxmlLoader = new FXMLLoader( + App.class.getResource("student-list.fxml")); Scene scene = new Scene(fxmlLoader.load(), 400, 400); stage.setTitle("Data"); stage.setScene(scene); diff --git a/src/main/java/com/jesuspinar/miobjeto/serializable/Main.java b/src/main/java/com/jesuspinar/miobjeto/Main.java similarity index 52% rename from src/main/java/com/jesuspinar/miobjeto/serializable/Main.java rename to src/main/java/com/jesuspinar/miobjeto/Main.java index 031781c..2fa6653 100644 --- a/src/main/java/com/jesuspinar/miobjeto/serializable/Main.java +++ b/src/main/java/com/jesuspinar/miobjeto/Main.java @@ -1,9 +1,9 @@ -package com.jesuspinar.miobjeto.serializable; +package com.jesuspinar.miobjeto; -import com.jesuspinar.miobjeto.serializable.controller.ObjReader; -import com.jesuspinar.miobjeto.serializable.controller.ObjWriter; -import com.jesuspinar.miobjeto.serializable.model.Person; -import com.jesuspinar.miobjeto.serializable.model.People; +import com.jesuspinar.miobjeto.controller.ObjReader; +import com.jesuspinar.miobjeto.controller.ObjWriter; +import com.jesuspinar.miobjeto.model.Person; +import com.jesuspinar.miobjeto.model.People; import java.io.File; @@ -22,13 +22,12 @@ public class Main { boolean isWritten = ObjWriter.write(data,file); //Test serialization - People dat = null; + People p = null; if (isWritten) { - dat = (People) ObjReader.read(file); - } - if (dat != null){ - System.out.println(dat.toString()); + p = (People) ObjReader.read(file); + System.out.println(p.toString()); } + } } diff --git a/src/main/java/com/jesuspinar/miobjeto/controller/DataTbl.java b/src/main/java/com/jesuspinar/miobjeto/controller/DataTbl.java index 5cb49cc..d004b00 100644 --- a/src/main/java/com/jesuspinar/miobjeto/controller/DataTbl.java +++ b/src/main/java/com/jesuspinar/miobjeto/controller/DataTbl.java @@ -1,9 +1,8 @@ package com.jesuspinar.miobjeto.controller; import com.jesuspinar.miobjeto.model.PersonE; -import com.jesuspinar.miobjeto.serializable.controller.ObjReader; -import com.jesuspinar.miobjeto.serializable.model.People; -import com.jesuspinar.miobjeto.serializable.model.Person; +import com.jesuspinar.miobjeto.model.People; +import com.jesuspinar.miobjeto.model.Person; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; diff --git a/src/main/java/com/jesuspinar/miobjeto/serializable/controller/ObjReader.java b/src/main/java/com/jesuspinar/miobjeto/controller/ObjReader.java similarity index 79% rename from src/main/java/com/jesuspinar/miobjeto/serializable/controller/ObjReader.java rename to src/main/java/com/jesuspinar/miobjeto/controller/ObjReader.java index c82f474..d09cc7e 100644 --- a/src/main/java/com/jesuspinar/miobjeto/serializable/controller/ObjReader.java +++ b/src/main/java/com/jesuspinar/miobjeto/controller/ObjReader.java @@ -1,6 +1,4 @@ -package com.jesuspinar.miobjeto.serializable.controller; - -import com.jesuspinar.miobjeto.serializable.model.Person; +package com.jesuspinar.miobjeto.controller; import java.io.*; diff --git a/src/main/java/com/jesuspinar/miobjeto/controller/ObjWriter.java b/src/main/java/com/jesuspinar/miobjeto/controller/ObjWriter.java new file mode 100644 index 0000000..6efd56b --- /dev/null +++ b/src/main/java/com/jesuspinar/miobjeto/controller/ObjWriter.java @@ -0,0 +1,17 @@ +package com.jesuspinar.miobjeto.controller; + +import java.io.*; + +public class ObjWriter { + public static boolean write(Object obj, File out) { + try (FileOutputStream fos = new FileOutputStream(out); + ObjectOutputStream oos = new ObjectOutputStream(fos) + ){ + oos.writeObject(obj); + oos.flush(); + return true; + } catch (IOException e) { + throw new RuntimeException(e); + } + } +} diff --git a/src/main/java/com/jesuspinar/miobjeto/serializable/model/People.java b/src/main/java/com/jesuspinar/miobjeto/model/People.java similarity index 92% rename from src/main/java/com/jesuspinar/miobjeto/serializable/model/People.java rename to src/main/java/com/jesuspinar/miobjeto/model/People.java index 130e0b5..510fa36 100644 --- a/src/main/java/com/jesuspinar/miobjeto/serializable/model/People.java +++ b/src/main/java/com/jesuspinar/miobjeto/model/People.java @@ -1,4 +1,4 @@ -package com.jesuspinar.miobjeto.serializable.model; +package com.jesuspinar.miobjeto.model; import java.io.Serial; import java.io.Serializable; diff --git a/src/main/java/com/jesuspinar/miobjeto/serializable/model/Person.java b/src/main/java/com/jesuspinar/miobjeto/model/Person.java similarity index 92% rename from src/main/java/com/jesuspinar/miobjeto/serializable/model/Person.java rename to src/main/java/com/jesuspinar/miobjeto/model/Person.java index c4aceb1..c8f4e9c 100644 --- a/src/main/java/com/jesuspinar/miobjeto/serializable/model/Person.java +++ b/src/main/java/com/jesuspinar/miobjeto/model/Person.java @@ -1,4 +1,4 @@ -package com.jesuspinar.miobjeto.serializable.model; +package com.jesuspinar.miobjeto.model; import java.io.Serializable; diff --git a/src/main/java/com/jesuspinar/miobjeto/serializable/controller/ObjWriter.java b/src/main/java/com/jesuspinar/miobjeto/serializable/controller/ObjWriter.java deleted file mode 100644 index 67f1b15..0000000 --- a/src/main/java/com/jesuspinar/miobjeto/serializable/controller/ObjWriter.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jesuspinar.miobjeto.serializable.controller; - -import java.io.*; - -public class ObjWriter { - public static boolean write(Object obj, File out) { - try (FileOutputStream fos = new FileOutputStream(out); - ObjectOutputStream oos = new ObjectOutputStream(fos) - ){ - oos.writeObject(obj); - oos.flush(); - return true; - } catch (IOException e) { - throw new RuntimeException(e); - } - } - public static byte[] convertObjectToBytes(Object obj) { - ByteArrayOutputStream boas = new ByteArrayOutputStream(); - try (ObjectOutputStream objOutStream = new ObjectOutputStream(boas) - ){ - objOutStream.writeObject(obj); - return boas.toByteArray(); - } catch (IOException ioe) { - ioe.printStackTrace(); - } - throw new RuntimeException(); - } -}