diff -r 5179eff8a9b6 -r ed931970b4ac src/de/uapcore/sudoku/Sudoku.java --- a/src/de/uapcore/sudoku/Sudoku.java Sat Jan 26 17:42:07 2013 +0100 +++ b/src/de/uapcore/sudoku/Sudoku.java Sat Jan 26 18:38:12 2013 +0100 @@ -1,11 +1,37 @@ +/* + * Copyright 2013 Mike Becker. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + package de.uapcore.sudoku; import java.awt.Color; +import java.awt.Container; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Insets; import javax.swing.JFrame; -import javax.swing.JRootPane; /** * @@ -18,21 +44,22 @@ Field f = new Field(); ActionHandler h = new ActionHandler(f); + setJMenuBar(new MainMenu(h).getMenuBar()); - JRootPane root = getRootPane(); + Container content = getContentPane(); - root.setLayout(new GridBagLayout()); + content.setLayout(new GridBagLayout()); GridBagConstraints c = new GridBagConstraints(); c.insets = new Insets(20, 20, 20, 20); c.fill = GridBagConstraints.HORIZONTAL; c.gridx = 0; c.gridy = 0; - root.add(f, c); + content.add(f, c); c.gridy++; - root.add(new ButtonPanel(h), c); + content.add(new ButtonPanel(h), c); pack(); - root.setBackground(Color.WHITE); + content.setBackground(Color.WHITE); setLocationByPlatform(true); setDefaultCloseOperation(EXIT_ON_CLOSE); }