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 948fc8dd599f21dd5ae3eda7f2c87964a25f9f3c..6239569d85e8939ccd8c6fe7642220108051c5e2 100644 (file)
--- a/icuSources/tools/genrb/wrtjava.c
+++ b/icuSources/tools/genrb/wrtjava.c
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
 /*
 *******************************************************************************
 *

-*   Copyright (C) 2000-2009, 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"


@@ -83,7 +82,7 @@ static int tabCount = 3;
 
 static FileStream* out=NULL;
 static struct SRBRoot* srBundle ;
 
 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;


@@ -326,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)) {


@@ -352,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);


@@ -511,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)) {


@@ -527,7 +520,7 @@ 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;
 
 
         i       = 0;
 
 


@@ -542,7 +535,6 @@ table_write_java(struct SResource *res, UErrorCode *status) {
 
 
             tabCount++;
 
 
             tabCount++;

-            allStrings=FALSE;

 
             write_tabs(out);
             if(currentKeyString != NULL) {
 
             write_tabs(out);
             if(currentKeyString != NULL) {


@@ -629,7 +621,7 @@ bundle_write_java(struct SRBRoot *bundle, const char *outputDir,const char* outp
     char className[256]={'\0'};
     /*char constructor[1000] = { 0 };*/
     /*UBool j1 =FALSE;*/
     char className[256]={'\0'};
     /*char constructor[1000] = { 0 };*/
     /*UBool j1 =FALSE;*/

-    outDir = outputDir;
+    /*outDir = outputDir;*/

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