Browse Source

built. finally

tsdedhar 6 years ago
parent
commit
d430c52c66

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


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


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


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


BIN
assignments/a2/.gradle/buildOutputCleanup/buildOutputCleanup.lock


BIN
assignments/a2/build/classes/java/main/Handler.class


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


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


BIN
assignments/a2/build/classes/java/main/Thingy.class


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


+ 13 - 3
assignments/a2/src/main/java/Handler.java

@@ -1,7 +1,7 @@
 import java.io.*;
-import java.util.*;
 import java.awt.*;
-import javax.swing.*;
+import javax.swing.event.*;
+import java.awt.event.*;
 
 public class Handler extends MouseInputAdapter implements ActionListener, ChangeListener
 {
@@ -20,11 +20,21 @@ public class Handler extends MouseInputAdapter implements ActionListener, Change
   
   public void mouseReleased(MouseEvent e)
   {
-    system.out.println("Done drawing thingy");
+    System.out.println("Done drawing thingy");
   }
   
   public void mouseDragged(MouseEvent e)
   {
     m.addPoint(e.getX(), e.getY());
   }
+
+  public void actionPerformed(ActionEvent e)
+  {
+    
+  }
+
+  public void stateChanged(ChangeEvent e)
+  {
+    
+  }
 }

+ 4 - 3
assignments/a2/src/main/java/Model.java

@@ -1,12 +1,13 @@
 import java.util.Observable;
 import java.util.*;
 import java.awt.*;
+import javax.swing.*;
 
 public class Model extends Observable
 {
    /** The observers that are watching this model for changes. */
-  private List<Observer> observers;
-  private List<Thingy> thingies;
+  private ArrayList<Observer> observers;
+  private ArrayList<Thingy> thingies;
   private Thingy curThingy;
   private Color curColour;
   private int curThiccness;
@@ -79,7 +80,7 @@ public class Model extends Observable
 
 class Thingy
 {
-  private List<Point> points;
+  private ArrayList<Point> points;
   private Color colour;
   private int thiccness;