From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0
---
opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
index ec223f1..df64d8a 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2009 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -41,6 +41,7 @@
import org.opends.guitools.controlpanel.util.BackgroundTask;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.quicksetup.ui.WebBrowserErrorDialog;
+import org.opends.quicksetup.util.Utils;
import org.opends.quicksetup.util.WebBrowserException;
import org.opends.quicksetup.util.WebBrowserLauncher;
@@ -54,6 +55,20 @@
private ControlPanelInfo info;
/**
+ * The URL to the administration guide.
+ */
+ protected final String ADMINISTRATION_GUIDE_URL =
+ Utils.getCustomizedObject("ADMINISTRATION_GUIDE_URL",
+ "https://www.opends.org/wiki/page/AdministrationGuide", String.class);
+
+ /**
+ * The URL to the wiki main page.
+ */
+ protected final String WIKI_MAIN_PAGE_URL =
+ Utils.getCustomizedObject("WIKI_MAIN_PAGE_URL",
+ "https://www.opends.org/wiki/page/Main", String.class);
+
+ /**
* Constructor of the menu bar.
* @param info the control panel information.
*/
@@ -86,7 +101,7 @@
{
public void actionPerformed(ActionEvent ev)
{
- displayURL("https://www.opends.org/wiki/page/AdministrationGuide");
+ displayURL(ADMINISTRATION_GUIDE_URL);
}
});
menu.add(menuItem);
@@ -96,7 +111,7 @@
{
public void actionPerformed(ActionEvent ev)
{
- displayURL("https://www.opends.org/wiki/page/Main");
+ displayURL(WIKI_MAIN_PAGE_URL);
}
});
menu.add(menuItem);
--
Gitblit v1.10.0