adding buttons in an arraylist now

assignments/a2/src/main/java/Sidepane.java

@@ -42,26 +42,39 @@ class Colours extends JPanel
   private JButton orange;
   private JButton cyan;
   private JButton custom;
-  
+  private ArrayList<colourButton> colours;
+
   public Colours()
   {
     this.setLayout(new GridLayout(0, 2));
     this.setPreferredSize(new Dimension(280, 600));
-    red = new JButton("Red");
-    green = new JButton("Green");
-    blue = new JButton("Blue");
-    yellow = new JButton("Yellow");
-    purple = new JButton("Purple");
-    orange = new JButton("Orange");
-    cyan = new JButton("Cyan");
-    custom = new JButton("Custom");
-    this.add(red);
-    this.add(green);
-    this.add(blue);
-    this.add(yellow);
-    this.add(purple);
-    this.add(orange);
-    this.add(cyan);
-    this.add(custom);
+    colours.add(new colourButton(Color.red));
+    colours.add(new colourButton(Color.green));
+    colours.add(new colourButton(Color.blue));
+    colours.add(new colourButton(Color.yellow));
+    colours.add(new colourButton(Color.magenta));
+    colours.add(new colourButton(Color.orange));
+    colours.add(new colourButton(Color.cyan));
+    colours.add(new colourButton(Color.gray));
+    
+    for(colourButton b: colours)
+    {
+      this.add(b);
+    }
   }
 }
+
+class colourButton extends JButton
+{
+  public colourButton(Color c)
+  {
+    this.setPreferredSize(new Dimension(140, 150));
+    this.setBackground(c);
+    this.setOpaque(true);
+  }
+  
+  public String toString()
+  {
+    return this.getBackground().toString();
+  }
+}