From 80c58327faaa4873369f6bb949e62792c2f708e0 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 116 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 66 insertions(+), 50 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index b0b0571..f6511fe 100644
--- a/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.backends.jeb;
+import org.opends.messages.Message;
import java.util.ArrayList;
import java.util.Comparator;
@@ -46,8 +47,8 @@
import org.opends.server.admin.std.meta.JEIndexCfgDefn;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.config.ConfigException;
-import static org.opends.server.messages.JebMessages.*;
-import static org.opends.server.messages.MessageHandler.getMessage;
+import static org.opends.messages.JebMessages.*;
+
import org.opends.server.core.DirectoryServer;
import org.opends.server.util.StaticUtils;
@@ -147,9 +148,9 @@
{
if (attrType.getEqualityMatchingRule() == null)
{
- int messageID = MSGID_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE;
- String message = getMessage(messageID, attrType, "equality");
- throw new ConfigException(messageID, message);
+ Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ String.valueOf(attrType), "equality");
+ throw new ConfigException(message);
}
Indexer equalityIndexer = new EqualityIndexer(attrType);
@@ -178,9 +179,9 @@
{
if (attrType.getSubstringMatchingRule() == null)
{
- int messageID = MSGID_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE;
- String message = getMessage(messageID, attrType, "substring");
- throw new ConfigException(messageID, message);
+ Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ String.valueOf(attrType), "substring");
+ throw new ConfigException(message);
}
Indexer substringIndexer = new SubstringIndexer(attrType,
@@ -198,9 +199,9 @@
{
if (attrType.getOrderingMatchingRule() == null)
{
- int messageID = MSGID_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE;
- String message = getMessage(messageID, attrType, "ordering");
- throw new ConfigException(messageID, message);
+ Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ String.valueOf(attrType), "ordering");
+ throw new ConfigException(message);
}
Indexer orderingIndexer = new OrderingIndexer(attrType);
@@ -217,9 +218,9 @@
{
if (attrType.getApproximateMatchingRule() == null)
{
- int messageID = MSGID_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE;
- String message = getMessage(messageID, attrType, "approximate");
- throw new ConfigException(messageID, message);
+ Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ String.valueOf(attrType), "approximate");
+ throw new ConfigException(message);
}
Indexer approximateIndexer = new ApproximateIndexer(attrType);
@@ -1153,7 +1154,7 @@
*/
public synchronized boolean isConfigurationChangeAcceptable(
JEIndexCfg cfg,
- List<String> unacceptableReasons)
+ List<Message> unacceptableReasons)
{
AttributeType attrType = cfg.getIndexAttribute();
@@ -1161,8 +1162,8 @@
{
if (equalityIndex == null && attrType.getEqualityMatchingRule() == null)
{
- int messageID = MSGID_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE;
- String message = getMessage(messageID, attrType, "equality");
+ Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ String.valueOf(String.valueOf(attrType)), "equality");
unacceptableReasons.add(message);
return false;
}
@@ -1172,8 +1173,8 @@
{
if (substringIndex == null && attrType.getSubstringMatchingRule() == null)
{
- int messageID = MSGID_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE;
- String message = getMessage(messageID, attrType, "substring");
+ Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ String.valueOf(attrType), "substring");
unacceptableReasons.add(message);
return false;
}
@@ -1184,8 +1185,8 @@
{
if (orderingIndex == null && attrType.getOrderingMatchingRule() == null)
{
- int messageID = MSGID_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE;
- String message = getMessage(messageID, attrType, "ordering");
+ Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ String.valueOf(attrType), "ordering");
unacceptableReasons.add(message);
return false;
}
@@ -1195,8 +1196,8 @@
if (approximateIndex == null &&
attrType.getApproximateMatchingRule() == null)
{
- int messageID = MSGID_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE;
- String message = getMessage(messageID, attrType, "approximate");
+ Message message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
+ String.valueOf(attrType), "approximate");
unacceptableReasons.add(message);
return false;
}
@@ -1213,7 +1214,7 @@
{
ConfigChangeResult ccr;
boolean adminActionRequired = false;
- ArrayList<String> messages = new ArrayList<String>();
+ ArrayList<Message> messages = new ArrayList<Message>();
try
{
AttributeType attrType = cfg.getIndexAttribute();
@@ -1237,8 +1238,8 @@
equalityIndex.open();
adminActionRequired = true;
- int msgID = MSGID_JEB_INDEX_ADD_REQUIRES_REBUILD;
- messages.add(getMessage(msgID, name + ".equality"));
+ messages.add(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
+ name + ".equality"));
}
else
@@ -1248,8 +1249,9 @@
{
adminActionRequired = true;
- int msgID = MSGID_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD;
- String message = getMessage(msgID, name + ".equality");
+ Message message =
+ NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(
+ name + ".equality");
messages.add(message);
this.equalityIndex.setIndexEntryLimit(indexEntryLimit);
}
@@ -1267,7 +1269,8 @@
}
catch(DatabaseException de)
{
- messages.add(StaticUtils.stackTraceToSingleLineString(de));
+ messages.add(Message.raw(
+ StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(), false, messages);
return ccr;
@@ -1294,8 +1297,9 @@
presenceIndex.open();
adminActionRequired = true;
- int msgID = MSGID_JEB_INDEX_ADD_REQUIRES_REBUILD;
- messages.add(getMessage(msgID, name + ".presence"));
+
+ messages.add(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
+ name + ".presence"));
}
else
{
@@ -1303,8 +1307,10 @@
if(this.presenceIndex.setIndexEntryLimit(indexEntryLimit))
{
adminActionRequired = true;
- int msgID = MSGID_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD;
- String message = getMessage(msgID, name + ".presence");
+
+ Message message =
+ NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(
+ name + ".presence");
messages.add(message);
}
}
@@ -1321,7 +1327,8 @@
}
catch(DatabaseException de)
{
- messages.add(StaticUtils.stackTraceToSingleLineString(de));
+ messages.add(Message.raw(
+ StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(), false, messages);
return ccr;
@@ -1349,8 +1356,8 @@
substringIndex.open();
adminActionRequired = true;
- int msgID = MSGID_JEB_INDEX_ADD_REQUIRES_REBUILD;
- messages.add(getMessage(msgID, name + ".substring"));
+ messages.add(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
+ name + ".substring"));
}
else
{
@@ -1358,8 +1365,9 @@
if(this.substringIndex.setIndexEntryLimit(indexEntryLimit))
{
adminActionRequired = true;
- int msgID = MSGID_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD;
- String message = getMessage(msgID, name + ".substring");
+ Message message =
+ NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(
+ name + ".substring");
messages.add(message);
}
@@ -1384,7 +1392,8 @@
}
catch(DatabaseException de)
{
- messages.add(StaticUtils.stackTraceToSingleLineString(de));
+ messages.add(Message.raw(
+ StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(), false, messages);
return ccr;
@@ -1411,8 +1420,8 @@
orderingIndex.open();
adminActionRequired = true;
- int msgID = MSGID_JEB_INDEX_ADD_REQUIRES_REBUILD;
- messages.add(getMessage(msgID, name + ".ordering"));
+ messages.add(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
+ name + ".ordering"));
}
else
{
@@ -1420,8 +1429,10 @@
if(this.orderingIndex.setIndexEntryLimit(indexEntryLimit))
{
adminActionRequired = true;
- int msgID = MSGID_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD;
- String message = getMessage(msgID, name + ".ordering");
+
+ Message message =
+ NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(
+ name + ".ordering");
messages.add(message);
}
}
@@ -1438,7 +1449,8 @@
}
catch(DatabaseException de)
{
- messages.add(StaticUtils.stackTraceToSingleLineString(de));
+ messages.add(Message.raw(
+ StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(), false, messages);
return ccr;
@@ -1465,8 +1477,9 @@
approximateIndex.open();
adminActionRequired = true;
- int msgID = MSGID_JEB_INDEX_ADD_REQUIRES_REBUILD;
- messages.add(getMessage(msgID, name + ".approximate"));
+
+ messages.add(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
+ name + ".approximate"));
}
else
{
@@ -1474,8 +1487,10 @@
if(this.approximateIndex.setIndexEntryLimit(indexEntryLimit))
{
adminActionRequired = true;
- int msgID = MSGID_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD;
- String message = getMessage(msgID, name + ".approximate");
+
+ Message message =
+ NOTE_JEB_CONFIG_INDEX_ENTRY_LIMIT_REQUIRES_REBUILD.get(
+ name + ".approximate");
messages.add(message);
}
}
@@ -1492,7 +1507,8 @@
}
catch(DatabaseException de)
{
- messages.add(StaticUtils.stackTraceToSingleLineString(de));
+ messages.add(
+ Message.raw(StaticUtils.stackTraceToSingleLineString(de)));
ccr = new ConfigChangeResult(
DirectoryServer.getServerErrorResultCode(), false, messages);
return ccr;
@@ -1511,7 +1527,7 @@
}
catch(Exception e)
{
- messages.add(StaticUtils.stackTraceToSingleLineString(e));
+ messages.add(Message.raw(StaticUtils.stackTraceToSingleLineString(e)));
ccr = new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
adminActionRequired,
messages);
--
Gitblit v1.10.0