Sfoglia il codice sorgente

buttons register clicks, but don't take action yet

tsdedhar 6 anni fa
parent
commit
e54dc1f9af

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$1.class


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


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


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


BIN
assignments/a3/build/classes/java/main/Controls.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


+ 9 - 8
assignments/a3/src/main/java/Controls.java

@@ -74,10 +74,10 @@ public class Controls extends JPanel implements Observer
     {
       public void actionPerformed(ActionEvent e)
       {
-        if (!(grid.isSelected(layouts)))
+        if (!(grid.isSelected()))
         {
-          grid.setSelected(layouts, true);
-          list.setSelected(layouts, false);
+          grid.setSelected(true);
+          list.setSelected(false);
           model.switchLayout();
         }
       }
@@ -88,10 +88,11 @@ public class Controls extends JPanel implements Observer
     {
       public void actionPerformed(ActionEvent e)
       {
-        if (!(list.isSelected(layouts)))
+        System.out.println("Click!");
+        if (!(list.isSelected()))
         {
-          list.setSelected(layouts, true);
-          grid.setSelected(layouts, false);
+          list.setSelected(true);
+          grid.setSelected(false);
           model.switchLayout();
         }
       }
@@ -100,8 +101,8 @@ public class Controls extends JPanel implements Observer
     this.layouts = new ButtonGroup();
     layouts.add(grid);
     layouts.add(list);
-    grid.setSelected(layouts, true);
-    list.setSelected(layouts, false);
+    grid.setSelected(true);
+    list.setSelected(false);
     
     this.fileChooser = new JFileChooser();
     this.fileButton = new JButton(folderIcon);

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

@@ -51,6 +51,7 @@ public class Model extends Observable
   public void switchLayout()
   {
     grid = !grid;
+    System.out.println("Layout Toggled!");
     setChanged();
     notifyObservers();
   }