Making changes in number classes to maintain compatibility with 2.1 applications

Change-Id: I2108ce8a2a981f6c6bc5cc952a0864b53896dd31
Signed-off-by: darpan.ka <darpan.ka@samsung.com>

diff --git a/src/base/FBaseInt8.cpp b/src/base/FBaseInt8.cpp
index 1ea54c1..31e178e 100644 (file)
--- a/src/base/FBaseInt8.cpp
+++ b/src/base/FBaseInt8.cpp
@@ -100,27 +100,8 @@ Int8::Decode(const String& s, char& ret)
        long value;
        result r = _NumberUtil::Decode(s, value);
        SysTryReturnResult(NID_BASE, r == E_SUCCESS, r, "Propagating.");
-
-       if ((Tizen::App::_AppInfo::GetApiVersion() >= _API_VERSION_2_0) && (Tizen::App::_AppInfo::GetApiVersion() <= _API_VERSION_2_2))
-       {
-               if (value > Int8::VALUE_MAX)
-               {
-                       ret = Int8::VALUE_MAX;
-               }
-               else if (value < Int8::VALUE_MIN)
-               {
-                       ret = Int8::VALUE_MIN;
-               }
-               else
-               {
-                       ret = static_cast< char >(value);
-               }
-       }
-       else
-       {
-               SysTryReturnResult(NID_BASE, (value >= Int8::VALUE_MIN) && (value <= Int8::VALUE_MAX), E_OUT_OF_RANGE, "The value(%d) is out of range.", value);
-               ret = static_cast< char >(value);
-       }
+       SysTryReturnResult(NID_BASE, (value >= Int8::VALUE_MIN) && (value <= Int8::VALUE_MAX), E_OUT_OF_RANGE, "The value(%d) is out of range.", value);
+       ret = static_cast< char >(value);
        return E_SUCCESS;
 }
 
@@ -136,27 +117,8 @@ Int8::Parse(const String& s, int radix, char& ret)
        long value;
        result r = _NumberUtil::Parse(s, radix, value);
        SysTryReturnResult(NID_BASE, r == E_SUCCESS, r, "Propagating.");
-
-       if ((Tizen::App::_AppInfo::GetApiVersion() >= _API_VERSION_2_0) && (Tizen::App::_AppInfo::GetApiVersion() <= _API_VERSION_2_2))
-       {
-               if (value > Int8::VALUE_MAX)
-               {
-                       ret = Int8::VALUE_MAX;
-               }
-               else if (value < Int8::VALUE_MIN)
-               {
-                       ret = Int8::VALUE_MIN;
-               }
-               else
-               {
-                       ret = static_cast< char >(value);
-               }
-       }
-       else
-       {
-               SysTryReturnResult(NID_BASE, (value >= Int8::VALUE_MIN) && (value <= Int8::VALUE_MAX), E_OUT_OF_RANGE, "The value(%d) is out of range.", value);
-               ret = static_cast< char >(value);
-       }
+       SysTryReturnResult(NID_BASE, (value >= Int8::VALUE_MIN) && (value <= Int8::VALUE_MAX), E_OUT_OF_RANGE, "The value(%d) is out of range.", value);
+       ret = static_cast< char >(value);
        return E_SUCCESS;
 }
 

diff --git a/src/base/FBaseInteger.cpp b/src/base/FBaseInteger.cpp
index 3258d2f..3bcf385 100644 (file)
--- a/src/base/FBaseInteger.cpp
+++ b/src/base/FBaseInteger.cpp
@@ -116,20 +116,8 @@ Integer::Parse(const String& s, int radix, int& ret)
        long value;
        result r = _NumberUtil::Parse(s, radix, value);
        SysTryReturnResult(NID_BASE, r == E_SUCCESS, r, "Propagating.");
-
-       if (value > Integer::VALUE_MAX)
-       {
-               ret = Integer::VALUE_MAX;
-       }
-       else if (value < Integer::VALUE_MIN)
-       {
-               ret = Integer::VALUE_MIN;
-       }
-       else
-       {
-               ret = static_cast< int >(value);
-       }
-       return r;
+       ret = static_cast< int >(value);
+       return E_SUCCESS;
 }
 
 char

diff --git a/src/base/FBaseInteger8.cpp b/src/base/FBaseInteger8.cpp
index 5d32253..3665262 100755 (executable)
--- a/src/base/FBaseInteger8.cpp
+++ b/src/base/FBaseInteger8.cpp
@@ -106,7 +106,6 @@ Integer8::Decode(const String& inputStr, int8_t& ret)
        long value;
        result r = _NumberUtil::Decode(inputStr, value);
        SysTryReturnResult(NID_BASE, r == E_SUCCESS, r, "Propagating.");
-
        SysTryReturnResult(NID_BASE, (value >= Integer8::VALUE_MIN) && (value <= Integer8::VALUE_MAX), E_OUT_OF_RANGE, "The value(%d) is out of range.", value);
        ret = static_cast< int8_t >(value);
        return E_SUCCESS;
@@ -124,7 +123,6 @@ Integer8::Parse(const String& inputStr, int radix, int8_t& ret)
        long value;
        result r = _NumberUtil::Parse(inputStr, radix, value);
        SysTryReturnResult(NID_BASE, r == E_SUCCESS, r, "Propagating.");
-
        SysTryReturnResult(NID_BASE, (value >= Integer8::VALUE_MIN) && (value <= Integer8::VALUE_MAX), E_OUT_OF_RANGE, "The value(%d) is out of range.", value);
        ret = static_cast< int8_t >(value);
        return E_SUCCESS;

diff --git a/src/base/FBaseShort.cpp b/src/base/FBaseShort.cpp
index ac9ef93..d056caf 100644 (file)
--- a/src/base/FBaseShort.cpp
+++ b/src/base/FBaseShort.cpp
@@ -106,27 +106,8 @@ Short::Decode(const String& s, short& ret)
        long value;
        result r = _NumberUtil::Decode(s, value);
        SysTryReturnResult(NID_BASE, r == E_SUCCESS, r, "Propagating.");
-
-       if ((Tizen::App::_AppInfo::GetApiVersion() >= _API_VERSION_2_0) && (Tizen::App::_AppInfo::GetApiVersion() <= _API_VERSION_2_2))
-       {
-               if (value > Short::VALUE_MAX)
-               {
-                       ret = Short::VALUE_MAX;
-               }
-               else if (value < Short::VALUE_MIN)
-               {
-                       ret = Short::VALUE_MIN;
-               }
-               else
-               {
-                       ret = static_cast< short >(value);
-               }
-       }
-       else
-       {
-               SysTryReturnResult(NID_BASE, (value >= Short::VALUE_MIN) && (value <= Short::VALUE_MAX), E_OUT_OF_RANGE, "The value(%d) is out of range.", value);
-               ret = static_cast< short >(value);
-       }
+       SysTryReturnResult(NID_BASE, (value >= Short::VALUE_MIN) && (value <= Short::VALUE_MAX), E_OUT_OF_RANGE, "The value(%d) is out of range.", value);
+       ret = static_cast< short >(value);
        return E_SUCCESS;
 }
 
@@ -142,27 +123,8 @@ Short::Parse(const String& s, int radix, short& ret)
        long value;
        result r = _NumberUtil::Parse(s, radix, value);
        SysTryReturnResult(NID_BASE, r == E_SUCCESS, r, "Propagating.");
-
-       if ((Tizen::App::_AppInfo::GetApiVersion() >= _API_VERSION_2_0) && (Tizen::App::_AppInfo::GetApiVersion() <= _API_VERSION_2_2))
-       {
-               if (value > Short::VALUE_MAX)
-               {
-                       ret = Short::VALUE_MAX;
-               }
-               else if (value < Short::VALUE_MIN)
-               {
-                       ret = Short::VALUE_MIN;
-               }
-               else
-               {
-                       ret = static_cast< short >(value);
-               }
-       }
-       else
-       {
-               SysTryReturnResult(NID_BASE, (value >= Short::VALUE_MIN) && (value <= Short::VALUE_MAX), E_OUT_OF_RANGE, "The value(%d) is out of range.", value);
-               ret = static_cast< short >(value);
-       }
+       SysTryReturnResult(NID_BASE, (value >= Short::VALUE_MIN) && (value <= Short::VALUE_MAX), E_OUT_OF_RANGE, "The value(%d) is out of range.", value);
+       ret = static_cast< short >(value);
        return E_SUCCESS;
 }
 

diff --git a/src/base/FBase_NumberUtil.cpp b/src/base/FBase_NumberUtil.cpp
index ed72ccf..574c604 100644 (file)
--- a/src/base/FBase_NumberUtil.cpp
+++ b/src/base/FBase_NumberUtil.cpp
@@ -80,6 +80,7 @@ _NumberUtil::Decode(const String& inputStr, long& value)
        int radix = 0;
        String str(inputStr);
        result res = _NumberUtil::FindRadix(str,radix);
+       SysTryReturnResult(NID_BASE, res == E_SUCCESS, res, "Propagating.");
        res = Parse(str, radix, value);
        SysTryReturnResult(NID_BASE, res == E_SUCCESS, res, "_NumberUtil decode failed");
        return E_SUCCESS;
@@ -91,6 +92,7 @@ _NumberUtil::Decode(const String& inputStr, long long& value)
        int radix = 0;
        String str(inputStr);
        result res = _NumberUtil::FindRadix(str,radix);
+       SysTryReturnResult(NID_BASE, res == E_SUCCESS, res, "Propagating.");
        res = Parse(str, radix, value);
        SysTryReturnResult(NID_BASE, res == E_SUCCESS, res, "_NumberUtil decode failed");
        return E_SUCCESS;
@@ -111,16 +113,7 @@ _NumberUtil::Parse(const String& inputStr, int radix, long& value)
        int sysErrno = errno;
 
        SysTryReturnResult(NID_BASE, pEnd[0] == 0, E_NUM_FORMAT, "_NumberUtil parse failed. Scan stopped at (%ls).", pEnd);
-       if ((Tizen::App::_AppInfo::GetApiVersion() >= _API_VERSION_2_0) && (Tizen::App::_AppInfo::GetApiVersion() <= _API_VERSION_2_2))
-       {
-               SysTryReturnResult(NID_BASE, !((value == LONG_MAX || value == LONG_MIN) && (sysErrno != 0)), E_NUM_FORMAT,
-               "Parsed value cannot fit into a long.");
-       }
-       else
-       {
-               SysTryReturnResult(NID_BASE, sysErrno !=  ERANGE, E_OUT_OF_RANGE, "Parsed value cannot fit into a long.");
-       }
-
+       SysTryReturnResult(NID_BASE, sysErrno !=  ERANGE, E_OUT_OF_RANGE, "Parsed value cannot fit into a long.");
        return E_SUCCESS;
 }
 
@@ -139,15 +132,7 @@ _NumberUtil::Parse(const String& inputStr, int radix, long long& value)
        int sysErrno = errno;
 
        SysTryReturnResult(NID_BASE, pEnd[0] == 0, E_NUM_FORMAT, "_NumberUtil parse failed. Scan stopped at (%ls).", pEnd);
-       if ((Tizen::App::_AppInfo::GetApiVersion() >= _API_VERSION_2_0) && (Tizen::App::_AppInfo::GetApiVersion() <= _API_VERSION_2_2))
-       {
-               SysTryReturnResult(NID_BASE, !((value == LLONG_MAX || value == LLONG_MIN) && (sysErrno != 0)), E_NUM_FORMAT,
-               "Parsed value cannot fit into a long long.");
-       }
-       else
-       {
-               SysTryReturnResult(NID_BASE, sysErrno !=  ERANGE, E_OUT_OF_RANGE, "Parsed value cannot fit into a long long.");
-       }
+       SysTryReturnResult(NID_BASE, sysErrno !=  ERANGE, E_OUT_OF_RANGE, "Parsed value cannot fit into a long long.");
        return E_SUCCESS;
 }
 }} // Tizen::Base