From 1b9f39db0f5450de6c3bb97cec681c342fff5944 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Tue, 08 Dec 2009 10:52:42 +0000
Subject: [PATCH] Move Message/MessageBuilder/LocalizableException/LocalizableIllegalArgumentException to public API since other public API elements reference them. Prefix Message/MessageBuilder with Localizable to emphasize that these classes are I18N related and not protocol messages. Keep MessageDescriptor private since users should not need access to it for now.
---
sdk/src/org/opends/sdk/ldif/LDIFEntryReader.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/sdk/src/org/opends/sdk/ldif/LDIFEntryReader.java b/sdk/src/org/opends/sdk/ldif/LDIFEntryReader.java
index d78a35f..a0a886d 100644
--- a/sdk/src/org/opends/sdk/ldif/LDIFEntryReader.java
+++ b/sdk/src/org/opends/sdk/ldif/LDIFEntryReader.java
@@ -39,8 +39,6 @@
import org.opends.sdk.*;
import org.opends.sdk.schema.Schema;
-import com.sun.opends.sdk.util.LocalizedIllegalArgumentException;
-import com.sun.opends.sdk.util.Message;
import com.sun.opends.sdk.util.Validator;
@@ -80,7 +78,7 @@
if (entry == null)
{
// No change record found.
- Message message = WARN_READ_LDIF_RECORD_NO_CHANGE_RECORD_FOUND
+ LocalizableMessage message = WARN_READ_LDIF_RECORD_NO_CHANGE_RECORD_FOUND
.get();
throw new LocalizedIllegalArgumentException(message);
}
@@ -88,7 +86,7 @@
if (reader.readEntry() != null)
{
// Multiple change records found.
- Message message = WARN_READ_LDIF_RECORD_MULTIPLE_CHANGE_RECORDS_FOUND
+ LocalizableMessage message = WARN_READ_LDIF_RECORD_MULTIPLE_CHANGE_RECORDS_FOUND
.get();
throw new LocalizedIllegalArgumentException(message);
}
@@ -103,7 +101,7 @@
catch (IOException e)
{
// This should never happen for a String based reader.
- Message message = WARN_READ_LDIF_RECORD_UNEXPECTED_IO_ERROR.get(e
+ LocalizableMessage message = WARN_READ_LDIF_RECORD_UNEXPECTED_IO_ERROR.get(e
.getMessage());
throw new LocalizedIllegalArgumentException(message);
}
@@ -209,7 +207,7 @@
// Skip if branch containing the entry DN is excluded.
if (isBranchExcluded(entryDN))
{
- final Message message = Message
+ final LocalizableMessage message = LocalizableMessage
.raw("Skipping entry because it is in excluded branch");
skipLDIFRecord(record, message);
continue;
@@ -234,7 +232,7 @@
// Skip if the entry is excluded by any filters.
if (isEntryExcluded(entry))
{
- final Message message = Message
+ final LocalizableMessage message = LocalizableMessage
.raw("Skipping entry due to exclusing filters");
skipLDIFRecord(record, message);
continue;
--
Gitblit v1.10.0