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/GenerateMessageFile.java | 29 ++---------------------------
1 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/sdk/build-tools/com/sun/opends/sdk/build/tools/GenerateMessageFile.java b/sdk/build-tools/com/sun/opends/sdk/build/tools/GenerateMessageFile.java
index 4ad72fe..190e678 100644
--- a/sdk/build-tools/com/sun/opends/sdk/build/tools/GenerateMessageFile.java
+++ b/sdk/build-tools/com/sun/opends/sdk/build/tools/GenerateMessageFile.java
@@ -668,13 +668,6 @@
{
if (stubLine.contains("${MESSAGES}"))
{
- Integer globalOrdinal = null;
- String go = properties.getProperty(GLOBAL_ORDINAL);
- if (go != null)
- {
- globalOrdinal = new Integer(go);
- }
-
Map<MessagePropertyKey, String> keyMap = new TreeMap<MessagePropertyKey, String>();
for (Object propO : properties.keySet())
@@ -685,7 +678,7 @@
if (!DIRECTIVE_PROPERTIES.contains(propKey))
{
MessagePropertyKey key = MessagePropertyKey
- .parseString(propKey, globalOrdinal == null);
+ .parseString(propKey);
String formatString = properties.getProperty(propKey);
keyMap.put(key, formatString);
}
@@ -699,32 +692,14 @@
int usesOfGenericDescriptor = 0;
- Set<Integer> usedOrdinals = new HashSet<Integer>();
for (MessagePropertyKey key : keyMap.keySet())
{
String formatString = keyMap.get(key);
MessageDescriptorDeclaration message = new MessageDescriptorDeclaration(
key, formatString);
- if (globalOrdinal == null)
- {
- Integer ordinal = key.getOrdinal();
- if (usedOrdinals.contains(ordinal))
- {
- throw new BuildException("The ordinal value \'"
- + ordinal + "\' in key " + key
- + " has been previously defined in " + source
- + KEY_FORM_MSG);
- }
- else
- {
- usedOrdinals.add(ordinal);
- }
- }
-
message.setConstructorArguments("BASE", quote(key
- .toString()), globalOrdinal != null ? globalOrdinal
- .toString() : key.getOrdinal().toString());
+ .toString()));
destWriter.println(message.toString());
destWriter.println();
--
Gitblit v1.10.0