X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FWindowsBase%2FSystem.Windows%2FVector.cs;h=88b23054fdb220d7613a848e75a4096bdce2ed03;hb=f74ecea14e939f72278d6fbee2cdbb6713cd4df5;hp=5ed53c3e249cbab2c7ca461a8082147f3b16218a;hpb=afe5ec7ce1751a82875eb1318103b365d2d00290;p=mono.git

diff --git a/mcs/class/WindowsBase/System.Windows/Vector.cs b/mcs/class/WindowsBase/System.Windows/Vector.cs
index 5ed53c3e249..88b23054fdb 100644
--- a/mcs/class/WindowsBase/System.Windows/Vector.cs
+++ b/mcs/class/WindowsBase/System.Windows/Vector.cs
@@ -23,8 +23,8 @@
 //	Chris Toshok (toshok@novell.com)
 //
 
-using System;
 using System.ComponentModel;
+using System.Globalization;
 using System.Windows.Converters;
 using System.Windows.Markup;
 using System.Windows.Media;
@@ -57,12 +57,10 @@ namespace System.Windows {
 
 		public override int GetHashCode ()
 		{
-			throw new NotImplementedException ();
-		}
-
-		string IFormattable.ToString (string format, IFormatProvider provider)
-		{
-			return string.Format (provider, "{0:" + format + "},{1:" + format + "}", _x, _y);
+			unchecked
+			{
+				return (_x.GetHashCode () * 397) ^ _y.GetHashCode ();
+			}
 		}
 
 		public static bool Equals (Vector vector1, Vector vector2)
@@ -150,17 +148,47 @@ namespace System.Windows {
 
 		public static Vector Parse (string source)
 		{
-			throw new NotImplementedException ();
+			if (source == null)
+				throw new ArgumentNullException ("source");
+			var tokenizer = new NumericListTokenizer (source, CultureInfo.InvariantCulture);
+			double x;
+			double y;
+			if (!double.TryParse (tokenizer.GetNextToken (), NumberStyles.Float, CultureInfo.InvariantCulture, out x) ||
+			    !double.TryParse (tokenizer.GetNextToken (), NumberStyles.Float, CultureInfo.InvariantCulture, out y))
+			{
+				throw new FormatException (string.Format ("Invalid Vector format: {0}", source));
+			}
+			if (!tokenizer.HasNoMoreTokens ())
+			{
+				throw new InvalidOperationException("Invalid Vector format: " + source);
+			}
+			return new Vector(x, y);
 		}
 
 		public override string ToString ()
 		{
-			return String.Format ("{0},{1}", _x, _y);
+			return ToString(null);
 		}
 
 		public string ToString (IFormatProvider provider)
 		{
-			throw new NotImplementedException ();
+			return ToString (null, provider);
+		}
+
+		string IFormattable.ToString (string format, IFormatProvider provider)
+		{
+			return ToString (format, provider);
+		}
+
+		private string ToString(string format,IFormatProvider formatProvider)
+		{
+			if (formatProvider == null)
+				formatProvider = CultureInfo.CurrentCulture;
+			if (format == null)
+				format = string.Empty;
+			var separator = NumericListTokenizer.GetSeparator (formatProvider);
+			var vectorFormat  = string.Format ("{{0:{0}}}{1}{{1:{0}}}", format, separator);
+			return string.Format (formatProvider, vectorFormat, _x, _y);
 		}
 
 		public double Length {