ICU-551.24.tar.gz

[apple/icu.git] / icuSources / tools / genrb / wrtjava.c

diff --git a/icuSources/tools/genrb/wrtjava.c b/icuSources/tools/genrb/wrtjava.c
index 9315020ad43784ee0ef00cdd296d8f250ce48359..6239569d85e8939ccd8c6fe7642220108051c5e2 100644 (file)
--- a/icuSources/tools/genrb/wrtjava.c
+++ b/icuSources/tools/genrb/wrtjava.c
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
 /*
 *******************************************************************************
 *

-*   Copyright (C) 2000-2008, International Business Machines
+*   Copyright (C) 2000-2012, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************


@@ -27,7 +27,6 @@
 #include "unicode/ucnv.h"
 #include "genrb.h"
 #include "rle.h"
 #include "unicode/ucnv.h"
 #include "genrb.h"
 #include "rle.h"

-#include "ucol_tok.h"

 #include "uhash.h"
 #include "uresimp.h"
 #include "unicode/ustring.h"
 #include "uhash.h"
 #include "uresimp.h"
 #include "unicode/ustring.h"


@@ -74,16 +73,16 @@ static const char* javaClass1=  " extends ListResourceBundle {\n\n"
                                 "          return  contents;\n"
                                 "    }\n\n"
                                 "    private static Object[][] contents = {\n";
                                 "          return  contents;\n"
                                 "    }\n\n"
                                 "    private static Object[][] contents = {\n";

-static const char* javaClassICU= " extends ListResourceBundle {\n\n"
+/*static const char* javaClassICU= " extends ListResourceBundle {\n\n"

                                  "    public %s  () {\n"
                                  "          super.contents = data;\n"
                                  "    }\n"
                                  "    public %s  () {\n"
                                  "          super.contents = data;\n"
                                  "    }\n"

-                                 "    static final Object[][] data = new Object[][] { \n";
+                                 "    static final Object[][] data = new Object[][] { \n";*/

 static int tabCount = 3;
 
 static FileStream* out=NULL;
 static struct SRBRoot* srBundle ;
 static int tabCount = 3;
 
 static FileStream* out=NULL;
 static struct SRBRoot* srBundle ;

-static const char* outDir = NULL;
+/*static const char* outDir = NULL;*/

 
 static const char* bName=NULL;
 static const char* pName=NULL;
 
 static const char* bName=NULL;
 static const char* pName=NULL;


@@ -259,11 +258,11 @@ str_write_java( uint16_t* src, int32_t srcLen, UBool printEndLine, UErrorCode *s
             add = columnCount-(tabCount*4)-5/* for ", +\n */;
             current = buf +len;
             if (add < (bufLen-len)) {
             add = columnCount-(tabCount*4)-5/* for ", +\n */;
             current = buf +len;
             if (add < (bufLen-len)) {

-                uint32_t index = strrch(current,add,'\\');
-                if (index > add) {
-                    index = add;
+                uint32_t idx = strrch(current,add,'\\');
+                if (idx > add) {
+                    idx = add;

                 } else {
                 } else {

-                    int32_t num =index-1;
+                    int32_t num =idx-1;

                     uint32_t seqLen;
                     while(num>0){
                         if(current[num]=='\\'){
                     uint32_t seqLen;
                     while(num>0){
                         if(current[num]=='\\'){


@@ -272,12 +271,12 @@ str_write_java( uint16_t* src, int32_t srcLen, UBool printEndLine, UErrorCode *s
                             break;
                         }
                     }
                             break;
                         }
                     }

-                    if ((index-num)%2==0) {
-                        index--;
+                    if ((idx-num)%2==0) {
+                        idx--;

                     }
                     }

-                    seqLen = (current[index+1]=='u') ? 6 : 2;
-                    if ((add-index) < seqLen) {
-                        add = index + seqLen;
+                    seqLen = (current[idx+1]=='u') ? 6 : 2;
+                    if ((add-idx) < seqLen) {
+                        add = idx + seqLen;

                     }
                 }
             }
                     }
                 }
             }


@@ -306,10 +305,12 @@ str_write_java( uint16_t* src, int32_t srcLen, UBool printEndLine, UErrorCode *s
 /* Writing Functions */
 static void
 string_write_java(struct SResource *res,UErrorCode *status) {
 /* Writing Functions */
 static void
 string_write_java(struct SResource *res,UErrorCode *status) {

+    char resKeyBuffer[8];
+    const char *resname = res_getKeyString(srBundle, res, resKeyBuffer);

 
     str_write_java(res->u.fString.fChars,res->u.fString.fLength,TRUE,status);
     
 
     str_write_java(res->u.fString.fChars,res->u.fString.fLength,TRUE,status);
     

-       if(res->fKey > 0 && uprv_strcmp(srBundle->fKeys+res->fKey,"Rule")==0)
+       if(resname != NULL && uprv_strcmp(resname,"Rule")==0)

        {
         UChar* buf = (UChar*) uprv_malloc(sizeof(UChar)*res->u.fString.fLength);
         uprv_memcpy(buf,res->u.fString.fChars,res->u.fString.fLength);
        {
         UChar* buf = (UChar*) uprv_malloc(sizeof(UChar)*res->u.fString.fLength);
         uprv_memcpy(buf,res->u.fString.fChars,res->u.fString.fLength);


@@ -324,8 +325,6 @@ array_write_java( struct SResource *res, UErrorCode *status) {
     uint32_t  i         = 0;
     const char* arr ="new String[] { \n";
     struct SResource *current = NULL;
     uint32_t  i         = 0;
     const char* arr ="new String[] { \n";
     struct SResource *current = NULL;

-    struct SResource *first =NULL;
-    UBool decrementTabs = FALSE;

     UBool allStrings    = TRUE;
 
     if (U_FAILURE(*status)) {
     UBool allStrings    = TRUE;
 
     if (U_FAILURE(*status)) {


@@ -350,13 +349,11 @@ array_write_java( struct SResource *res, UErrorCode *status) {
             write_tabs(out);
             T_FileStream_write(out, object, (int32_t)uprv_strlen(object));
             tabCount++;
             write_tabs(out);
             T_FileStream_write(out, object, (int32_t)uprv_strlen(object));
             tabCount++;

-            decrementTabs = TRUE;

         }else{
             write_tabs(out);
             T_FileStream_write(out, arr, (int32_t)uprv_strlen(arr));
             tabCount++;
         }
         }else{
             write_tabs(out);
             T_FileStream_write(out, arr, (int32_t)uprv_strlen(arr));
             tabCount++;
         }

-        first=current;

         while (current != NULL) {
             /*if(current->fType==URES_STRING){
                 write_tabs(out);
         while (current != NULL) {
             /*if(current->fType==URES_STRING){
                 write_tabs(out);


@@ -388,12 +385,14 @@ intvector_write_java( struct SResource *res, UErrorCode *status) {
     const char* intArr = "new int[] {\n";
     /* const char* intC   = "new Integer(";   */
     const char* stringArr = "new String[]{\n";
     const char* intArr = "new int[] {\n";
     /* const char* intC   = "new Integer(";   */
     const char* stringArr = "new String[]{\n";

+    char resKeyBuffer[8];
+    const char *resname = res_getKeyString(srBundle, res, resKeyBuffer);

     char buf[100];
     int len =0;
     buf[0]=0;
     write_tabs(out);
 
     char buf[100];
     int len =0;
     buf[0]=0;
     write_tabs(out);
 

-    if(res->fKey > 0 && uprv_strcmp(srBundle->fKeys+res->fKey,"DateTimeElements")==0){
+    if(resname != NULL && uprv_strcmp(resname,"DateTimeElements")==0){

         T_FileStream_write(out, stringArr, (int32_t)uprv_strlen(stringArr));
         tabCount++;
         for(i = 0; i<res->u.fIntVector.fCount; i++) {
         T_FileStream_write(out, stringArr, (int32_t)uprv_strlen(stringArr));
         tabCount++;
         for(i = 0; i<res->u.fIntVector.fCount; i++) {


@@ -507,9 +506,7 @@ static UBool start = TRUE;
 static void
 table_write_java(struct SResource *res, UErrorCode *status) {
     uint32_t  i         = 0;
 static void
 table_write_java(struct SResource *res, UErrorCode *status) {
     uint32_t  i         = 0;

-    UBool allStrings =TRUE;

     struct SResource *current = NULL;
     struct SResource *current = NULL;

-    struct SResource *save = NULL;

     const char* obj = "new Object[][]{\n";
 
     if (U_FAILURE(*status)) {
     const char* obj = "new Object[][]{\n";
 
     if (U_FAILURE(*status)) {


@@ -523,11 +520,14 @@ table_write_java(struct SResource *res, UErrorCode *status) {
             tabCount++;
         }
         start = FALSE;
             tabCount++;
         }
         start = FALSE;

-        save = current = res->u.fTable.fFirst;
+        current = res->u.fTable.fFirst;

         i       = 0;
 
 
         while (current != NULL) {
         i       = 0;
 
 
         while (current != NULL) {

+            char currentKeyBuffer[8];
+            const char *currentKeyString = res_getKeyString(srBundle, current, currentKeyBuffer);
+

             assert(i < res->u.fTable.fCount);
             write_tabs(out);
 
             assert(i < res->u.fTable.fCount);
             write_tabs(out);
 


@@ -535,13 +535,12 @@ table_write_java(struct SResource *res, UErrorCode *status) {
 
 
             tabCount++;
 
 
             tabCount++;

-            allStrings=FALSE;

 
             write_tabs(out);
 
             write_tabs(out);

-            if(current->fKey > 0){
+            if(currentKeyString != NULL) {

                 T_FileStream_write(out, "\"", 1);
                 T_FileStream_write(out, "\"", 1);

-                T_FileStream_write(out, srBundle->fKeys+current->fKey,
-                                   (int32_t)uprv_strlen(srBundle->fKeys+current->fKey));
+                T_FileStream_write(out, currentKeyString,
+                                   (int32_t)uprv_strlen(currentKeyString));

                 T_FileStream_write(out, "\",\n", 2);
 
                 T_FileStream_write(out, "\n", 1);
                 T_FileStream_write(out, "\",\n", 2);
 
                 T_FileStream_write(out, "\n", 1);


@@ -586,7 +585,7 @@ res_write_java(struct SResource *res,UErrorCode *status) {
              string_write_java    (res, status);
              return;
         case URES_ALIAS:
              string_write_java    (res, status);
              return;
         case URES_ALIAS:

-             printf("Encountered unsupported resource type of alias\n", res->fType);
+             printf("Encountered unsupported resource type %d of alias\n", res->fType);

              *status = U_UNSUPPORTED_ERROR;
                         return;
         case URES_INT_VECTOR:
              *status = U_UNSUPPORTED_ERROR;
                         return;
         case URES_INT_VECTOR:


@@ -602,7 +601,6 @@ res_write_java(struct SResource *res,UErrorCode *status) {
              array_write_java     (res, status);
              return;
         case URES_TABLE:
              array_write_java     (res, status);
              return;
         case URES_TABLE:

-        case URES_TABLE32:

              table_write_java     (res, status);
              return;
         default:
              table_write_java     (res, status);
              return;
         default:


@@ -621,9 +619,9 @@ bundle_write_java(struct SRBRoot *bundle, const char *outputDir,const char* outp
 
     char fileName[256] = {'\0'};
     char className[256]={'\0'};
 
     char fileName[256] = {'\0'};
     char className[256]={'\0'};

-    char constructor[1000] = { 0 };
-    UBool j1 =FALSE;
-    outDir = outputDir;
+    /*char constructor[1000] = { 0 };*/
+    /*UBool j1 =FALSE;*/
+    /*outDir = outputDir;*/

 
     start = TRUE;                        /* Reset the start indictor*/
 
 
     start = TRUE;                        /* Reset the start indictor*/