소스 검색

saving doesn't save properly.

tsdedhar 6 년 전
부모
커밋
1de9903a61

BIN
assignments/a3/.gradle/4.7/fileHashes/fileHashes.bin


BIN
assignments/a3/.gradle/4.7/fileHashes/fileHashes.lock


BIN
assignments/a3/.gradle/4.7/taskHistory/taskHistory.bin


BIN
assignments/a3/.gradle/4.7/taskHistory/taskHistory.lock


BIN
assignments/a3/.gradle/buildOutputCleanup/buildOutputCleanup.lock


BIN
assignments/a3/build/classes/java/main/Controls.class


BIN
assignments/a3/build/classes/java/main/Gallery.class


BIN
assignments/a3/build/classes/java/main/Item$clickListener.class


BIN
assignments/a3/build/classes/java/main/Item.class


BIN
assignments/a3/build/classes/java/main/Main$1.class


BIN
assignments/a3/build/classes/java/main/Main.class


BIN
assignments/a3/build/classes/java/main/Model.class


BIN
assignments/a3/build/classes/java/main/PicData.class


BIN
assignments/a3/build/libs/a2-1.0-SNAPSHOT.jar


BIN
assignments/a3/savestate.shit


+ 1 - 1
assignments/a3/src/main/java/Controls.java

@@ -10,7 +10,7 @@ import java.awt.image.*;
 import javax.imageio.ImageIO;
 import javax.swing.JFileChooser;
 
-public class Controls extends JPanel implements Observer
+public class Controls extends JPanel implements Observer, Serializable
 {
   private Model model;
   private JSlider rating;

+ 3 - 2
assignments/a3/src/main/java/Gallery.java

@@ -3,8 +3,9 @@ import java.awt.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import java.awt.event.*;
+import java.io.Serializable;
 
-public class Gallery extends JPanel implements Observer
+public class Gallery extends JPanel implements Observer, Serializable
 {
   private Model model;
   private ArrayList<Item> items;
@@ -67,7 +68,7 @@ public class Gallery extends JPanel implements Observer
   }
 }
 
-class Item extends JPanel
+class Item extends JPanel implements Serializable
 {
   private PicData data;
   private ImageIcon picture;

+ 17 - 11
assignments/a3/src/main/java/Main.java

@@ -1,24 +1,27 @@
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.*;
+import java.lang.Throwable;
 
 public class Main
 {
+  public static Model model;
+
   public static void main(String[] args)
   {
     JFrame window = new JFrame("Fotag!");
-    Model model;
+    model = new Model();
     
     try
     {
       FileInputStream file = new FileInputStream("savestate.shit");
       ObjectInputStream object =  new ObjectInputStream(file);
-      model = object.readObject();
+      model = (Model)object.readObject();
       object.close();
     }
-    catch
-    {
-      model = new Model();
-    }
+    catch (Exception e) {System.out.println("Playing baseball");}
     
     Gallery gallery = new Gallery(model);
     Controls controls = new Controls(model);
@@ -51,11 +54,14 @@ public class Main
           {
             try
             {
-              FileOutputStream file = new FileOutputStream("savestate.shit");
-              ObjectOutputStream object =  new ObjectOutputStream(file);
-              object.writeObject(model);
-              object.close();
-            } catch(Exception e) {System.out.println("Screw you ankil");}
+              ObjectOutputStream output = new ObjectOutputStream(new FileOutputStream("savestate.shit"));
+              output.writeObject(model);
+              output.close();
+            } catch (Exception e)
+            {
+              System.out.println("Screw you ankil");
+              e.printStackTrace();
+            }
           }
           
           System.exit(0);

+ 0 - 1
assignments/a3/src/main/java/Observer.java

@@ -1,4 +1,3 @@
-
 /**
  * An interface that allows an object to receive updates from the object
  * they listen to.