From 6454d997bddb71722f4f7ee8f398ac4f18b13b3b Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 16 Aug 2007 00:22:53 +0000
Subject: [PATCH] Make a change to remove additional ambiguity among Messages.raw methods. The version with arguments (Object, Object...) has been renamed to fromObject, as it may have been seen as a conflict with one or more other raw methods. There was only a single existing use of the renamed method, and it has been updated.
---
opendj-sdk/opends/src/messages/src/org/opends/messages/Message.java | 2 +-
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/src/org/opends/messages/Message.java b/opendj-sdk/opends/src/messages/src/org/opends/messages/Message.java
index 91e0693..1d0b6ef 100644
--- a/opendj-sdk/opends/src/messages/src/org/opends/messages/Message.java
+++ b/opendj-sdk/opends/src/messages/src/org/opends/messages/Message.java
@@ -112,7 +112,7 @@
* @return a message object that will render the same in all locales;
* null if <code>object</code> is null
*/
- static public Message raw(Object object, Object... arguments) {
+ static public Message fromObject(Object object, Object... arguments) {
Message message = null;
if (object != null) {
CharSequence cs = object.toString();
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
index 0d7391e..b5505b6 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
@@ -1694,7 +1694,8 @@
boolean isSelected,
boolean cellHasFocus)
{
- JLabel l = makeJLabel(IconType.NO_ICON, Message.raw(value), textStyle);
+ JLabel l = makeJLabel(IconType.NO_ICON, Message.fromObject(value),
+ textStyle);
l.setBorder(new EmptyBorder(TOP_INSET_SECONDARY_FIELD, 0, 0, 0));
return l;
}
--
Gitblit v1.10.0