[Thaw-dev] r9411 - trunk/apps/Thaw/src/thaw/core

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-06-30 15:38:02 +0000 (Fri, 30 Jun 2006)
New Revision: 9411

Modified:
   trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
   trunk/apps/Thaw/src/thaw/core/Core.java
   trunk/apps/Thaw/src/thaw/core/MainWindow.java
Log:
Fixing adding to JFrame: JFrame.add() => JFrame.getContentPane().add() (thanks 
to Bombe)

Modified: trunk/apps/Thaw/src/thaw/core/ConfigWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/ConfigWindow.java     2006-06-30 13:51:46 UTC 
(rev 9410)
+++ trunk/apps/Thaw/src/thaw/core/ConfigWindow.java     2006-06-30 15:38:02 UTC 
(rev 9411)
@@ -61,10 +61,12 @@
                BorderLayout borderLayout = new BorderLayout();
                borderLayout.setVgap(20);
                borderLayout.setVgap(20);
+
                configWin.setLayout(borderLayout);
-               configWin.add(tabs, BorderLayout.CENTER);
-               configWin.add(buttons, BorderLayout.SOUTH);

+               configWin.getContentPane().add(tabs, BorderLayout.CENTER);
+               configWin.getContentPane().add(buttons, BorderLayout.SOUTH);
+
                tabs.setSize(600, 350);
                okButton.setSize(100, 50);


Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java     2006-06-30 13:51:46 UTC (rev 
9410)
+++ trunk/apps/Thaw/src/thaw/core/Core.java     2006-06-30 15:38:02 UTC (rev 
9411)
@@ -67,14 +67,13 @@
                if(!initGraphics())
                        return false;

-               
mainWindow.setStatus(I18n.getMessage("thaw.statusBar.initPlugins"));
-
                if(!initPluginManager())
                        return false;

-
                mainWindow.setStatus(I18n.getMessage("thaw.statusBar.ready"));

+               mainWindow.setVisible(true);
+
                return true;
        }

@@ -108,7 +107,6 @@
         */
        public boolean initGraphics() {
                mainWindow = new MainWindow(this);
-               mainWindow.setVisible(true);

                configWindow = new ConfigWindow(this);
                configWindow.setVisible(false);

Modified: trunk/apps/Thaw/src/thaw/core/MainWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/MainWindow.java       2006-06-30 13:51:46 UTC 
(rev 9410)
+++ trunk/apps/Thaw/src/thaw/core/MainWindow.java       2006-06-30 15:38:02 UTC 
(rev 9411)
@@ -57,6 +57,8 @@
                this.core = core;

                mainWindow = new JFrame("Thaw");
+
+               mainWindow.setVisible(false);

                menuBar = new JMenuBar();
                fileMenu = new JMenu(I18n.getMessage("thaw.menu.file"));
@@ -78,9 +80,9 @@

                mainWindow.setLayout(new BorderLayout());

-               mainWindow.add(menuBar, BorderLayout.NORTH);
-               mainWindow.add(tabbedPane, BorderLayout.CENTER);
-               mainWindow.add(statusBar, BorderLayout.SOUTH);
+               mainWindow.getContentPane().add(menuBar, BorderLayout.NORTH);
+               mainWindow.getContentPane().add(tabbedPane, 
BorderLayout.CENTER);
+               mainWindow.getContentPane().add(statusBar, BorderLayout.SOUTH);

                mainWindow.setSize(790, 550);