From d303483ed5fe03e150c41af05c1450b3dae9919d Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Thu, 7 Jul 2016 14:38:11 +0000 Subject: [PATCH] ICU-12611 Remove dead code. X-SVN-Rev: 38956 --- .../src/com/ibm/icu/charset/CharsetMBCS.java | 3 +- .../ibm/icu/charset/UConverterSharedData.java | 28 +------------------ 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetMBCS.java b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetMBCS.java index e7e1e7d62c8..c6c832d95e8 100644 --- a/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetMBCS.java +++ b/icu4j/main/classes/charset/src/com/ibm/icu/charset/CharsetMBCS.java @@ -228,7 +228,6 @@ class CharsetMBCS extends CharsetICU { throw new InvalidFormatException(e); } - UConverterSharedData data = null; int type = staticData.conversionType; if (type != UConverterSharedData.UConverterType.MBCS @@ -236,7 +235,7 @@ class CharsetMBCS extends CharsetICU { throw new InvalidFormatException(); } - data = new UConverterSharedData(1, staticData); + UConverterSharedData data = new UConverterSharedData(staticData); // Load data UConverterMBCSTable mbcsTable = data.mbcs; diff --git a/icu4j/main/classes/charset/src/com/ibm/icu/charset/UConverterSharedData.java b/icu4j/main/classes/charset/src/com/ibm/icu/charset/UConverterSharedData.java index c6e3c7d9007..e310e52bd92 100644 --- a/icu4j/main/classes/charset/src/com/ibm/icu/charset/UConverterSharedData.java +++ b/icu4j/main/classes/charset/src/com/ibm/icu/charset/UConverterSharedData.java @@ -13,13 +13,6 @@ package com.ibm.icu.charset; * UConverter. */ final class UConverterSharedData { - // uint32_t structSize; /* Size of this structure */ - // int structSize; /* Size of this structure */ - /** - * used to count number of clients, 0xffffffff for static SharedData - */ - int referenceCounter; - // agljport:todo const void *dataMemory; /* from udata_openChoice() - for cleanup */ // agljport:todo void *table; /* Unused. This used to be a UConverterTable - Pointer to conversion data - see mbcs below */ @@ -30,24 +23,6 @@ final class UConverterSharedData { */ final UConverterStaticData staticData; - // UBool sharedDataCached; /* TRUE: shared data is in cache, don't destroy - // on close() if 0 ref. FALSE: shared data isn't in the cache, do attempt to - // clean it up if the ref is 0 */ - - /* - * TRUE: shared data is in cache, don't destroy - * on close() if 0 ref. FALSE: shared data isn't - * in the cache, do attempt to clean it up if - * the ref is 0 - */ - //boolean sharedDataCached; - - /* - * UBool staticDataOwned; TRUE if static data owned by shared data & should - * be freed with it, NEVER true for udata() loaded statics. This ignored - * variable was removed to make space for sharedDataCached. - */ - // const UConverterImpl *impl; /* vtable-style struct of mostly function pointers */ // UConverterImpl impl; /* vtable-style struct of mostly function pointers */ /** initial values of some members of the mutable part of object */ @@ -66,10 +41,9 @@ final class UConverterSharedData { */ CharsetMBCS.UConverterMBCSTable mbcs; - UConverterSharedData(int referenceCounter_, UConverterStaticData staticData_) + UConverterSharedData(UConverterStaticData staticData_) { mbcs = new CharsetMBCS.UConverterMBCSTable(); - referenceCounter = referenceCounter_; staticData = staticData_; }