From 56269af431723ec4c456c92d0d019e7f6e16832a Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 10 Feb 2014 16:17:31 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/messages/src/org/opends/messages/Severity.java | 47 ++++++++++-------------------------------------
1 files changed, 10 insertions(+), 37 deletions(-)
diff --git a/opendj3-server-dev/src/messages/src/org/opends/messages/Severity.java b/opendj3-server-dev/src/messages/src/org/opends/messages/Severity.java
index 380e8d2..d8fbe0d 100644
--- a/opendj3-server-dev/src/messages/src/org/opends/messages/Severity.java
+++ b/opendj3-server-dev/src/messages/src/org/opends/messages/Severity.java
@@ -49,53 +49,28 @@
/**
* The severity that will be used for informational messages.
*/
- INFORMATION("INFO", "INFO"),
+ INFORMATION("INFO"),
/**
* The severity that will be used for warning messages.
*/
- WARNING("WARN", "WARN"),
+ WARNING("WARN"),
/**
* The severity that will be used for warning messages.
*/
- ERROR("ERR", "ERR"),
-
- /**
- * The severity that will be used for mild warning messages.
- */
- MILD_WARNING("MILD_WARN", "WARN"),
-
- /**
- * The severity that will be used for severe warning messages.
- */
- SEVERE_WARNING("SEVERE_WARN", "WARN"),
-
- /**
- * The severity that will be used for mild error messages.
- */
- MILD_ERROR("MILD_ERR", "ERR"),
-
- /**
- * The severity that will be used for severe error messages.
- */
- SEVERE_ERROR("SEVERE_ERR", "ERR"),
-
- /**
- * The severity that will be used for fatal error messages.
- */
- FATAL_ERROR("FATAL_ERR", "ERR"),
+ ERROR("ERR"),
/**
* The severity that will be used for debug messages.
*/
- DEBUG("DEBUG", "DEBUG"),
+ DEBUG("DEBUG"),
/**
* The severity that will be used for important informational
* messages.
*/
- NOTICE("NOTE", "NOTE");
+ NOTICE("NOTE");
static private Set<String> PROPERTY_KEY_FORM_VALUES_SET;
@@ -134,15 +109,14 @@
return sev;
}
- private final String propertyKeyForm;
- private final String messageDescriptorForm;
+ private final String name;
/**
* Gets the abbreviated form of this <code>Severity</code>.
* @return String abbreviated form
*/
public String messageDesciptorName() {
- return messageDescriptorForm;
+ return name;
}
/**
@@ -152,12 +126,11 @@
* @return name of this severity
*/
public String propertyKeyFormName() {
- return propertyKeyForm;
+ return name;
}
- private Severity(String propertyKeyForm, String messageDescriptorName) {
- this.propertyKeyForm = propertyKeyForm;
- this.messageDescriptorForm = messageDescriptorName;
+ private Severity(String propertyKeyForm) {
+ this.name = propertyKeyForm;
}
}
--
Gitblit v1.10.0