From 8d363b60e9cb04609592c2368f550c2ea8a6ab34 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 07 Dec 2007 17:36:12 +0000
Subject: [PATCH] This relates to issue 2661 "public APIs must not reference private classes".

---
 opendj-sdk/opends/src/messages/src/org/opends/messages/MessageDescriptorRegistry.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/opendj-sdk/opends/src/messages/src/org/opends/messages/MessageDescriptorRegistry.java b/opendj-sdk/opends/src/messages/src/org/opends/messages/MessageDescriptorRegistry.java
index 0a2306b..af6c205 100644
--- a/opendj-sdk/opends/src/messages/src/org/opends/messages/MessageDescriptorRegistry.java
+++ b/opendj-sdk/opends/src/messages/src/org/opends/messages/MessageDescriptorRegistry.java
@@ -46,20 +46,22 @@
  * descriptors are stored in the text file "descriptors.reg" which is
  * generated during the OpenDS build process.
  */
-public class MessageDescriptorRegistry {
+@org.opends.server.types.PublicAPI(
+     stability=org.opends.server.types.StabilityLevel.PRIVATE)
+final class MessageDescriptorRegistry {
 
   private static final String REGISTRY_FILE = "descriptors.reg";
 
-  private static final Set<Class> REGISTERED_MESSAGE_CLASSES =
-                  new HashSet<Class>();
+  private static final Set<Class<?>> REGISTERED_MESSAGE_CLASSES =
+                  new HashSet<Class<?>>();
 
   private static final Map<Integer, MessageDescriptor>
           ID_TO_DESCRIPTORS =
                   new HashMap<Integer,MessageDescriptor>();
 
-  private static final Map<Class, List<MessageDescriptor>>
+  private static final Map<Class<?>, List<MessageDescriptor>>
           CLASS_TO_DESCRIPTORS =
-                  new HashMap<Class,List<MessageDescriptor>>();
+                  new HashMap<Class<?>,List<MessageDescriptor>>();
 
 
   static {
@@ -71,7 +73,7 @@
     try {
       while (null != (line = reader.readLine())) {
         String descClassName = line.trim();
-        Class descClass;
+        Class<?> descClass;
         try {
           descClass = Class.forName(descClassName);
           List<MessageDescriptor> mdList = new LinkedList<MessageDescriptor>();
@@ -125,7 +127,7 @@
    */
 
   public static List<MessageDescriptor> getMessageDescriptorsForClass(
-          Class mdClass)
+          Class<?> mdClass)
   {
     return Collections.unmodifiableList(CLASS_TO_DESCRIPTORS.get(mdClass));
   }
@@ -136,7 +138,7 @@
    *
    * @return list of classes
    */
-  public static Set<Class> getRegisteredClasses() {
+  public static Set<Class<?>> getRegisteredClasses() {
     return Collections.unmodifiableSet(REGISTERED_MESSAGE_CLASSES);
   }
 

--
Gitblit v1.10.0