From 54c2799f45256fef4a981fa2a6a7c97a9708ac8b Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 26 Jul 2007 12:01:44 +0000
Subject: [PATCH] Partial fix for issue 1831 - dsconfig interactive mode.
---
opends/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java b/opends/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
index 2c1865e..dc36db0 100644
--- a/opends/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
+++ b/opends/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResource.java
@@ -95,7 +95,7 @@
// Mapping from definition to locale-based resource bundle.
- private final Map<AbstractManagedObjectDefinition,
+ private final Map<AbstractManagedObjectDefinition<?, ?>,
Map<Locale, ResourceBundle>> resources;
@@ -107,7 +107,7 @@
// Private constructor.
private ManagedObjectDefinitionI18NResource(String prefix) {
- this.resources = new HashMap<AbstractManagedObjectDefinition,
+ this.resources = new HashMap<AbstractManagedObjectDefinition<?, ?>,
Map<Locale, ResourceBundle>>();
this.prefix = prefix;
}
@@ -127,7 +127,7 @@
* @throws MissingResourceException
* If the key was not found.
*/
- public String getMessage(AbstractManagedObjectDefinition d,
+ public String getMessage(AbstractManagedObjectDefinition<?, ?> d,
String key) throws MissingResourceException {
return getMessage(d, key, Locale.getDefault(), (String[]) null);
}
@@ -149,7 +149,7 @@
* @throws MissingResourceException
* If the key was not found.
*/
- public String getMessage(AbstractManagedObjectDefinition d,
+ public String getMessage(AbstractManagedObjectDefinition<?, ?> d,
String key, Locale locale) throws MissingResourceException {
return getMessage(d, key, locale, (String[]) null);
}
@@ -174,7 +174,7 @@
* @throws MissingResourceException
* If the key was not found.
*/
- public String getMessage(AbstractManagedObjectDefinition d,
+ public String getMessage(AbstractManagedObjectDefinition<?, ?> d,
String key, Locale locale, String... args)
throws MissingResourceException {
ResourceBundle resource = getResourceBundle(d, locale);
@@ -205,7 +205,7 @@
* @throws MissingResourceException
* If the key was not found.
*/
- public String getMessage(AbstractManagedObjectDefinition d,
+ public String getMessage(AbstractManagedObjectDefinition<?, ?> d,
String key, String... args) throws MissingResourceException {
return getMessage(d, key, Locale.getDefault(), args);
}
@@ -215,7 +215,7 @@
// Retrieve the resource bundle associated with a managed object and
// locale, lazily loading it if necessary.
private synchronized ResourceBundle getResourceBundle(
- AbstractManagedObjectDefinition d, Locale locale)
+ AbstractManagedObjectDefinition<?, ?> d, Locale locale)
throws MissingResourceException {
// First get the locale-resource mapping, creating it if
// necessary.
--
Gitblit v1.10.0