From 0f7b83578af3a66529590cf0516dc8bc1b79b8c1 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Tue, 05 Jun 2007 21:02:26 +0000
Subject: [PATCH] This commit introduces several bits of quicksetup plumbing necessary to support the upgrader's interaction in asking the user whether they would like to cancel an upgrade if there are problems found:
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
index 28bad38..e5bc404 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/HtmlProgressMessageFormatter.java
@@ -94,7 +94,7 @@
public String getFormattedError(String text, boolean applyMargin)
{
String html;
- if (!containsHtml(text)) {
+ if (!Utils.containsHtml(text)) {
html = UIFactory.getIconHtml(UIFactory.IconType.ERROR_LARGE)
+ SPACE
+ SPACE
@@ -127,7 +127,7 @@
public String getFormattedWarning(String text, boolean applyMargin)
{
String html;
- if (!containsHtml(text)) {
+ if (!Utils.containsHtml(text)) {
html =
UIFactory.getIconHtml(UIFactory.IconType.WARNING_LARGE)
+ SPACE
@@ -620,10 +620,5 @@
}
}
- private boolean containsHtml(String text) {
- return (text != null &&
- text.indexOf('<') != -1 &&
- text.indexOf('>') != -1);
- }
}
--
Gitblit v1.10.0