Added IceGrid AdminGUI back/next buttons

5 files changed, 361 insertions, 192 deletions

diff --git a/java/src/IceGrid/AdminGUI.java b/java/src/IceGrid/AdminGUI.java
index 564e29371e0..c3a85696587 100755
--- a/java/src/IceGrid/AdminGUI.java
+++ b/java/src/IceGrid/AdminGUI.java
@@ -33,24 +33,15 @@ public class AdminGUI extends JFrame
 	StatusBarI()

 	{

 	    super(new BorderLayout());

-	    setBorder(new EmptyBorder(0, 5, 5, 10));

+	    setBorder(new EmptyBorder(0, 13, 10, 13));

 

-	    _connected = Utils.getIcon("/icons/connect.gif");

-	    _disconnected = Utils.getIcon("/icons/error_st_obj.gif");

-

-	    _connectedLabel = new JLabel(_disconnected);

 	    _text = new JLabel();

 	    _text.setHorizontalAlignment(SwingConstants.LEFT);

-	    

-	    JPanel leftPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));

-	    leftPanel.add(_connectedLabel);

-	    leftPanel.add(_text);

-	    

-	    add(leftPanel, BorderLayout.LINE_START);

-	    

-	    JLabel copyright = new JLabel("Copyright \u00A9 2005 ZeroC, Inc.");

-	    copyright.setHorizontalAlignment(SwingConstants.RIGHT);

-	    add(copyright, BorderLayout.LINE_END);

+	    add(_text, BorderLayout.LINE_START);

+

+	    _connectedLabel = new JLabel("Working Offline");

+	    _connectedLabel.setHorizontalAlignment(SwingConstants.RIGHT);

+	    add(_connectedLabel, BorderLayout.LINE_END);

 	}

 

 	public void setText(String text)

@@ -62,19 +53,15 @@ public class AdminGUI extends JFrame
 	{

 	    if(connected)

 	    {

-		_connectedLabel.setIcon(_connected);

-		_text.setText("Connected");

+		_connectedLabel.setText("Working Online");

 	    }

 	    else

 	    {

-		_connectedLabel.setIcon(_disconnected);

-		_text.setText("Not connected");

+		_connectedLabel.setText("Working Offline");

 	    }

 	}

 

 	JLabel _connectedLabel;

-	Icon _connected;

-	Icon _disconnected;

 	JLabel _text;

     }

 

@@ -106,34 +93,6 @@ public class AdminGUI extends JFrame
 		}

 	    });

 

-	Thread shutdownHook = new Thread("Shutdown hook")

-	    {

-		public void run()

-		{

-		    SwingUtilities.invokeLater(new Runnable() 

-			{

-			    public void run() 

-			    {

-				if(_model != null)

-				{

-				    _model.exit(0);

-				}

-			    }

-			});

-		    //

-		    // Give 3 seconds to the GUI thread

-		    //

-		    try

-		    {

-			Thread.sleep(3000);

-		    }

-		    catch(java.lang.InterruptedException e)

-		    {}

-		    System.err.println("End of shutdown hook");

-		}

-	    };

-	Runtime.getRuntime().addShutdownHook(shutdownHook);

-

 	_model = new Model(this, args, Preferences.userNodeForPackage(getClass()),

 			   new StatusBarI());

 	

diff --git a/java/src/IceGrid/MainPane.java b/java/src/IceGrid/MainPane.java
index c2e09a2877c..48ed3f5e0aa 100755
--- a/java/src/IceGrid/MainPane.java
+++ b/java/src/IceGrid/MainPane.java
@@ -14,8 +14,6 @@ import javax.swing.*;
 
 import javax.swing.event.ChangeListener;
 import javax.swing.event.ChangeEvent;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
 
 import javax.swing.tree.TreeCellRenderer;
 import javax.swing.tree.TreeSelectionModel;
@@ -88,8 +86,6 @@ public class MainPane extends JSplitPane
 	private float _aspectRatio;
     }
 
-
-
     static class PopupListener extends MouseAdapter
     {
 	public void mousePressed(MouseEvent e) 
@@ -124,45 +120,7 @@ public class MainPane extends JSplitPane
 	}
     }
 
-    class SelectionListener implements TreeSelectionListener
-    {
-	public void valueChanged(TreeSelectionEvent e)
-	{
-	    TreePath path = null;
-	    if(e.isAddedPath())
-	    {
-		path = e.getPath();
-	    }
-	    
-	    if(path == null)
-	    {
-		if(_model.displayEnabled())
-		{
-		    _model.show(_model.getRoot());
-		    // displayWelcomePanel();
-		}
-	    }
-	    else
-	    {
-		CommonBase newNode = (CommonBase)path.getLastPathComponent();
-
-		if(_previousNode != null && _previousNode.isEphemeral()
-		   && _previousNode != newNode)
-		{
-		    _previousNode.destroy();
-		}
-		
-		//
-		// Must be a valid node
-		//
-		assert newNode.getParent() != null;
-		_previousNode = newNode;
-		_model.show(newNode);
-	    }	    
-	}
-	private CommonBase _previousNode;
-    }
-
+   
     public void updateUI()
     {
 	super.updateUI();
@@ -178,7 +136,6 @@ public class MainPane extends JSplitPane
 	    basicUI.getDivider().setBorder(BorderFactory.createEmptyBorder());
 	}
     }
-  
 
     MainPane(Model model)
     {
@@ -191,10 +148,6 @@ public class MainPane extends JSplitPane
 	PopupListener popupListener = new PopupListener();
 
 	JTree tree = new JTree(_model.getTreeModel());
-	//
-	// Work-around for Java bug #4833524
-	//
-	// tree.setUI(new PlasticTreeUI());
 
 	tree.setBorder(new EmptyBorder(5, 5, 5, 5));
 	tree.setCellRenderer(renderer);
@@ -204,8 +157,6 @@ public class MainPane extends JSplitPane
 	tree.getSelectionModel().setSelectionMode
 	    (TreeSelectionModel.SINGLE_TREE_SELECTION);
 	
-	SelectionListener appSelectionListener = new SelectionListener();
-	tree.addTreeSelectionListener(appSelectionListener);
 	tree.setRootVisible(false);
 	_model.setTree(tree);
 		
diff --git a/java/src/IceGrid/Model.java b/java/src/IceGrid/Model.java
index 8d725f3b0d1..9ec72625743 100755
--- a/java/src/IceGrid/Model.java
+++ b/java/src/IceGrid/Model.java
@@ -29,6 +29,7 @@ import java.awt.event.KeyEvent;
 import javax.swing.AbstractAction;

 import javax.swing.Action;

 import javax.swing.ButtonGroup;

+import javax.swing.JButton;

 import javax.swing.JCheckBoxMenuItem;

 import javax.swing.JFrame;

 import javax.swing.JMenu;

@@ -40,6 +41,8 @@ import javax.swing.JTree;
 import javax.swing.KeyStroke;

 import javax.swing.SwingUtilities;

 

+import javax.swing.event.TreeSelectionEvent;

+import javax.swing.event.TreeSelectionListener;

 import javax.swing.tree.TreeModel;

 import javax.swing.tree.TreePath;

 

@@ -59,6 +62,53 @@ import IceGrid.TreeNode.Root;
 

 public class Model

 {

+    private class SelectionListener implements TreeSelectionListener

+    {

+	public void valueChanged(TreeSelectionEvent e)

+	{

+	    if(_selectionListenerEnabled)

+	    {

+		TreePath path = null;

+		if(e.isAddedPath())

+		{

+		    path = e.getPath();

+		}

+		

+		if(path == null)

+		{

+		    show(_root);

+		}

+		else

+		{

+		    CommonBase newNode = (CommonBase)path.getLastPathComponent();

+		    assert newNode.getParent() != null;

+		    

+		    if(_currentNode != null)

+		    {

+			if(_currentNode.isEphemeral())

+			{

+			    _currentNode.destroy();

+			}

+			else if(_currentNode.getParent() != null)

+			{

+			    _previousNodes.add(_currentNode);

+			    while(_previousNodes.size() >= HISTORY_MAX_SIZE)

+			    {

+				_previousNodes.removeFirst();

+			    }

+			    _back.setEnabled(true);

+			}

+		    }

+		    _nextNodes.clear();

+		    _forward.setEnabled(false);

+

+		    _currentNode = newNode;

+		    show(_currentNode);

+		}

+	    }

+	}

+    }

+

     private class MenuBar extends JMenuBar

     {

 	private MenuBar()

@@ -118,6 +168,7 @@ public class Model
 	    

 	    fileMenu.addSeparator();

 	    fileMenu.add(_login);

+	    fileMenu.add(_logout);

 	    fileMenu.addSeparator();

 	    fileMenu.add(_save);

 	    fileMenu.add(_discard);

@@ -143,7 +194,10 @@ public class Model
 	    add(viewMenu);

 	    viewMenu.add(_showVarsMenuItem);

 	    viewMenu.add(_substituteMenuItem);

-	    

+	    viewMenu.addSeparator();

+	    viewMenu.add(_back);

+	    viewMenu.add(_forward);

+

 	    //

 	    // Tools menu

 	    //

@@ -210,16 +264,53 @@ public class Model
 	    setFloatable(false);

 	    putClientProperty("JToolBar.isRollover", Boolean.TRUE);

 

-	    add(_login);

+	    JButton button = new JButton(_login);

+	    button.setText(null);

+	    button.setIcon(Utils.getIcon("/icons/24x24/login.png"));

+	    add(button);

+

 	    addSeparator();

-	    add(_save);

-	    add(_discard);

+	   	    

+	    button = new JButton(_back);

+	    button.setText(null);

+	    button.setIcon(Utils.getIcon("/icons/24x24/back.png"));

+	    add(button);

+	    button = new JButton(_forward);

+	    button.setText(null);

+	    button.setIcon(Utils.getIcon("/icons/24x24/forward.png"));

+	    add(button);

+

 	    addSeparator();

-	    add(_actions[CommonBase.COPY]);

-	    add(_actions[CommonBase.PASTE]);

+	    

+	    button = new JButton(_save);

+	    button.setText(null);

+	    button.setIcon(Utils.getIcon("/icons/24x24/save.png"));

+	    add(button);

+	    button = new JButton(_discard);

+	    button.setText(null);

+	    button.setIcon(Utils.getIcon("/icons/24x24/discard.png"));

+	    add(button);

+

 	    addSeparator();

-	    add(_actions[CommonBase.DELETE]);

+

+	    button = new JButton(_actions[CommonBase.COPY]);

+	    button.setText(null);

+	    button.setIcon(Utils.getIcon("/icons/24x24/copy.png"));

+	    add(button);

+	    button = new JButton(_actions[CommonBase.PASTE]);

+	    button.setText(null);

+	    button.setIcon(Utils.getIcon("/icons/24x24/paste.png"));

+	    add(button);

+

 	    addSeparator();

+

+	    button = new JButton(_actions[CommonBase.DELETE]);

+	    button.setText(null);

+	    button.setIcon(Utils.getIcon("/icons/24x24/delete.png"));

+	    add(button);

+

+	    addSeparator();

+

 	    add(_showVarsTool);

 	    add(_substituteTool);

 	}

@@ -602,13 +693,21 @@ public class Model
 	}

     }

     

-    private void discardUpdates(boolean showDialog)

+    

+    private void discardUpdates()

     {

 	assert _writeSerial == _latestSerial;

 

-	_sessionKeeper.relog(showDialog);

-	_save.setEnabled(false);

-	_discard.setEnabled(false);

+	int reallyDiscard = JOptionPane.showConfirmDialog(

+	    _mainFrame,

+	    "Do you want to discard all your updates?", 

+	    "Discard Confirmation",

+	    JOptionPane.YES_NO_OPTION);

+	

+	if(reallyDiscard == JOptionPane.YES_OPTION)

+	{

+	    _sessionKeeper.relog(false);

+	}

     }

 

 

@@ -651,6 +750,7 @@ public class Model
     {

 	_latestSerial = -1;

 	_writeSerial = -1;

+	_logout.setEnabled(false);

     }

     

     SessionPrx login(SessionKeeper.LoginInfo info, Component parent)

@@ -660,6 +760,12 @@ public class Model
 	_newMenu.setEnabled(false);

 	_newApplicationWithDefaultTemplates.setEnabled(false);

 

+	_previousNodes.clear();

+	_nextNodes.clear();

+	_currentNode = null;

+	_back.setEnabled(false);

+	_forward.setEnabled(false);

+

 	SessionPrx session = null;

 	

 	if(_routedAdapter != null)

@@ -801,6 +907,7 @@ public class Model
 	_newApplication.setEnabled(true);

 	_newApplicationWithDefaultTemplates.setEnabled(true);

 	_newMenu.setEnabled(true);

+	_logout.setEnabled(true);

 

 	return session;

     }

@@ -866,17 +973,6 @@ public class Model
 	}

     }

 

-    

-    boolean save()

-    {

-	return true;

-    }

-

-    boolean updated()

-    {

-	return true;

-    }  

-

     private void showVars()

     {

 	substitute(false);

@@ -927,6 +1023,11 @@ public class Model
 	_tree = tree;

 	_tree.getActionMap().put("copy", _actions[CommonBase.COPY]);

 	_tree.getActionMap().put("paste",  _actions[CommonBase.PASTE]);

+

+	SelectionListener appSelectionListener = new SelectionListener();

+	tree.addTreeSelectionListener(

+	    new SelectionListener());

+

     }

 

     public JTree getTree()

@@ -979,6 +1080,15 @@ public class Model
 	_root = new Root(this);

 	_treeModel = new TreeModelI(_root);

 

+	_shutdownHook = new Thread("Shutdown hook")

+	    {

+		public void run()

+		{

+		    destroyCommunicator();

+		}

+	    };

+	Runtime.getRuntime().addShutdownHook(_shutdownHook);

+	

 	//

 	// Fixed height for current status frame

 	//

@@ -1014,17 +1124,27 @@ public class Model
 	    };

 	_newApplicationWithDefaultTemplates.setEnabled(false);

 

-	_login = new AbstractAction("Login...", Utils.getIcon("/icons/24x24/login.png"))

+	_login = new AbstractAction("Login...")

 	    {

 		public void actionPerformed(ActionEvent e) 

 		{

 		    login();

 		}

 	    };

-	_login.putValue(Action.SHORT_DESCRIPTION, "Log into an IceGrid Registry");

+	_login.putValue(Action.SHORT_DESCRIPTION, 

+			"Log into an IceGrid Registry");

 

+	_logout = new AbstractAction("Logout")

+	    {

+		public void actionPerformed(ActionEvent e) 

+		{

+		    logout();

+		}

+	    };

+	_logout.putValue(Action.SHORT_DESCRIPTION, "Logout");

+	_logout.setEnabled(false);

 

-	_save = new AbstractAction("Save", Utils.getIcon("/icons/24x24/save.png"))

+	_save = new AbstractAction("Save")

 	    {

 		public void actionPerformed(ActionEvent e) 

 		{

@@ -1036,12 +1156,11 @@ public class Model
 		       KeyStroke.getKeyStroke(KeyEvent.VK_S, MENU_MASK));

 	_save.putValue(Action.SHORT_DESCRIPTION, "Save to IceGrid Registry");

 	

-	_discard = new AbstractAction("Discard all updates...", 

-				      Utils.getIcon("/icons/24x24/discard.png"))

+	_discard = new AbstractAction("Discard all updates...")

 	    {

 		public void actionPerformed(ActionEvent e) 

 		{

-		    discardUpdates(false);

+		    discardUpdates();

 		}

 	    };

 	_discard.setEnabled(false);

@@ -1056,6 +1175,26 @@ public class Model
 	    };

 	_exit.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke("alt F4"));

 

+

+	_back = new AbstractAction("Go back to previous node")

+	    {

+		public void actionPerformed(ActionEvent e) 

+		{

+		    back();

+		}

+	    };

+	_back.setEnabled(false);

+

+	_forward =  new AbstractAction("Go to next node")

+	    {

+		public void actionPerformed(ActionEvent e) 

+		{

+		    forward();

+		}

+	    };

+	_forward.setEnabled(false);

+

+

 	_about = new AbstractAction("About...")

 	    {

 		public void actionPerformed(ActionEvent e) 

@@ -1169,7 +1308,7 @@ public class Model
 	    };

 	

 	

-	_actions[CommonBase.COPY] = new AbstractAction("Copy", Utils.getIcon("/icons/24x24/copy.png"))

+	_actions[CommonBase.COPY] = new AbstractAction("Copy")

 	    {

 		public void actionPerformed(ActionEvent e) 

 		{

@@ -1180,7 +1319,7 @@ public class Model
 					   KeyStroke.getKeyStroke(KeyEvent.VK_C, MENU_MASK));

 	_actions[CommonBase.COPY].putValue(Action.SHORT_DESCRIPTION, "Copy");

 

-	_actions[CommonBase.PASTE] = new AbstractAction("Paste", Utils.getIcon("/icons/24x24/paste.png"))

+	_actions[CommonBase.PASTE] = new AbstractAction("Paste")

 	    {

 		public void actionPerformed(ActionEvent e) 

 		{

@@ -1191,7 +1330,7 @@ public class Model
 					    KeyStroke.getKeyStroke(KeyEvent.VK_V, MENU_MASK));

 	_actions[CommonBase.PASTE].putValue(Action.SHORT_DESCRIPTION, "Paste");

 

-	_actions[CommonBase.DELETE] = new AbstractAction("Delete", Utils.getIcon("/icons/24x24/delete.png"))

+	_actions[CommonBase.DELETE] = new AbstractAction("Delete")

 	    {

 		public void actionPerformed(ActionEvent e) 

 		{

@@ -1253,9 +1392,7 @@ public class Model
 	_showVarsMenuItem.setSelected(true);

 	_showVarsTool.setSelected(true);

 	

-	_actions[CommonBase.MOVE_UP] = new AbstractAction(

-	    "Move up", 

-	    Utils.getIcon("/icons/24x24/move_up.png"))

+	_actions[CommonBase.MOVE_UP] = new AbstractAction("Move up")

 	    {

 		public void actionPerformed(ActionEvent e) 

 		{

@@ -1263,9 +1400,7 @@ public class Model
 		}

 	    };

 			   

-	_actions[CommonBase.MOVE_DOWN] = new AbstractAction(

-	    "Move down",

-	    Utils.getIcon("/icons/24x24/move_down.png"))

+	_actions[CommonBase.MOVE_DOWN] = new AbstractAction("Move down")

 	    {

 		public void actionPerformed(ActionEvent e) 

 		{

@@ -1440,7 +1575,7 @@ public class Model
     }

 

     //

-    // "Login" action

+    // Login and logout action

     //

     private void login()

     {

@@ -1451,16 +1586,17 @@ public class Model
 		"Do you want to save your updates?", 

 		"Save Confirmation",

 		JOptionPane.YES_NO_CANCEL_OPTION);

+

 	    switch(saveFirst)

 	    {

 		case JOptionPane.YES_OPTION:

 		    if(saveUpdates())

 		    {

-			_sessionKeeper.createSession(false);

+			_sessionKeeper.relog(true);

 		    }

 		    break;

 		case JOptionPane.NO_OPTION:

-		    discardUpdates(true);

+		    _sessionKeeper.relog(true);

 		    break;

 		case JOptionPane.CANCEL_OPTION:

 		    break;

@@ -1473,7 +1609,135 @@ public class Model
 	    _sessionKeeper.relog(true);

 	}

     }

+

+    private void logout()

+    {

+	if(_latestSerial != -1 && _latestSerial == _writeSerial)

+	{

+	    int saveFirst = JOptionPane.showConfirmDialog(

+		_mainFrame,

+		"Do you want to save your updates?", 

+		"Save Confirmation",

+		JOptionPane.YES_NO_CANCEL_OPTION);

+

+	    switch(saveFirst)

+	    {

+		case JOptionPane.YES_OPTION:

+		    if(saveUpdates())

+		    {

+			_sessionKeeper.logout(true);

+		    }

+		    break;

+		case JOptionPane.NO_OPTION:

+		    _sessionKeeper.logout(true);

+		    break;

+		case JOptionPane.CANCEL_OPTION:

+		    break;

+		default:

+		    assert false;

+	    }

+	}

+	else

+	{

+	    _sessionKeeper.logout(true);

+	}

+    }

     

+    //

+    // Navigation

+    //

+

+    private void cleanList(java.util.LinkedList list)

+    {

+        CommonBase previous = null;

+	java.util.Iterator p = list.iterator();

+	while(p.hasNext())

+	{

+	    CommonBase current = (CommonBase)p.next();

+	    if(current == previous || current.getParent() == null)

+	    {

+		p.remove();

+	    }

+	    else

+	    {

+		previous = current;

+	    }

+	}

+    }

+

+    private void back()

+    {

+	cleanList(_previousNodes);

+

+	if(_previousNodes.size() == 0)

+	{

+	    _back.setEnabled(false);

+	}

+	else

+	{

+	    CommonBase previousNode = (CommonBase)_previousNodes.removeLast();

+	    if(_previousNodes.size() == 0)

+	    {

+		_back.setEnabled(false);

+	    }

+	    

+	    if(previousNode != _currentNode)

+	    {

+		assert _currentNode != null;

+		if(_currentNode.isEphemeral())

+		{

+		    _currentNode.destroy();

+		}

+		else

+		{

+		    assert _currentNode.getParent() != null;

+		    _nextNodes.addFirst(_currentNode);

+		    _forward.setEnabled(true);

+		}

+		

+		_currentNode = previousNode;

+		_selectionListenerEnabled = false;

+		_tree.setSelectionPath(_currentNode.getPath());

+		_selectionListenerEnabled = true;

+		show(_currentNode);

+	    }

+	}

+    }

+

+    private void forward()

+    {

+	cleanList(_nextNodes);

+

+	if(_nextNodes.size() == 0)

+	{

+	    _forward.setEnabled(false);

+	}

+	else

+	{

+	    CommonBase nextNode = (CommonBase)_nextNodes.removeFirst();	

+	    if(_nextNodes.size() == 0)

+	    {

+		_forward.setEnabled(false);

+	    }

+	    

+	    if(nextNode != _currentNode)

+	    {

+		assert _currentNode != null;

+		assert !_currentNode.isEphemeral();

+		assert _currentNode.getParent() != null;

+		

+		_previousNodes.add(_currentNode);

+		_back.setEnabled(true);

+		

+		_currentNode = nextNode;

+		_selectionListenerEnabled = false;

+		_tree.setSelectionPath(_currentNode.getPath());

+		_selectionListenerEnabled = true;

+		show(_currentNode);

+	    }

+	}

+    }

+

     public void setClipboard(Object copy)

     {

 	_clipboard = copy;

@@ -1496,30 +1760,31 @@ public class Model
 

     void exit(int status)

     {

-	System.err.println("Exiting from thread " + Thread.currentThread().getName());

-

 	storeWindowPrefs();

+	destroyCommunicator();

+	_mainFrame.dispose();

+	Runtime.getRuntime().removeShutdownHook(_shutdownHook);

+	Runtime.getRuntime().exit(status);

+    }

+    

+    //

+    // Can be called by the shutdown hook thread

+    //

+    private void destroyCommunicator()

+    {

 	System.err.println("Destroying communicator");

-	try

+

+	try	   

 	{

-	    if(_communicator != null)

-	    {

-		_communicator.destroy();

-	    }

+	    _communicator.destroy();

 	}

 	catch(Ice.LocalException e)

 	{

-	    // TODO: log error

+	    System.err.println("_communicator.destroy() raised "

+			       + e.toString());

 	}

-	

-	System.err.println("Dispose of main frame");

-	_mainFrame.dispose();

-

-	System.err.println("Calling Runtime.exit");

-	Runtime.getRuntime().exit(status);

     }

 

-

     private boolean loadWindowPrefs()

     {

 	try

@@ -1681,16 +1946,28 @@ public class Model
     private Object _clipboard;

 

     //

+    // back/forward navigation

+    //

+    private java.util.LinkedList _previousNodes = new java.util.LinkedList();

+    private CommonBase _currentNode;

+    private java.util.LinkedList _nextNodes = new java.util.LinkedList();

+    private boolean _selectionListenerEnabled = true;

+

+    //

     // Actions

     //

     private Action _newApplication;

     private Action _newApplicationWithDefaultTemplates;

     private Action _login;

+    private Action _logout;

     private Action _save;

     private Action _discard;

     private Action _exit;

+    private Action _back;

+    private Action _forward;

     private Action _about;

 

+

     private Action[] _actions;

     

     private JToggleButton _showVarsTool;

@@ -1708,4 +1985,8 @@ public class Model
     private JMenu _nodeMenu;

     private JMenu _serverMenu;

     private JMenu _serviceMenu;

+

+    private final Thread _shutdownHook;

+

+    static private final int HISTORY_MAX_SIZE = 20;

 }

diff --git a/java/src/IceGrid/SessionKeeper.java b/java/src/IceGrid/SessionKeeper.java
index 866e6ad7dca..369183ca86c 100755
--- a/java/src/IceGrid/SessionKeeper.java
+++ b/java/src/IceGrid/SessionKeeper.java
@@ -269,11 +269,8 @@ class SessionKeeper
 	    setResizable(false);

 	}

 

-	//

-	// Returns a copy; the new info is "installed" only after

-	// a successful login.

-	//

-	boolean showDialog()

+	

+	void showDialog()

 	{

 	    if(isVisible() == false)

 	    {

@@ -290,15 +287,11 @@ class SessionKeeper
 

 		setLocationRelativeTo(_model.getMainFrame());

 		setVisible(true);

-		return true;

-	    }

-	    else

-	    {

-		//

-		// Otherwise it was already on the screen!

-		//

-		return false;

 	    }

+	  

+	    //

+	    // Otherwise it was already on the screen!

+	    //

 	}

        

 	private void writeInfo()

@@ -417,10 +410,7 @@ class SessionKeeper
 	    _loginDialog.showDialog();

 	}

     }

-

-    //

-    // Runs in UI thread

-    //

+  

     void relog(boolean showDialog)

     {

 	if(_loginInfo == null)

@@ -435,10 +425,14 @@ class SessionKeeper
 	    }

 	}

     }

+    

+    void logout(boolean destroySession)

+    {

+	destroyObservers();

+	releaseSession(destroySession);

+	_model.sessionLost();

+    }

 

-    //

-    // Runs in UI thread

-    //

     private boolean login(Component parent)

     {

 	if(_session != null)

@@ -498,17 +492,6 @@ class SessionKeeper
 	return true;

     }

 

-    private void logout(boolean destroySession)

-    {

-	destroyObservers();

-	releaseSession(destroySession);

-	_model.sessionLost();

-    }

-

-

-    //

-    // Runs in UI thread

-    //

     void sessionLost(String message)

     {

 	JOptionPane.showMessageDialog(

@@ -521,9 +504,6 @@ class SessionKeeper
 	relog(true);

     }

 

-    //

-    // Runs in UI thread

-    //

     private void releaseSession(boolean destroySession)

     {

 	if(_session != null)

@@ -553,9 +533,6 @@ class SessionKeeper
 	}

     }

 

-    //

-    // Runs in UI thread

-    //

     private void registerObservers()

     {

 	//

diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index e4794a6112c..f87588ebf37 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Oct 20 16:53:32 2005
+// Generated by makeprops.py from file `../config/PropertyNames.def', Thu Oct 27 16:45:14 2005
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -98,6 +98,7 @@ public final class PropertyNames
 
     public static final String IceGridProps[] =
     {
+        "^IceGrid\\.AdminGUI\\.Endpoints$",
         "^IceGrid\\.InstanceName$",
         "^IceGrid\\.Node\\.AdapterId$",
         "^IceGrid\\.Node\\.ReplicaGroupId$",