Merge pull request #2336 from cpasslack/cpasslack/corruptDecimalNumbe…

…rAfterDecodingFix Fixed: Encoding a [CPDecimalNumber zero] causes a corrupt CPDecimalNumbe...
cappuccino · Mar 31, 2015 · 007ca4c · 007ca4c
2 parents 1925b7b + bb9049b
commit 007ca4c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/Foundation/CPDecimalNumber.j b/Foundation/CPDecimalNumber.j
@@ -28,6 +28,8 @@
 // The default global behavior class, created lazily
 var CPDefaultDcmHandler = nil;
 
+var CPDecimalNumberUIDs = new CFMutableDictionary();
+
 /*!
     @class CPDecimalNumberHandler
     @ingroup foundation
@@ -531,6 +533,20 @@ var CPDecimalNumberHandlerRoundingModeKey       = @"CPDecimalNumberHandlerRoundi
 }
 
 // instance methods
+
+- (CPString)UID
+{
+    var UID = CPDecimalNumberUIDs.valueForKey(self);
+
+    if (!UID)
+    {
+        UID = objj_generateObjectUID();
+        CPDecimalNumberUIDs.setValueForKey(self, UID);
+    }
+
+    return UID + "";
+}
+
 /*!
     Returns a new CPDecimalNumber object with the result of the summation of
     the receiver object and \c decimalNumber. If overflow occurs then the

diff --git a/Tests/AppKit/CPTextFieldTest.j b/Tests/AppKit/CPTextFieldTest.j
@@ -29,6 +29,7 @@
 
     [numberFormatter setNumberStyle:CPNumberFormatterDecimalStyle];
     [numberFormatter setMaximumFractionDigits:3];
+    [numberFormatter setGeneratesDecimalNumbers:NO];
 
     [control setFormatter:numberFormatter];
     [control setStringValue:@"12.3456"];

diff --git a/Tests/Foundation/CPNumberFormatterTest.j b/Tests/Foundation/CPNumberFormatterTest.j
@@ -62,6 +62,7 @@
 
     [numberFormatter setMinimum:10];
     [numberFormatter setMaximum:20];
+    [numberFormatter setGeneratesDecimalNumbers:NO];
 
     [self assertTrue:[numberFormatter getObjectValue:objectValueRef forString:@"10" errorDescription:nil]
              message:@"MinMax T1: Expected True."];