basic menu implemented (literally just shows up)

assignments/a2/src/main/java/Main.java

@@ -15,21 +15,20 @@ public class Main
     model.notifyObservers();
     
     // create a layout panel to hold the views
-		JPanel mainpanel = new JPanel(new BorderLayout(0, 0));
-		window.getContentPane().add(mainpanel);
-		mainpanel.add(view, BorderLayout.CENTER);
-		mainpanel.add(menubar, BorderLayout.PAGE_START);
-		mainpanel.add(sidepane, BorderLayout.LINE_START);
-		mainpanel.add(controls, BorderLayout.PAGE_END);
-		model.setMenuColour(Color.green);
-		model.setSideColour(Color.cyan);
-		model.setControlColour(Color.red);
-		
-		// Setup the frame to do frame things
-		window.setPreferredSize(new Dimension(1280,720));
-		window.setMinimumSize(new Dimension(320, 180));
-		window.pack();
-		window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		window.setVisible(true);
+    JPanel mainpanel = new JPanel(new BorderLayout(0, 0));
+    window.getContentPane().add(mainpanel);
+    mainpanel.add(view, BorderLayout.CENTER);
+    mainpanel.add(menubar, BorderLayout.PAGE_START);
+    mainpanel.add(sidepane, BorderLayout.LINE_START);
+    mainpanel.add(controls, BorderLayout.PAGE_END);
+    model.setSideColour(Color.cyan);
+    model.setControlColour(Color.red);
+
+    // Setup the frame to do frame things
+    window.setPreferredSize(new Dimension(1280,720));
+    window.setMinimumSize(new Dimension(320, 180));
+    window.pack();
+    window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+    window.setVisible(true);
   }
 }

assignments/a2/src/main/java/Menubar.java

@@ -3,7 +3,7 @@ import java.util.*;
 import java.awt.*;
 import javax.swing.*;
 
-public class Menubar extends JPanel implements Observer
+public class Menubar extends JMenuBar implements Observer
 {
   private Model model;
 
@@ -14,7 +14,8 @@ public class Menubar extends JPanel implements Observer
     // changes.
     this.model = model;
     this.setPreferredSize(new Dimension(1280, 50));
-		this.setMinimumSize(new Dimension(320, 50));
+    this.setMinimumSize(new Dimension(320, 50));
+    this.add(new JMenu("File"));
     model.addObserver(this);
   }
   
@@ -23,7 +24,6 @@ public class Menubar extends JPanel implements Observer
   */
   public void update(Object observable)
   {
-    this.setBackground(model.menuColour);
     revalidate();
     repaint();
   }

assignments/a2/src/main/java/Model.java

@@ -12,7 +12,6 @@ public class Model extends Observable
   private Thingy curThingy;
   private Color curColour;
   private int curThiccness;
-  public Color menuColour;
   public Color sideColour;
   public Color controlColour;
 
@@ -47,13 +46,6 @@ public class Model extends Observable
     return thingies;
   }
   
-  public void setMenuColour(Color c)
-  {
-    menuColour = c;
-    setChanged();
-    notifyObservers();
-  }
-  
   public void setSideColour(Color c)
   {
     sideColour = c;

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

@@ -16,6 +16,7 @@ public class Sidepane extends JPanel implements Observer
     // Hook up this observer so that it will be notified when the model
     // changes.
     this.model = model;
+    this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
     this.setPreferredSize(new Dimension(280, 720));
     colours = new Colours(model);
     this.add(colours);