Changeset 5606 for branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views

Timestamp:

03/04/11 01:06:26 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views

Files:

• CombinedFilterView.Designer.cs (modified) (1 diff)
• CombinedFilterView.cs (modified) (2 diffs)
• EqualityComparisonFilterView.Designer.cs (modified) (1 diff)
• EqualityComparisonFilterView.cs (modified) (1 diff)
• FilterView.Designer.cs (modified) (1 diff)
• FilterView.cs (modified) (1 diff)
• NameEqualityComparisonBoolFilterView.Designer.cs (modified) (1 diff)
• NameEqualityComparisonBoolFilterView.cs (modified) (1 diff)
• NameOrdinalComparisonDoubleFilterView.Designer.cs (modified) (1 diff)
• NameOrdinalComparisonDoubleFilterView.cs (modified) (1 diff)
• NameOrdinalComparisonLongFilterView.Designer.cs (modified) (1 diff)
• NameOrdinalComparisonLongFilterView.cs (modified) (1 diff)
• NameStringComparisonAvailableValuesFilterView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameSetComparisonStringAvailableValuesFilterView.Designer.cs) (1 diff)
• NameStringComparisonAvailableValuesFilterView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameSetComparisonStringAvailableValuesFilterView.cs) (1 diff)
• NameStringComparisonFilterView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameSetComparisonStringFilterView.Designer.cs) (1 diff)
• NameStringComparisonFilterView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameSetComparisonStringFilterView.cs) (1 diff)
• OrdinalComparisonFilterView.Designer.cs (modified) (1 diff)
• OrdinalComparisonFilterView.cs (modified) (1 diff)
• OrdinalComparisonLongFilterView.Designer.cs (modified) (1 diff)
• OrdinalComparisonLongFilterView.cs (modified) (1 diff)
• QueryView.Designer.cs (modified) (1 diff)
• QueryView.cs (modified) (2 diffs)
• SetComparisonStringFilterView.Designer.cs (modified) (1 diff)
• SetComparisonStringFilterView.cs (modified) (1 diff)
• StringComparisonAvailableValuesFilterView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/SetComparisonStringAvailableValuesFilterView.Designer.cs) (1 diff)
• StringComparisonAvailableValuesFilterView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/SetComparisonStringAvailableValuesFilterView.cs) (1 diff)
• StringComparisonFilterView.Designer.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/SetComparisonFilterView.Designer.cs) (2 diffs)
• StringComparisonFilterView.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/SetComparisonFilterView.cs) (3 diffs)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/CombinedFilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   partial class CombinedFilterView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/CombinedFilterView.cs

@@ -26 +26 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   [View("CombinedFilter View")]
   [Content(typeof(CombinedFilter), true)]
@@ -41 +41 @@
     protected override void OnInitialized(System.EventArgs e) {
       base.OnInitialized(e);
-      IEnumerable<Filter> availableFilters = OKBClient.Instance.GetFilters();
+      IEnumerable<Filter> availableFilters = QueryClient.Instance.GetFilters();
       filtersComboBox.DataSource = availableFilters;
       filtersComboBox.DisplayMember = "Label";

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/EqualityComparisonFilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   partial class EqualityComparisonFilterView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/EqualityComparisonFilterView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   [View("EqualityComparisonFilter View")]
   public partial class EqualityComparisonFilterView : FilterView {

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/FilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   partial class FilterView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/FilterView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   [View("Filter View")]
   [Content(typeof(Filter), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameEqualityComparisonBoolFilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   partial class NameEqualityComparisonBoolFilterView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameEqualityComparisonBoolFilterView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   [View("NameEqualityComparisonBoolFilter View")]
   [Content(typeof(NameEqualityComparisonBoolFilter), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameOrdinalComparisonDoubleFilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   partial class NameOrdinalComparisonDoubleFilterView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameOrdinalComparisonDoubleFilterView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   [View("NameOrdinalComparisonDoubleFilter View")]
   [Content(typeof(NameOrdinalComparisonDoubleFilter), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameOrdinalComparisonLongFilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   partial class NameOrdinalComparisonLongFilterView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameOrdinalComparisonLongFilterView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   [View("NameOrdinalComparisonLongFilter View")]
   [Content(typeof(NameOrdinalComparisonLongFilter), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameStringComparisonAvailableValuesFilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
-  partial class NameSetComparisonStringAvailableValuesFilterView {
+namespace HeuristicLab.Clients.OKB.Query {
+  partial class NameStringComparisonAvailableValuesFilterView {
     /// <summary> 
     /// Required designer variable.

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameStringComparisonAvailableValuesFilterView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
-  [View("NameSetComparisonStringAvailableValuesFilter View")]
-  [Content(typeof(NameSetComparisonStringAvailableValuesFilter), true)]
-  public partial class NameSetComparisonStringAvailableValuesFilterView : SetComparisonFilterView {
-    public new NameSetComparisonStringAvailableValuesFilter Content {
-      get { return (NameSetComparisonStringAvailableValuesFilter)base.Content; }
+namespace HeuristicLab.Clients.OKB.Query {
+  [View("NameStringComparisonAvailableValuesFilter View")]
+  [Content(typeof(NameStringComparisonAvailableValuesFilter), true)]
+  public partial class NameStringComparisonAvailableValuesFilterView : StringComparisonFilterView {
+    public new NameStringComparisonAvailableValuesFilter Content {
+      get { return (NameStringComparisonAvailableValuesFilter)base.Content; }
       set { base.Content = value; }
     }
 
-    public NameSetComparisonStringAvailableValuesFilterView() {
+    public NameStringComparisonAvailableValuesFilterView() {
       InitializeComponent();
     }

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameStringComparisonFilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
-  partial class NameSetComparisonStringFilterView {
+namespace HeuristicLab.Clients.OKB.Query {
+  partial class NameStringComparisonFilterView {
     /// <summary> 
     /// Required designer variable.

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/NameStringComparisonFilterView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
-  [View("NameSetComparisonStringFilter View")]
-  [Content(typeof(NameSetComparisonStringFilter), true)]
-  public partial class NameSetComparisonStringFilterView : SetComparisonFilterView {
-    public new NameSetComparisonStringFilter Content {
-      get { return (NameSetComparisonStringFilter)base.Content; }
+namespace HeuristicLab.Clients.OKB.Query {
+  [View("NameStringComparisonFilter View")]
+  [Content(typeof(NameStringComparisonFilter), true)]
+  public partial class NameStringComparisonFilterView : StringComparisonFilterView {
+    public new NameStringComparisonFilter Content {
+      get { return (NameStringComparisonFilter)base.Content; }
       set { base.Content = value; }
     }
 
-    public NameSetComparisonStringFilterView() {
+    public NameStringComparisonFilterView() {
       InitializeComponent();
     }

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/OrdinalComparisonFilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   partial class OrdinalComparisonFilterView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/OrdinalComparisonFilterView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   [View("OrdinalComparisonFilter View")]
   [Content(typeof(OrdinalComparisonFilter), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/OrdinalComparisonLongFilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   partial class OrdinalComparisonLongFilterView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/OrdinalComparisonLongFilterView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   [View("OrdinalComparisonLongFilter View")]
   [Content(typeof(OrdinalComparisonLongFilter), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/QueryView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   partial class QueryView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/QueryView.cs

@@ -22 +22 @@
 using System;
 using System.IO;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -33 +31 @@
 using HeuristicLab.Persistence.Default.Xml;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   [View("OKB Query")]
   [Content(typeof(OKBClient), false)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/SetComparisonStringFilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   partial class SetComparisonStringFilterView {
     /// <summary> 

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/SetComparisonStringFilterView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
+namespace HeuristicLab.Clients.OKB.Query {
   [View("SetComparisonStringFilter View")]
   [Content(typeof(SetComparisonStringFilter), true)]

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/StringComparisonAvailableValuesFilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
-  partial class SetComparisonStringAvailableValuesFilterView {
+namespace HeuristicLab.Clients.OKB.Query {
+  partial class StringComparisonAvailableValuesFilterView {
     /// <summary> 
     /// Required designer variable.

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/StringComparisonAvailableValuesFilterView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
-  [View("SetComparisonStringAvailableValuesFilter View")]
-  [Content(typeof(SetComparisonStringAvailableValuesFilter), true)]
-  public partial class SetComparisonStringAvailableValuesFilterView : SetComparisonFilterView {
-    public new SetComparisonStringAvailableValuesFilter Content {
-      get { return (SetComparisonStringAvailableValuesFilter)base.Content; }
+namespace HeuristicLab.Clients.OKB.Query {
+  [View("StringComparisonAvailableValuesFilter View")]
+  [Content(typeof(StringComparisonAvailableValuesFilter), true)]
+  public partial class StringComparisonAvailableValuesFilterView : StringComparisonFilterView {
+    public new StringComparisonAvailableValuesFilter Content {
+      get { return (StringComparisonAvailableValuesFilter)base.Content; }
       set { base.Content = value; }
     }
 
-    public SetComparisonStringAvailableValuesFilterView() {
+    public StringComparisonAvailableValuesFilterView() {
       InitializeComponent();
     }

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/StringComparisonFilterView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-namespace HeuristicLab.Clients.OKB {
-  partial class SetComparisonFilterView {
+namespace HeuristicLab.Clients.OKB.Query {
+  partial class StringComparisonFilterView {
     /// <summary> 
     /// Required designer variable.
@@ -75 +75 @@
             "<>",
             "contains",
-            "not contains"});
+            "not contains",
+            "like",
+            "not like"});
       this.comparisonComboBox.Location = new System.Drawing.Point(3, 2);
       this.comparisonComboBox.Name = "comparisonComboBox";

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/StringComparisonFilterView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm.WindowsForms;
 
-namespace HeuristicLab.Clients.OKB {
-  [View("SetComparisonFilter View")]
-  [Content(typeof(SetComparisonFilter), true)]
-  public partial class SetComparisonFilterView : FilterView {
-    public new SetComparisonFilter Content {
-      get { return (SetComparisonFilter)base.Content; }
+namespace HeuristicLab.Clients.OKB.Query {
+  [View("StringComparisonFilter View")]
+  [Content(typeof(StringComparisonFilter), true)]
+  public partial class StringComparisonFilterView : FilterView {
+    public new StringComparisonFilter Content {
+      get { return (StringComparisonFilter)base.Content; }
       set { base.Content = value; }
     }
 
-    public SetComparisonFilterView() {
+    public StringComparisonFilterView() {
       InitializeComponent();
     }
@@ -41 +41 @@
       comparisonComboBox.SelectedIndex = -1;
       if (Content != null) {
-        if (Content.Comparison == SetComparison.Equal)
+        if (Content.Comparison == StringComparison.Equal)
           comparisonComboBox.SelectedItem = "=";
-        else if (Content.Comparison == SetComparison.NotEqual)
+        else if (Content.Comparison == StringComparison.NotEqual)
           comparisonComboBox.SelectedItem = "<>";
-        else if (Content.Comparison == SetComparison.Contains)
+        else if (Content.Comparison == StringComparison.Contains)
           comparisonComboBox.SelectedItem = "contains";
-        else if (Content.Comparison == SetComparison.NotContains)
+        else if (Content.Comparison == StringComparison.NotContains)
           comparisonComboBox.SelectedItem = "not contains";
+        else if (Content.Comparison == StringComparison.Like)
+          comparisonComboBox.SelectedItem = "like";
+        else if (Content.Comparison == StringComparison.NotLike)
+          comparisonComboBox.SelectedItem = "not like";
       }
     }
@@ -60 +64 @@
       if (Content != null) {
         if (comparisonComboBox.SelectedItem == "=")
-          Content.Comparison = SetComparison.Equal;
+          Content.Comparison = StringComparison.Equal;
         else if (comparisonComboBox.SelectedItem == "<>")
-          Content.Comparison = SetComparison.NotEqual;
+          Content.Comparison = StringComparison.NotEqual;
         else if (comparisonComboBox.SelectedItem == "contains")
-          Content.Comparison = SetComparison.Contains;
+          Content.Comparison = StringComparison.Contains;
         else if (comparisonComboBox.SelectedItem == "not contains")
-          Content.Comparison = SetComparison.NotContains;
+          Content.Comparison = StringComparison.NotContains;
+        else if (comparisonComboBox.SelectedItem == "like")
+          Content.Comparison = StringComparison.Like;
+        else if (comparisonComboBox.SelectedItem == "not like")
+          Content.Comparison = StringComparison.NotLike;
       }
     }