Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Clients.OKB.Views/3.3/Query

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.OKB.Views/3.3/Query/Views/EqualityComparisonBoolFilterView.cs (modified) (1 diff)
• HeuristicLab.Clients.OKB.Views/3.3/Query/Views/EqualityComparisonFilterView.cs (modified) (1 diff)
• HeuristicLab.Clients.OKB.Views/3.3/Query/Views/OrdinalComparisonFilterView.cs (modified) (1 diff)
• HeuristicLab.Clients.OKB.Views/3.3/Query/Views/StringComparisonAvailableValuesFilterView.cs (modified) (1 diff)
• HeuristicLab.Clients.OKB.Views/3.3/Query/Views/StringComparisonFilterView.cs (modified) (1 diff)

branches/GP-MoveOperators/HeuristicLab.Clients.OKB.Views/3.3/Query/Views/EqualityComparisonBoolFilterView.cs

@@ -52 +52 @@
     private void valueComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
       if (Content != null) {
-        Content.Value = valueComboBox.SelectedItem == "true" ? true : false;
+        Content.Value = valueComboBox.SelectedItem.ToString() == "true";
       }
     }

branches/GP-MoveOperators/HeuristicLab.Clients.OKB.Views/3.3/Query/Views/EqualityComparisonFilterView.cs

@@ -54 +54 @@
     private void comparisonComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
       if (Content != null) {
-        if (comparisonComboBox.SelectedItem == "=")
+        if (comparisonComboBox.SelectedItem.ToString() == "=")
           Content.Comparison = EqualityComparison.Equal;
-        else if (comparisonComboBox.SelectedItem == "<>")
+        else if (comparisonComboBox.SelectedItem.ToString() == "<>")
           Content.Comparison = EqualityComparison.NotEqual;
       }

branches/GP-MoveOperators/HeuristicLab.Clients.OKB.Views/3.3/Query/Views/OrdinalComparisonFilterView.cs

@@ -63 +63 @@
     private void comparisonComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
       if (Content != null) {
-        if (comparisonComboBox.SelectedItem == "<")
+        if (comparisonComboBox.SelectedItem.ToString() == "<")
           Content.Comparison = OrdinalComparison.Less;
-        else if (comparisonComboBox.SelectedItem == "<=")
+        else if (comparisonComboBox.SelectedItem.ToString() == "<=")
           Content.Comparison = OrdinalComparison.LessOrEqual;
-        else if (comparisonComboBox.SelectedItem == "=")
+        else if (comparisonComboBox.SelectedItem.ToString() == "=")
           Content.Comparison = OrdinalComparison.Equal;
-        else if (comparisonComboBox.SelectedItem == ">=")
+        else if (comparisonComboBox.SelectedItem.ToString() == ">=")
           Content.Comparison = OrdinalComparison.GreaterOrEqual;
-        else if (comparisonComboBox.SelectedItem == ">")
+        else if (comparisonComboBox.SelectedItem.ToString() == ">")
           Content.Comparison = OrdinalComparison.Greater;
-        else if (comparisonComboBox.SelectedItem == "<>")
+        else if (comparisonComboBox.SelectedItem.ToString() == "<>")
           Content.Comparison = OrdinalComparison.NotEqual;
       }

branches/GP-MoveOperators/HeuristicLab.Clients.OKB.Views/3.3/Query/Views/StringComparisonAvailableValuesFilterView.cs

@@ -66 +66 @@
     private void comparisonComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
       if (Content != null) {
-        if (comparisonComboBox.SelectedItem == "=")
+        if (comparisonComboBox.SelectedItem.ToString() == "=")
           Content.Comparison = StringComparison.Equal;
-        else if (comparisonComboBox.SelectedItem == "<>")
+        else if (comparisonComboBox.SelectedItem.ToString() == "<>")
           Content.Comparison = StringComparison.NotEqual;
-        else if (comparisonComboBox.SelectedItem == "contains")
+        else if (comparisonComboBox.SelectedItem.ToString() == "contains")
           Content.Comparison = StringComparison.Contains;
-        else if (comparisonComboBox.SelectedItem == "not contains")
+        else if (comparisonComboBox.SelectedItem.ToString() == "not contains")
           Content.Comparison = StringComparison.NotContains;
-        else if (comparisonComboBox.SelectedItem == "like")
+        else if (comparisonComboBox.SelectedItem.ToString() == "like")
           Content.Comparison = StringComparison.Like;
-        else if (comparisonComboBox.SelectedItem == "not like")
+        else if (comparisonComboBox.SelectedItem.ToString() == "not like")
           Content.Comparison = StringComparison.NotLike;
       }

branches/GP-MoveOperators/HeuristicLab.Clients.OKB.Views/3.3/Query/Views/StringComparisonFilterView.cs

@@ -66 +66 @@
     private void comparisonComboBox_SelectedIndexChanged(object sender, System.EventArgs e) {
       if (Content != null) {
-        if (comparisonComboBox.SelectedItem == "=")
+        if (comparisonComboBox.SelectedItem.ToString() == "=")
           Content.Comparison = StringComparison.Equal;
-        else if (comparisonComboBox.SelectedItem == "<>")
+        else if (comparisonComboBox.SelectedItem.ToString() == "<>")
           Content.Comparison = StringComparison.NotEqual;
-        else if (comparisonComboBox.SelectedItem == "contains")
+        else if (comparisonComboBox.SelectedItem.ToString() == "contains")
           Content.Comparison = StringComparison.Contains;
-        else if (comparisonComboBox.SelectedItem == "not contains")
+        else if (comparisonComboBox.SelectedItem.ToString() == "not contains")
           Content.Comparison = StringComparison.NotContains;
-        else if (comparisonComboBox.SelectedItem == "like")
+        else if (comparisonComboBox.SelectedItem.ToString() == "like")
           Content.Comparison = StringComparison.Like;
-        else if (comparisonComboBox.SelectedItem == "not like")
+        else if (comparisonComboBox.SelectedItem.ToString() == "not like")
           Content.Comparison = StringComparison.NotLike;
       }