diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceGridGUI/Coordinator.java | 28 | ||||
| -rw-r--r-- | java/src/IceGridGUI/LiveDeployment/Root.java | 5 | ||||
| -rw-r--r-- | java/src/IceGridGUI/LiveDeploymentPane.java | 4 | ||||
| -rw-r--r-- | java/src/IceGridGUI/SessionKeeper.java | 4 |
4 files changed, 34 insertions, 7 deletions
diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java index fab0bc7eca3..2ab2e6d9a0d 100644 --- a/java/src/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/Coordinator.java @@ -408,6 +408,7 @@ public class Coordinator toolsMenu.add(_appMenu); _appMenu.add(_patchApplication); _appMenu.add(_showApplicationDetails); + _appMenu.add(_showLiveDeploymentFilters); _appMenu.addSeparator(); _appMenu.add(_removeApplicationFromRegistry); _appMenu.setEnabled(false); @@ -1837,6 +1838,7 @@ public class Coordinator Coordinator(JFrame mainFrame, Ice.StringSeqHolder args, Preferences prefs) { + _connected = false; _mainFrame = mainFrame; _prefs = prefs; _initData = new Ice.InitializationData(); @@ -2278,11 +2280,15 @@ public class Coordinator } else { - String appName = (String)JOptionPane.showInputDialog( - _mainFrame, "Which Application do you to display", - "Show details", - JOptionPane.QUESTION_MESSAGE, null, - applicationNames, applicationNames[0]); + String appName = _liveDeploymentRoot.getApplicationNameFilter(); + if(appName == null) + { + appName = (String)JOptionPane.showInputDialog( + _mainFrame, "Which Application do you to display", + "Show details", + JOptionPane.QUESTION_MESSAGE, null, + applicationNames, applicationNames[0]); + } if(appName != null) { @@ -2716,6 +2722,17 @@ public class Coordinator trace("SaveToRegistry", message); } + public void setConnected(boolean connected) + { + _connected = connected; + _statusBar.setConnected(connected); + } + + public boolean connected() + { + return _connected; + } + // // May run in any thread // @@ -2839,6 +2856,7 @@ public class Coordinator private Process _icegridadminProcess; private String _fileParser; + private boolean _connected; static private final int HISTORY_MAX_SIZE = 20; } diff --git a/java/src/IceGridGUI/LiveDeployment/Root.java b/java/src/IceGridGUI/LiveDeployment/Root.java index 2da2ccecb3a..6d5ab994ad8 100644 --- a/java/src/IceGridGUI/LiveDeployment/Root.java +++ b/java/src/IceGridGUI/LiveDeployment/Root.java @@ -148,6 +148,11 @@ public class Root extends ListArrayTreeNode _treeModel.resetFilters(); } + public String getApplicationNameFilter() + { + return _applicationNameFilter; + } + public Root(Coordinator coordinator) { super(null, "Root", 2); diff --git a/java/src/IceGridGUI/LiveDeploymentPane.java b/java/src/IceGridGUI/LiveDeploymentPane.java index 7fb406afdff..8e16a0a1a3f 100644 --- a/java/src/IceGridGUI/LiveDeploymentPane.java +++ b/java/src/IceGridGUI/LiveDeploymentPane.java @@ -46,6 +46,10 @@ public class LiveDeploymentPane extends JSplitPane implements Tab { Coordinator c = _root.getCoordinator(); + if(c.connected()) + { + c.getShowLiveDeploymentFiltersAction().setEnabled(true); + } c.getCloseApplicationAction().setEnabled(false); c.getSaveAction().setEnabled(false); c.getSaveToRegistryAction().setEnabled(false); diff --git a/java/src/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/SessionKeeper.java index bf8e6cad25b..4b5113ebf97 100644 --- a/java/src/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/SessionKeeper.java @@ -248,7 +248,7 @@ class SessionKeeper { _coordinator.destroySession(_session); } - _coordinator.getStatusBar().setConnected(false); + _coordinator.setConnected(false); } private void registerObservers(boolean routed) @@ -1334,7 +1334,7 @@ class SessionKeeper return false; } - _coordinator.getStatusBar().setConnected(true); + _coordinator.setConnected(true); _connectedToMaster = _replicaName.equals("Master"); if(_connectedToMaster) |