Changeset 14080 for stable

Timestamp:

07/15/16 10:24:41 (8 years ago)

Author:

mkommend

Message:

#2610: Merged r14025, r14034 to stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Data/3.3 (modified) (1 prop)
• HeuristicLab.Data/3.3/TimeSpanValue.cs (modified) (4 diffs)

stable/HeuristicLab.Data/3.3/TimeSpanValue.cs

@@ -21 +21 @@
 
 using System;
+using System.Globalization;
 using System.Text;
 using HeuristicLab.Common;
@@ -52 +53 @@
     protected virtual bool Validate(string value, out string errorMessage) {
       TimeSpan val;
-      bool valid = TimeSpan.TryParse(value, out val);
+      bool valid = TimeSpan.TryParseExact(value, "c", CultureInfo.CurrentCulture, out val);
       errorMessage = string.Empty;
       if (!valid) {
@@ -64 +65 @@
     }
     protected virtual string GetValue() {
-      return Value.ToString();
+      return Value.ToString("c");
     }
     protected virtual bool SetValue(string value) {
       TimeSpan val;
-      if (TimeSpan.TryParse(value, out val)) {
+      if (TimeSpan.TryParseExact(value, "c", CultureInfo.CurrentCulture, out val)) {
         Value = val;
         return true;
@@ -74 +75 @@
         return false;
       }
+    }
+    public override string ToString() {
+      return Value.ToString("c");
     }