From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/src/quicksetup/org/opends/quicksetup/ui/ProgressDialog.java | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressDialog.java b/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressDialog.java
index 07593fe..4d9a95e 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressDialog.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/ProgressDialog.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.quicksetup.ui;
@@ -66,8 +67,6 @@
private JEditorPane detailsTextArea;
- private JScrollPane scroll;
-
private Message lastText;
private JFrame parent;
@@ -117,15 +116,6 @@
}
/**
- * Sets the title of the panel.
- * @param title the title of the panel.
- */
- public void setPanelTitle(Message title)
- {
- this.panelTitle = title;
- }
-
- /**
* Returns the title of the panel.
* @return the title of the panel
*/
@@ -242,7 +232,7 @@
gbc.insets = UIFactory.getEmptyInsets();
mainPanel.add(l, gbc);
- scroll = new JScrollPane();
+ JScrollPane scroll = new JScrollPane();
detailsTextArea = UIFactory.makeProgressPane(scroll);
detailsTextArea.setBackground(
UIFactory.CURRENT_STEP_PANEL_BACKGROUND);
@@ -253,9 +243,8 @@
if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED)
{
String url = e.getURL().toString();
- Message newText = getFormatter().getFormattedAfterUrlClick(url,
+ lastText = getFormatter().getFormattedAfterUrlClick(url,
lastText);
- lastText = newText;
setDetails(lastText);
}
}
--
Gitblit v1.10.0