summaryrefslogtreecommitdiff
path: root/java/src/IceGridGUI/ApplicationPane.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-08-30 14:43:15 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-08-30 14:43:15 +0200
commitaab12cf1719b425b5a2c571b8938d47cdd71d151 (patch)
tree876561b05764721306eb8629883e7b0b9cbbc99a /java/src/IceGridGUI/ApplicationPane.java
parentminor g++ warning (diff)
downloadice-aab12cf1719b425b5a2c571b8938d47cdd71d151.tar.bz2
ice-aab12cf1719b425b5a2c571b8938d47cdd71d151.tar.xz
ice-aab12cf1719b425b5a2c571b8938d47cdd71d151.zip
ICE-4774: Merged skype_props enhancement
Diffstat (limited to 'java/src/IceGridGUI/ApplicationPane.java')
-rw-r--r--java/src/IceGridGUI/ApplicationPane.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/ApplicationPane.java b/java/src/IceGridGUI/ApplicationPane.java
index a750c5e4bcd..1b2cb3a5c92 100644
--- a/java/src/IceGridGUI/ApplicationPane.java
+++ b/java/src/IceGridGUI/ApplicationPane.java
@@ -59,10 +59,12 @@ public class ApplicationPane extends JSplitPane implements Tab
if(_root.isLive())
{
c.getSaveToRegistryAction().setEnabled(_root.needsSaving() && c.connectedToMaster());
+ c.getSaveToRegistryWithoutRestartAction().setEnabled(_root.needsSaving() && c.connectedToMaster());
}
else
{
c.getSaveToRegistryAction().setEnabled(c.connectedToMaster());
+ c.getSaveToRegistryWithoutRestartAction().setEnabled(c.connectedToMaster());
}
c.getSaveToFileAction().setEnabled(true);
@@ -270,11 +272,11 @@ public class ApplicationPane extends JSplitPane implements Tab
}
}
- public void saveToRegistry()
+ public void saveToRegistry(boolean restart)
{
if(_currentEditor == null || _currentEditor.save(true))
{
- _root.saveToRegistry();
+ _root.saveToRegistry(restart);
}
}