Changeset 128147 in webkit


Ignore:
Timestamp:
Sep 10, 2012 10:17:56 PM (12 years ago)
Author:
keishi@webkit.org
Message:

Rename NumberLocalizer to Localizer
https://bugs.webkit.org/show_bug.cgi?id=96350

Reviewed by Kent Tamura.

Renaming NumberLocalizer to Localizer so we can unify our localization methods into this class in the future.

No new tests. No behavior change.

  • WebCore.gypi:
  • WebCore.xcodeproj/project.pbxproj:
  • platform/text/LocaleICU.cpp:

(WebCore::LocaleICU::initializeLocalizerData):

  • platform/text/LocaleICU.h:

(LocaleICU):

  • platform/text/LocaleWin.cpp:

(WebCore::LocaleWin::initializeLocalizerData):

  • platform/text/LocaleWin.h:

(LocaleWin):

  • platform/text/Localizer.cpp: Renamed from Source/WebCore/platform/text/NumberLocalizer.cpp.

(WebCore):
(WebCore::Localizer::~Localizer):
(WebCore::Localizer::setLocalizerData):
(WebCore::Localizer::convertToLocalizedNumber):
(WebCore::matches):
(WebCore::Localizer::detectSignAndGetDigitRange):
(WebCore::Localizer::matchedDecimalSymbolIndex):
(WebCore::Localizer::convertFromLocalizedNumber):
(WebCore::Localizer::localizedDecimalSeparator):

  • platform/text/Localizer.h: Renamed from Source/WebCore/platform/text/NumberLocalizer.h.

(WebCore):
(Localizer):
(WebCore::Localizer::Localizer):

  • platform/text/mac/LocaleMac.h:

(LocaleMac):

  • platform/text/mac/LocaleMac.mm:

(WebCore::LocaleMac::initializeLocalizerData):

Location:
trunk/Source/WebCore
Files:
9 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r128144 r128147  
     12012-09-10  Keishi Hattori  <keishi@webkit.org>
     2
     3        Rename NumberLocalizer to Localizer
     4        https://bugs.webkit.org/show_bug.cgi?id=96350
     5
     6        Reviewed by Kent Tamura.
     7
     8        Renaming NumberLocalizer to Localizer so we can unify our localization methods into this class in the future.
     9
     10        No new tests. No behavior change.
     11
     12        * WebCore.gypi:
     13        * WebCore.xcodeproj/project.pbxproj:
     14        * platform/text/LocaleICU.cpp:
     15        (WebCore::LocaleICU::initializeLocalizerData):
     16        * platform/text/LocaleICU.h:
     17        (LocaleICU):
     18        * platform/text/LocaleWin.cpp:
     19        (WebCore::LocaleWin::initializeLocalizerData):
     20        * platform/text/LocaleWin.h:
     21        (LocaleWin):
     22        * platform/text/Localizer.cpp: Renamed from Source/WebCore/platform/text/NumberLocalizer.cpp.
     23        (WebCore):
     24        (WebCore::Localizer::~Localizer):
     25        (WebCore::Localizer::setLocalizerData):
     26        (WebCore::Localizer::convertToLocalizedNumber):
     27        (WebCore::matches):
     28        (WebCore::Localizer::detectSignAndGetDigitRange):
     29        (WebCore::Localizer::matchedDecimalSymbolIndex):
     30        (WebCore::Localizer::convertFromLocalizedNumber):
     31        (WebCore::Localizer::localizedDecimalSeparator):
     32        * platform/text/Localizer.h: Renamed from Source/WebCore/platform/text/NumberLocalizer.h.
     33        (WebCore):
     34        (Localizer):
     35        (WebCore::Localizer::Localizer):
     36        * platform/text/mac/LocaleMac.h:
     37        (LocaleMac):
     38        * platform/text/mac/LocaleMac.mm:
     39        (WebCore::LocaleMac::initializeLocalizerData):
     40
    1412012-09-10  Dan Bernstein  <mitz@apple.com>
    242
  • trunk/Source/WebCore/WebCore.gypi

    r128083 r128147  
    56785678            'platform/text/LocalizedNumberICU.cpp',
    56795679            'platform/text/LocalizedNumberNone.cpp',
    5680             'platform/text/NumberLocalizer.cpp',
    5681             'platform/text/NumberLocalizer.h',
     5680            'platform/text/Localizer.cpp',
     5681            'platform/text/Localizer.h',
    56825682            'platform/text/ParserUtilities.h',
    56835683            'platform/text/QuotedPrintable.h',
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r128132 r128147  
    62316231                F5142C69123F12B000F5BD4C /* LocalizedNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = F5142C68123F12B000F5BD4C /* LocalizedNumber.h */; };
    62326232                F52AD5E41534245F0059FBE6 /* EmptyClients.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F52AD5E31534245F0059FBE6 /* EmptyClients.cpp */; };
    6233                 F544F78815CFB2A800AF33A8 /* NumberLocalizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F544F78615CFB2A800AF33A8 /* NumberLocalizer.cpp */; };
    6234                 F544F78915CFB2A800AF33A8 /* NumberLocalizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F544F78715CFB2A800AF33A8 /* NumberLocalizer.h */; };
     6233                F544F78815CFB2A800AF33A8 /* Localizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F544F78615CFB2A800AF33A8 /* Localizer.cpp */; };
     6234                F544F78915CFB2A800AF33A8 /* Localizer.h in Headers */ = {isa = PBXBuildFile; fileRef = F544F78715CFB2A800AF33A8 /* Localizer.h */; };
    62356235                F55B3DAD1251F12D003EF269 /* BaseTextInputType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F55B3D791251F12D003EF269 /* BaseTextInputType.cpp */; };
    62366236                F55B3DAE1251F12D003EF269 /* BaseTextInputType.h in Headers */ = {isa = PBXBuildFile; fileRef = F55B3D7A1251F12D003EF269 /* BaseTextInputType.h */; };
     
    1362613626                F523D30402DE4476018635CA /* Range.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = Range.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    1362713627                F52AD5E31534245F0059FBE6 /* EmptyClients.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EmptyClients.cpp; sourceTree = "<group>"; };
    13628                 F544F78615CFB2A800AF33A8 /* NumberLocalizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NumberLocalizer.cpp; sourceTree = "<group>"; };
    13629                 F544F78715CFB2A800AF33A8 /* NumberLocalizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NumberLocalizer.h; sourceTree = "<group>"; };
     13628                F544F78615CFB2A800AF33A8 /* Localizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Localizer.cpp; sourceTree = "<group>"; };
     13629                F544F78715CFB2A800AF33A8 /* Localizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Localizer.h; sourceTree = "<group>"; };
    1363013630                F55B3D791251F12D003EF269 /* BaseTextInputType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseTextInputType.cpp; sourceTree = "<group>"; };
    1363113631                F55B3D7A1251F12D003EF269 /* BaseTextInputType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseTextInputType.h; sourceTree = "<group>"; };
     
    2001120011                                A5732B0E136A1715005C8D7C /* LocalizedDateNone.cpp */,
    2001220012                                F5142C68123F12B000F5BD4C /* LocalizedNumber.h */,
    20013                                 F544F78615CFB2A800AF33A8 /* NumberLocalizer.cpp */,
    20014                                 F544F78715CFB2A800AF33A8 /* NumberLocalizer.h */,
     20013                                F544F78615CFB2A800AF33A8 /* Localizer.cpp */,
     20014                                F544F78715CFB2A800AF33A8 /* Localizer.h */,
    2001520015                                BC76AC110DD7AD5C00415F34 /* ParserUtilities.h */,
    2001620016                                379E371413736A6600B9E919 /* QuotedPrintable.cpp */,
     
    2438824388                                F5142C69123F12B000F5BD4C /* LocalizedNumber.h in Headers */,
    2438924389                                935207BE09BD410A00F2038D /* LocalizedStrings.h in Headers */,
     24390                                F544F78915CFB2A800AF33A8 /* Localizer.h in Headers */,
    2439024391                                BCE1C41B0D982980003B02F2 /* Location.h in Headers */,
    2439124392                                A8239E0109B3CF8A00B60641 /* Logging.h in Headers */,
     
    2450524506                                93500F3213FDE3BE0099EC24 /* NSScrollerImpDetails.h in Headers */,
    2450624507                                F55B3DC81251F12D003EF269 /* NumberInputType.h in Headers */,
    24507                                 F544F78915CFB2A800AF33A8 /* NumberLocalizer.h in Headers */,
    2450824508                                1A569D120D7E2B82007C3983 /* objc_class.h in Headers */,
    2450924509                                1A569D140D7E2B82007C3983 /* objc_header.h in Headers */,
     
    2769527695                                C046E1AC1208A9FE00BA2CF7 /* LocalizedStrings.cpp in Sources */,
    2769627696                                BC25B52A131C6D3900180E10 /* LocalizedStringsMac.cpp in Sources */,
     27697                                F544F78815CFB2A800AF33A8 /* Localizer.cpp in Sources */,
    2769727698                                BCE1C41C0D982981003B02F2 /* Location.cpp in Sources */,
    2769827699                                A8239E0009B3CF8A00B60641 /* Logging.cpp in Sources */,
     
    2778927790                                52F52E1114A0134F00ACC397 /* NSScrollerImpDetails.mm in Sources */,
    2779027791                                F55B3DC71251F12D003EF269 /* NumberInputType.cpp in Sources */,
    27791                                 F544F78815CFB2A800AF33A8 /* NumberLocalizer.cpp in Sources */,
    2779227792                                1A569D130D7E2B82007C3983 /* objc_class.mm in Sources */,
    2779327793                                1A569D160D7E2B82007C3983 /* objc_instance.mm in Sources */,
  • trunk/Source/WebCore/platform/text/LocaleICU.cpp

    r124459 r128147  
    113113}
    114114
    115 void LocaleICU::initializeNumberLocalizerData()
     115void LocaleICU::initializeLocalizerData()
    116116{
    117117    if (m_didCreateDecimalFormat)
     
    137137    symbols.append(decimalSymbol(UNUM_GROUPING_SEPARATOR_SYMBOL));
    138138    ASSERT(symbols.size() == DecimalSymbolsSize);
    139     setNumberLocalizerData(symbols, decimalTextAttribute(UNUM_POSITIVE_PREFIX), decimalTextAttribute(UNUM_POSITIVE_SUFFIX), decimalTextAttribute(UNUM_NEGATIVE_PREFIX), decimalTextAttribute(UNUM_NEGATIVE_SUFFIX));
     139    setLocalizerData(symbols, decimalTextAttribute(UNUM_POSITIVE_PREFIX), decimalTextAttribute(UNUM_POSITIVE_SUFFIX), decimalTextAttribute(UNUM_NEGATIVE_PREFIX), decimalTextAttribute(UNUM_NEGATIVE_SUFFIX));
    140140}
    141141
  • trunk/Source/WebCore/platform/text/LocaleICU.h

    r124459 r128147  
    3333
    3434#include "DateComponents.h"
    35 #include "NumberLocalizer.h"
     35#include "Localizer.h"
    3636#include <unicode/udat.h>
    3737#include <unicode/unum.h>
     
    4545// We should use this class only for LocalizedNumberICU.cpp, LocalizedDateICU.cpp,
    4646// and LocalizedNumberICUTest.cpp.
    47 class LocaleICU : public NumberLocalizer {
     47class LocaleICU : public Localizer {
    4848public:
    4949    static PassOwnPtr<LocaleICU> create(const char* localeString);
     
    7373    String decimalSymbol(UNumberFormatSymbol);
    7474    String decimalTextAttribute(UNumberFormatTextAttribute);
    75     virtual void initializeNumberLocalizerData() OVERRIDE;
     75    virtual void initializeLocalizerData() OVERRIDE;
    7676
    7777    bool detectSignAndGetDigitRange(const String& input, bool& isNegative, unsigned& startIndex, unsigned& endIndex);
  • trunk/Source/WebCore/platform/text/LocaleWin.cpp

    r126126 r128147  
    724724#endif
    725725
    726 void LocaleWin::initializeNumberLocalizerData()
     726void LocaleWin::initializeLocalizerData()
    727727{
    728728    if (m_didInitializeNumberData)
     
    792792    }
    793793    m_didInitializeNumberData = true;
    794     setNumberLocalizerData(symbols, emptyString(), emptyString(), negativePrefix, negativeSuffix);
    795 }
    796 
    797 }
     794    setLocalizerData(symbols, emptyString(), emptyString(), negativePrefix, negativeSuffix);
     795}
     796
     797}
  • trunk/Source/WebCore/platform/text/LocaleWin.h

    r126126 r128147  
    3232#define LocaleWin_h
    3333
    34 #include "NumberLocalizer.h"
     34#include "Localizer.h"
    3535#include <windows.h>
    3636#include <wtf/Forward.h>
     
    4343struct DateFormatToken;
    4444
    45 class LocaleWin : public NumberLocalizer {
     45class LocaleWin : public Localizer {
    4646public:
    4747    static PassOwnPtr<LocaleWin> create(LCID);
     
    8686    void ensureWeekDayShortLabels();
    8787#endif
    88     // NumberLocalizer function:
    89     virtual void initializeNumberLocalizerData() OVERRIDE;
     88    // Localizer function:
     89    virtual void initializeLocalizerData() OVERRIDE;
    9090
    9191    LCID m_lcid;
  • trunk/Source/WebCore/platform/text/Localizer.cpp

    r128146 r128147  
    3030
    3131#include "config.h"
    32 #include "NumberLocalizer.h"
     32#include "Localizer.h"
    3333
    3434#include <wtf/text/StringBuilder.h>
     
    3636namespace WebCore {
    3737
    38 NumberLocalizer::~NumberLocalizer()
     38Localizer::~Localizer()
    3939{
    4040}
    4141
    42 void NumberLocalizer::setNumberLocalizerData(const Vector<String, DecimalSymbolsSize>& symbols, const String& positivePrefix, const String& positiveSuffix, const String& negativePrefix, const String& negativeSuffix)
     42void Localizer::setLocalizerData(const Vector<String, DecimalSymbolsSize>& symbols, const String& positivePrefix, const String& positiveSuffix, const String& negativePrefix, const String& negativeSuffix)
    4343{
    4444    for (size_t i = 0; i < symbols.size(); ++i) {
     
    5151    m_negativeSuffix = negativeSuffix;
    5252    ASSERT(!m_positivePrefix.isEmpty() || !m_positiveSuffix.isEmpty() || !m_negativePrefix.isEmpty() || !m_negativeSuffix.isEmpty());
    53     m_hasNumberLocalizerData = true;
     53    m_hasLocalizerData = true;
    5454}
    5555
    56 String NumberLocalizer::convertToLocalizedNumber(const String& input)
     56String Localizer::convertToLocalizedNumber(const String& input)
    5757{
    58     initializeNumberLocalizerData();
    59     if (!m_hasNumberLocalizerData || input.isEmpty())
     58    initializeLocalizerData();
     59    if (!m_hasLocalizerData || input.isEmpty())
    6060        return input;
    6161
     
    112112}
    113113
    114 bool NumberLocalizer::detectSignAndGetDigitRange(const String& input, bool& isNegative, unsigned& startIndex, unsigned& endIndex)
     114bool Localizer::detectSignAndGetDigitRange(const String& input, bool& isNegative, unsigned& startIndex, unsigned& endIndex)
    115115{
    116116    startIndex = 0;
     
    140140}
    141141
    142 unsigned NumberLocalizer::matchedDecimalSymbolIndex(const String& input, unsigned& position)
     142unsigned Localizer::matchedDecimalSymbolIndex(const String& input, unsigned& position)
    143143{
    144144    for (unsigned symbolIndex = 0; symbolIndex < DecimalSymbolsSize; ++symbolIndex) {
     
    151151}
    152152
    153 String NumberLocalizer::convertFromLocalizedNumber(const String& localized)
     153String Localizer::convertFromLocalizedNumber(const String& localized)
    154154{
    155     initializeNumberLocalizerData();
     155    initializeLocalizerData();
    156156    String input = localized.stripWhiteSpace();
    157     if (!m_hasNumberLocalizerData || input.isEmpty())
     157    if (!m_hasLocalizerData || input.isEmpty())
    158158        return input;
    159159
     
    186186
    187187#if ENABLE(INPUT_TYPE_TIME_MULTIPLE_FIELDS)
    188 String NumberLocalizer::localizedDecimalSeparator()
     188String Localizer::localizedDecimalSeparator()
    189189{
    190     initializeNumberLocalizerData();
     190    initializeLocalizerData();
    191191    return m_decimalSymbols[DecimalSeparatorIndex];
    192192}
  • trunk/Source/WebCore/platform/text/Localizer.h

    r128146 r128147  
    2424 */
    2525
    26 #ifndef NumberLocalizer_h
    27 #define NumberLocalizer_h
     26#ifndef Localizer_h
     27#define Localizer_h
    2828
    2929#include <wtf/text/WTFString.h>
     
    3131namespace WebCore {
    3232
    33 class NumberLocalizer {
     33class Localizer {
    3434public:
    3535    String convertToLocalizedNumber(const String&);
     
    3838    String localizedDecimalSeparator();
    3939#endif
    40     virtual ~NumberLocalizer();
     40    virtual ~Localizer();
    4141
    4242protected:
     
    4848    };
    4949
    50     NumberLocalizer() : m_hasNumberLocalizerData(false) { }
    51     virtual void initializeNumberLocalizerData() = 0;
    52     void setNumberLocalizerData(const Vector<String, DecimalSymbolsSize>&, const String& positivePrefix, const String& positiveSuffix, const String& negativePrefix, const String& negativeSuffix);
     50    Localizer() : m_hasLocalizerData(false) { }
     51    virtual void initializeLocalizerData() = 0;
     52    void setLocalizerData(const Vector<String, DecimalSymbolsSize>&, const String& positivePrefix, const String& positiveSuffix, const String& negativePrefix, const String& negativeSuffix);
    5353
    5454private:
     
    6161    String m_negativePrefix;
    6262    String m_negativeSuffix;
    63     bool m_hasNumberLocalizerData;
     63    bool m_hasLocalizerData;
    6464};
    6565
  • trunk/Source/WebCore/platform/text/mac/LocaleMac.h

    r124979 r128147  
    3232#define LocaleMac_h
    3333
    34 #include "NumberLocalizer.h"
     34#include "Localizer.h"
    3535#include <wtf/Forward.h>
    3636#include <wtf/RetainPtr.h>
     
    4545class DateComponents;
    4646
    47 class LocaleMac : public NumberLocalizer {
     47class LocaleMac : public Localizer {
    4848public:
    4949    static PassOwnPtr<LocaleMac> create(const String&);
     
    7070    explicit LocaleMac(const String&);
    7171    NSDateFormatter *createShortDateFormatter();
    72     virtual void initializeNumberLocalizerData() OVERRIDE;
     72    virtual void initializeLocalizerData() OVERRIDE;
    7373
    7474    RetainPtr<NSLocale> m_locale;
  • trunk/Source/WebCore/platform/text/mac/LocaleMac.mm

    r124979 r128147  
    271271#endif
    272272
    273 void LocaleMac::initializeNumberLocalizerData()
     273void LocaleMac::initializeLocalizerData()
    274274{
    275275    if (m_didInitializeNumberData)
     
    299299    String negativePrefix([formatter.get() negativePrefix]);
    300300    String negativeSuffix([formatter.get() negativeSuffix]);
    301     setNumberLocalizerData(symbols, positivePrefix, positiveSuffix, negativePrefix, negativeSuffix);
    302 }
    303 
    304 }
     301    setLocalizerData(symbols, positivePrefix, positiveSuffix, negativePrefix, negativeSuffix);
     302}
     303
     304}
Note: See TracChangeset for help on using the changeset viewer.