diff options
author | Bernard Normier <bernard@zeroc.com> | 2016-09-08 12:25:33 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2016-09-08 12:25:33 -0400 |
commit | 555b5f20fcfeae6de3a4238072d09c0da0672649 (patch) | |
tree | 5f887fdf81baebdaf927d1c019de0786cf743ec7 | |
parent | ICE-7113: remove destroyed servers (diff) | |
download | ice-555b5f20fcfeae6de3a4238072d09c0da0672649.tar.bz2 ice-555b5f20fcfeae6de3a4238072d09c0da0672649.tar.xz ice-555b5f20fcfeae6de3a4238072d09c0da0672649.zip |
Fixed IceGridGUI bug introduced in previous commit
-rw-r--r-- | java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java | 2 | ||||
-rwxr-xr-x | java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowIceLogDialog.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java index 7e00cdf45d1..e12098dfd28 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java @@ -3393,8 +3393,8 @@ public class Coordinator void showMainFrame() { - Utils.restoreWindowBounds(_mainFrame, _prefs, "Window", null); _mainFrame.pack(); + Utils.restoreWindowBounds(_mainFrame, _prefs, "Window", null); _mainFrame.setVisible(true); } diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowIceLogDialog.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowIceLogDialog.java index 1b1e609edaf..4469c8a2880 100755 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowIceLogDialog.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/LiveDeployment/ShowIceLogDialog.java @@ -624,6 +624,8 @@ class ShowIceLogDialog extends JDialog setResizable(true); pack(); Utils.restoreWindowBounds(this, _preferences, "IceLogDialog", _parent.getRoot().getCoordinator().getMainFrame()); + _parent.getRoot().addShowIceLogDialog(_title, this); + setVisible(true); play(); |