From 4400f1735bfe509e5eab036bf9500202fa255e2a Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 04 Dec 2009 17:34:39 +0000
Subject: [PATCH] [Forgotten in previous commit] Remove ordinals from messages as they are not needed in SDK.

---
 sdk/build-tools/com/sun/opends/sdk/build/tools/MessagePropertyKey.java |   79 ++-------------------------------------
 1 files changed, 5 insertions(+), 74 deletions(-)

diff --git a/sdk/build-tools/com/sun/opends/sdk/build/tools/MessagePropertyKey.java b/sdk/build-tools/com/sun/opends/sdk/build/tools/MessagePropertyKey.java
index c0f841f..0ab5498 100644
--- a/sdk/build-tools/com/sun/opends/sdk/build/tools/MessagePropertyKey.java
+++ b/sdk/build-tools/com/sun/opends/sdk/build/tools/MessagePropertyKey.java
@@ -52,8 +52,6 @@
 
   private String description;
 
-  private Integer ordinal;
-
 
 
   /**
@@ -61,49 +59,11 @@
    *
    * @param keyString
    *          from properties file
-   * @param includesOrdinal
-   *          when true expects ordinals to be encoded in the keystring;
-   *          when false the mandate is relaxed
    * @return MessagePropertyKey created from string
    */
-  static public MessagePropertyKey parseString(String keyString,
-      boolean includesOrdinal)
+  static public MessagePropertyKey parseString(String keyString)
   {
-
-    String description;
-    Integer ordinal = null;
-
-    String k = keyString;
-
-    if (includesOrdinal)
-    {
-      int li = k.lastIndexOf("_");
-      if (li != -1)
-      {
-        description = k.substring(0, li).toUpperCase();
-      }
-      else
-      {
-        throw new IllegalArgumentException("Incorrectly formatted key "
-            + keyString);
-      }
-
-      try
-      {
-        String ordString = k.substring(li + 1);
-        ordinal = Integer.parseInt(ordString);
-      }
-      catch (Exception nfe)
-      {
-        throw new IllegalArgumentException(
-            "Error parsing ordinal for key " + keyString);
-      }
-    }
-    else
-    {
-      description = k;
-    }
-    return new MessagePropertyKey(description, ordinal);
+    return new MessagePropertyKey(keyString);
   }
 
 
@@ -113,13 +73,10 @@
    *
    * @param description
    *          of this key
-   * @param ordinal
-   *          of this key
    */
-  public MessagePropertyKey(String description, Integer ordinal)
+  public MessagePropertyKey(String description)
   {
     this.description = description;
-    this.ordinal = ordinal;
   }
 
 
@@ -137,18 +94,6 @@
 
 
   /**
-   * Gets the ordinal of this key.
-   *
-   * @return ordinal of this key
-   */
-  public Integer getOrdinal()
-  {
-    return this.ordinal;
-  }
-
-
-
-  /**
    * Gets the name of the MessageDescriptor as it should appear in the
    * messages file.
    *
@@ -188,14 +133,7 @@
    */
   public String getPropertyKeyName(boolean includeOrdinal)
   {
-    StringBuilder sb = new StringBuilder();
-    sb.append(description);
-    if (ordinal != null && includeOrdinal)
-    {
-      sb.append("_");
-      sb.append(ordinal);
-    }
-    return sb.toString();
+    return description;
   }
 
 
@@ -205,14 +143,7 @@
    */
   public int compareTo(MessagePropertyKey k)
   {
-    if (ordinal == k.ordinal)
-    {
-      return description.compareTo(k.description);
-    }
-    else
-    {
-      return ordinal.compareTo(k.ordinal);
-    }
+    return description.compareTo(k.description);
   }
 
 }

--
Gitblit v1.10.0