diff --git a/shukan/Shukan.java b/shukan/Shukan.java index 6aa87c5f4edffd8fa64e804c1cb81570093ab48d..9b02c181d8d0eb49684a9ed47636c6f6abbcac5c 100644 --- a/shukan/Shukan.java +++ b/shukan/Shukan.java @@ -38,7 +38,6 @@ public class Shukan JPanel global = new JPanel(new BorderLayout()); ShukanView canvas = new ShukanView (data, io); ShukanViewBar mytoolbar = new ShukanViewBar(90); - ShukanStudent student = new ShukanStudent(data,60); // Getting the display size @@ -49,11 +48,10 @@ public class Shukan canvas.restrictSize ((int) (gcBounds.getWidth ()) - LEFT_MARGIN, (int) (gcBounds.getHeight ()) - TOP_MARGIN - mytoolbar.getHeight()); mytoolbar.setSize(new Dimension((int) (gcBounds.getWidth ()) - LEFT_MARGIN, mytoolbar.getHeight())); - student.setSize(new Dimension((int) (gcBounds.getWidth ()) - LEFT_MARGIN, student.getHeight())); // Adding a openGL input handler (controller) - ShukanController myController = new ShukanController (canvas, mytoolbar, data, student); + ShukanController myController = new ShukanController (canvas, mytoolbar, data); canvas.addKeyListener (myController); canvas.addMouseListener (myController); mytoolbar.addActionListener(myController); @@ -77,11 +75,11 @@ public class Shukan // Setting the window geometry global.add(mytoolbar, BorderLayout.NORTH); global.add (canvas, BorderLayout.CENTER); - global.add(student, BorderLayout.SOUTH); + //global.add(student, BorderLayout.SOUTH); frame.add(global); Insets ins = frame.getInsets (); frame.setSize (canvas.displayWidth () + ins.left + ins.right, - canvas.displayHeight ()+ mytoolbar.getHeight()+ student.getHeight() + ins.top + ins.bottom ); + canvas.displayHeight ()+ mytoolbar.getHeight()+ ins.top + ins.bottom ); frame.setLocation (LEFT_MARGIN, 0); frame.setBackground (Color.white); frame.setVisible (true);