From 06ec8c88556b02782c7b91a233de91eaf4a1439d Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 09 Jun 2009 12:28:05 +0000
Subject: [PATCH] Fix for issue 3550 (Consider making the control panel able to manage remote servers)
---
opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
index 5b3c28c..090ecff 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
@@ -155,7 +155,9 @@
private boolean readUseOpenDSJavaHome;
private boolean readUseOpenDSJavaArgs;
- private boolean firstDisplay = true;
+ private boolean initialized = false;
+
+ private boolean previousLocal = true;
private Message READING_JAVA_SETTINGS =
INFO_CTRL_PANEL_READING_JAVA_SETTINGS_SUMMARY.get();
@@ -240,7 +242,6 @@
gbc.insets.left = 0;
add(useOpenDSJavaHomeLabel, gbc);
-
gbc.gridx = 1;
gbc.gridy ++;
gbc.fill = GridBagConstraints.HORIZONTAL;
@@ -416,7 +417,7 @@
comps = new JComponent[] {
javaHome, useOpenDSJavaHome, useSpecifiedJavaHome, browse,
- useOpenDSJavaArgs, useSpecifiedJavaArgs
+ useOpenDSJavaArgs, useSpecifiedJavaArgs, showAll
};
}
@@ -425,6 +426,31 @@
*/
public void configurationChanged(ConfigurationChangeEvent ev)
{
+ final boolean isLocal = ev.getNewDescriptor().isLocal();
+ if (isLocal != previousLocal)
+ {
+ previousLocal = isLocal;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ /**
+ * {@inheritDoc}
+ */
+ public void run()
+ {
+ if (!isLocal)
+ {
+ displayErrorMessage(INFO_CTRL_PANEL_SERVER_REMOTE_SUMMARY.get(),
+ INFO_CTRL_PANEL_SERVER_MUST_BE_LOCAL_JAVA_PROPERTIES_SUMMARY.get());
+ setEnabledOK(false);
+ }
+ else
+ {
+ displayMainPanel();
+ setEnabledOK(true);
+ }
+ }
+ });
+ }
}
/**
@@ -433,9 +459,14 @@
@Override
public void toBeDisplayed(boolean visible)
{
- if (visible && (firstDisplay || !updatedByUser()))
+ boolean isLocal = true;
+ if (getInfo() != null)
{
- firstDisplay = false;
+ isLocal = getInfo().getServerDescriptor().isLocal();
+ }
+ if (visible && isLocal && (!initialized || !updatedByUser()))
+ {
+ initialized = true;
initContents();
}
}
@@ -1376,7 +1407,7 @@
boolean canLaunch = true;
if (!isServerRunning())
{
- if (state == State.RUNNING)
+ if (state == State.RUNNING && runningOnSameServer(taskToBeLaunched))
{
// All the operations are incompatible if they apply to this
// backend for safety. This is a short operation so the limitation
--
Gitblit v1.10.0