Quellcode durchsuchen

got working toggles, though they don't appear toggled at any given point (should gray one out or similar if depressed

tsdedhar vor 6 Jahren
Ursprung
Commit
18a3f5c349

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$customListener.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


+ 6 - 7
assignments/a3/src/main/java/Controls.java

@@ -24,17 +24,17 @@ public class Controls extends JPanel implements Observer
       {
         grid.setSelected(true);
         list.setSelected(false);
-        model.switchLayout();
+        model.switchLayout(true);
       }
       else
       {
         list.setSelected(true);
         grid.setSelected(false);
-        model.switchLayout();
+        model.switchLayout(false);
       }
     }
   }
-  
+  private customListener customlistener;
   private ButtonGroup layouts;
   private Image starImg;
   private Image gridImg;
@@ -50,9 +50,8 @@ public class Controls extends JPanel implements Observer
   // Bob the Builder this shit
   public Controls(Model model)
   {
-    // Hook up this observer so that it will be notified when the model
-    // changes.
     this.model = model;
+    this.customlistener = new customListener();
     this.setBackground(Color.cyan);
     this.setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
     this.setPreferredSize(new Dimension(1280,75));
@@ -89,10 +88,10 @@ public class Controls extends JPanel implements Observer
     this.folderIcon = new ImageIcon(folderImg);
     
     this.grid = new JRadioButton(gridIcon, true);
-    grid.addActionListener(customListener);
+    grid.addActionListener(customlistener);
     
     this.list = new JRadioButton(listIcon, false);
-    list.addActionListener(customListener);
+    list.addActionListener(customlistener);
     
     this.layouts = new ButtonGroup();
     layouts.add(grid);