Mercurial > hg > Sudoku / changeset

     1.1 --- a/src/main/java/de/uapcore/sudoku/MainMenu.java	Mon Jul 27 12:52:34 2020 +0200
     1.2 +++ b/src/main/java/de/uapcore/sudoku/MainMenu.java	Mon Jul 27 13:12:40 2020 +0200
     1.3 @@ -31,15 +31,13 @@
     1.4  /**
     1.5   * Main menu bar.
     1.6   */
     1.7 -public class MainMenu {
     1.8 +public class MainMenu extends JMenuBar {
     1.9      
    1.10      private final ActionHandler handler;
    1.11 -    private final JMenuBar menuBar;
    1.12 -    
    1.13 +
    1.14      public MainMenu(ActionHandler h) {
    1.15          handler = h;
    1.16 -        menuBar = new JMenuBar();
    1.17 -        menuBar.add(createMenu("Datei", 'd',
    1.18 +        add(createMenu("Datei", 'd',
    1.19              createMenuItem("Neu", 'n', "control N", ActionHandler.NEW),
    1.20              createMenuItem("Öffnen", 'f', "control O", ActionHandler.OPEN),
    1.21              createMenuItem("Speichern", 's', "control S", ActionHandler.SAVE),
    1.22 @@ -50,7 +48,7 @@
    1.23              createSeparator(),
    1.24              createMenuItem("Beenden", 'e', ActionHandler.QUIT)
    1.25          ));
    1.26 -        menuBar.add(createMenu("Info", 'i',
    1.27 +        add(createMenu("Info", 'i',
    1.28              createMenuItem("Über...", 'b', "F1", ActionHandler.ABOUT)
    1.29          ));
    1.30      }
    1.31 @@ -90,8 +88,5 @@
    1.32          
    1.33          return item;
    1.34      }
    1.35 -    
    1.36 -    public JMenuBar getMenuBar() {
    1.37 -        return menuBar;
    1.38 -    }
    1.39 +
    1.40  }

     2.1 --- a/src/main/java/de/uapcore/sudoku/Sudoku.java	Mon Jul 27 12:52:34 2020 +0200
     2.2 +++ b/src/main/java/de/uapcore/sudoku/Sudoku.java	Mon Jul 27 13:12:40 2020 +0200
     2.3 @@ -42,7 +42,7 @@
     2.4          
     2.5          Field f = new Field();
     2.6          ActionHandler h = new ActionHandler(f);
     2.7 -        setJMenuBar(new MainMenu(h).getMenuBar());
     2.8 +        setJMenuBar(new MainMenu(h));
     2.9          
    2.10          Container content = getContentPane();
    2.11