Added start/stop popup menu

1 files changed, 3 insertions, 6 deletions

diff --git a/java/src/IceGrid/AdminGUI.java b/java/src/IceGrid/AdminGUI.java
index ea1a6749633..3295db9e54e 100755
--- a/java/src/IceGrid/AdminGUI.java
+++ b/java/src/IceGrid/AdminGUI.java
@@ -81,7 +81,7 @@ public class AdminGUI extends JFrame
 	    });

 	

 	_communicator = Ice.Util.initialize(args);

-	_model = new Model(_communicator);

+	_model = new Model(_communicator, new StatusBarI());

 

 	initComponents();

 	

@@ -97,7 +97,7 @@ public class AdminGUI extends JFrame
         // Display the window.

 	//

 	setVisible(true);	

-	_sessionKeeper = new SessionKeeper(this, _model, _prefs, _statusBar);

+	_sessionKeeper = new SessionKeeper(this, _model, _prefs);

 	_sessionKeeper.createSession(true);

 	

     }

@@ -203,8 +203,7 @@ public class AdminGUI extends JFrame
 	//

 	// Status bar

 	//

-	_statusBar = new StatusBarI();

-	getContentPane().add(_statusBar, BorderLayout.PAGE_END);

+	getContentPane().add((StatusBarI)_model.getStatusBar(), BorderLayout.PAGE_END);

 

 	//

 	// Actions

@@ -338,8 +337,6 @@ public class AdminGUI extends JFrame
     private Action _discardAction;

     private Action _pasteAction;

 

-    private StatusBarI _statusBar;

-

     private Preferences _prefs = Preferences.userNodeForPackage(getClass());

 

     private Ice.Communicator _communicator;