Changeset 1096 for trunk/eraser6

Timestamp:

6/2/2009 10:03:23 AM (4 years ago)

Author:

lowjoel

Message:

Removed all the comparison/Equals mess with the explicit conversion operator.

Location:

trunk/eraser6

Files:

• Eraser.Manager/Language.cs (modified) (1 diff)
• Eraser/SettingsPanel.cs (modified) (1 diff)

trunk/eraser6/Eraser.Manager/Language.cs

@@ -97 +97 @@
             return lang.culture;
         }
-
-        public override bool Equals(object obj)
-        {
-            CultureInfo cultureInfo = obj as CultureInfo;
-            Language language = obj as Language;
-            if (cultureInfo != null)
-                return Equals(cultureInfo);
-            else if (language != null)
-                return Equals(language.culture);
-            return false;
-        }
-
-        public bool Equals(CultureInfo other)
-        {
-            return culture == other;
-        }
-
-        public static bool operator ==(Language language, CultureInfo culture)
-        {
-            return language.Equals(culture);
-        }
-
-        public static bool operator ==(CultureInfo culture, Language language)
-        {
-            return language.Equals(culture);
-        }
-
-        public static bool operator !=(Language language, CultureInfo culture)
-        {
-            return !language.Equals(culture);
-        }
-
-        public static bool operator !=(CultureInfo culture, Language language)
-        {
-            return !language.Equals(culture);
-        }
-
+        
         public override int GetHashCode()
         {

trunk/eraser6/Eraser/SettingsPanel.cs

@@ -200 +200 @@
                 defaultsList.Add(S._("User interface language"));
                 foreach (Language lang in uiLanguage.Items)
-                    if (lang == CultureInfo.CurrentUICulture)
+                    if ((CultureInfo)lang == CultureInfo.CurrentUICulture)
                         uiLanguage.SelectedItem = lang;
             }