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/JavaArguments.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/JavaArguments.java b/opends/src/quicksetup/org/opends/quicksetup/JavaArguments.java
index 8b2eafe..8484e07 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/JavaArguments.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/JavaArguments.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.quicksetup;
@@ -168,11 +169,12 @@
public String toString()
{
StringBuilder sb = new StringBuilder();
- sb.append("Initial Memory: "+initialMemory+" Max Memory: "+maxMemory);
+ sb.append("Initial Memory: ").append(initialMemory)
+ .append(" Max Memory: ").append(maxMemory);
int i=1;
for (String arg : additionalArguments)
{
- sb.append(" arg "+i+": "+arg);
+ sb.append(" arg ").append(i).append(": ").append(arg);
i++;
}
return sb.toString();
@@ -191,7 +193,7 @@
{
Message msg = getMessage(javaArguments, defaultJavaArguments);
String s = msg.toString();
- if (s.indexOf("<br>") != -1)
+ if (s.contains("<br>"))
{
msg = Message.raw("<html>"+UIFactory.applyFontToHtml(s, font));
}
--
Gitblit v1.10.0