Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5606


Ignore:
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
Files:
3 added
31 edited
12 moved

Legend:

Unmodified
Added
Removed

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/HeuristicLab.Clients.OKB-3.3.csproj

    r5587 r5606  
    180180    <Compile Include="Authentication\AuthenticationClient.cs" />
    181181    <Compile Include="Authentication\ServiceClient\AuthenticationServiceClient.cs" />
     182    <Compile Include="Query\QueryClient.cs" />
     183    <Compile Include="Query\QueryMenuItem.cs" />
     184    <Compile Include="Query\ServiceClient\CombinedFilter.cs" />
     185    <Compile Include="Query\ServiceClient\OrdinalComparisonIntFilter.cs" />
     186    <Compile Include="Query\ServiceClient\NameOrdinalComparisonIntFilter.cs" />
     187    <Compile Include="Query\ServiceClient\NameOrdinalComparisonFloatFilter.cs" />
     188    <Compile Include="Query\ServiceClient\Filter.cs" />
     189    <Compile Include="Query\ServiceClient\NameEqualityComparisonBoolFilter.cs" />
     190    <Compile Include="Query\ServiceClient\NameEqualityComparisonByteArrayFilter.cs" />
     191    <Compile Include="Query\ServiceClient\NameOrdinalComparisonDoubleFilter.cs" />
     192    <Compile Include="Query\ServiceClient\NameOrdinalComparisonLongFilter.cs" />
     193    <Compile Include="Query\ServiceClient\NameStringComparisonAvailableValuesFilter.cs" />
     194    <Compile Include="Query\ServiceClient\NameStringComparisonFilter.cs" />
     195    <Compile Include="Query\ServiceClient\OrdinalComparisonDateTimeFilter.cs" />
     196    <Compile Include="Query\ServiceClient\OrdinalComparisonLongFilter.cs" />
    182197    <Compile Include="Query\ServiceClient\QueryServiceClient.cs" />
     198    <Compile Include="Query\ServiceClient\StringComparisonAvailableValuesFilter.cs" />
     199    <Compile Include="Query\ServiceClient\StringComparisonFilter.cs" />
     200    <Compile Include="Query\Views\CombinedFilterView.cs">
     201      <SubType>UserControl</SubType>
     202    </Compile>
     203    <Compile Include="Query\Views\CombinedFilterView.Designer.cs">
     204      <DependentUpon>CombinedFilterView.cs</DependentUpon>
     205    </Compile>
     206    <Compile Include="Query\Views\EqualityComparisonFilterView.cs">
     207      <SubType>UserControl</SubType>
     208    </Compile>
     209    <Compile Include="Query\Views\EqualityComparisonFilterView.Designer.cs">
     210      <DependentUpon>EqualityComparisonFilterView.cs</DependentUpon>
     211    </Compile>
     212    <Compile Include="Query\Views\FilterView.cs">
     213      <SubType>UserControl</SubType>
     214    </Compile>
     215    <Compile Include="Query\Views\FilterView.Designer.cs">
     216      <DependentUpon>FilterView.cs</DependentUpon>
     217    </Compile>
     218    <Compile Include="Query\Views\NameEqualityComparisonBoolFilterView.cs">
     219      <SubType>UserControl</SubType>
     220    </Compile>
     221    <Compile Include="Query\Views\NameEqualityComparisonBoolFilterView.Designer.cs">
     222      <DependentUpon>NameEqualityComparisonBoolFilterView.cs</DependentUpon>
     223    </Compile>
     224    <Compile Include="Query\Views\NameOrdinalComparisonDoubleFilterView.cs">
     225      <SubType>UserControl</SubType>
     226    </Compile>
     227    <Compile Include="Query\Views\NameOrdinalComparisonDoubleFilterView.Designer.cs">
     228      <DependentUpon>NameOrdinalComparisonDoubleFilterView.cs</DependentUpon>
     229    </Compile>
     230    <Compile Include="Query\Views\NameOrdinalComparisonLongFilterView.cs">
     231      <SubType>UserControl</SubType>
     232    </Compile>
     233    <Compile Include="Query\Views\NameOrdinalComparisonLongFilterView.Designer.cs">
     234      <DependentUpon>NameOrdinalComparisonLongFilterView.cs</DependentUpon>
     235    </Compile>
     236    <Compile Include="Query\Views\NameStringComparisonAvailableValuesFilterView.cs">
     237      <SubType>UserControl</SubType>
     238    </Compile>
     239    <Compile Include="Query\Views\NameStringComparisonAvailableValuesFilterView.Designer.cs">
     240      <DependentUpon>NameStringComparisonAvailableValuesFilterView.cs</DependentUpon>
     241    </Compile>
     242    <Compile Include="Query\Views\NameStringComparisonFilterView.cs">
     243      <SubType>UserControl</SubType>
     244    </Compile>
     245    <Compile Include="Query\Views\NameStringComparisonFilterView.Designer.cs">
     246      <DependentUpon>NameStringComparisonFilterView.cs</DependentUpon>
     247    </Compile>
     248    <Compile Include="Query\Views\OrdinalComparisonFilterView.cs">
     249      <SubType>UserControl</SubType>
     250    </Compile>
     251    <Compile Include="Query\Views\OrdinalComparisonFilterView.Designer.cs">
     252      <DependentUpon>OrdinalComparisonFilterView.cs</DependentUpon>
     253    </Compile>
     254    <Compile Include="Query\Views\OrdinalComparisonLongFilterView.cs">
     255      <SubType>UserControl</SubType>
     256    </Compile>
     257    <Compile Include="Query\Views\OrdinalComparisonLongFilterView.Designer.cs">
     258      <DependentUpon>OrdinalComparisonLongFilterView.cs</DependentUpon>
     259    </Compile>
     260    <Compile Include="Query\Views\QueryView.cs">
     261      <SubType>UserControl</SubType>
     262    </Compile>
     263    <Compile Include="Query\Views\QueryView.Designer.cs">
     264      <DependentUpon>QueryView.cs</DependentUpon>
     265    </Compile>
     266    <Compile Include="Query\Views\SetComparisonStringFilterView.cs" />
     267    <Compile Include="Query\Views\SetComparisonStringFilterView.Designer.cs">
     268      <DependentUpon>SetComparisonStringFilterView.cs</DependentUpon>
     269    </Compile>
     270    <Compile Include="Query\Views\StringComparisonAvailableValuesFilterView.cs">
     271      <SubType>UserControl</SubType>
     272    </Compile>
     273    <Compile Include="Query\Views\StringComparisonAvailableValuesFilterView.Designer.cs">
     274      <DependentUpon>StringComparisonAvailableValuesFilterView.cs</DependentUpon>
     275    </Compile>
     276    <Compile Include="Query\Views\StringComparisonFilterView.cs">
     277      <SubType>UserControl</SubType>
     278    </Compile>
     279    <Compile Include="Query\Views\StringComparisonFilterView.Designer.cs">
     280      <DependentUpon>StringComparisonFilterView.cs</DependentUpon>
     281    </Compile>
    183282    <Compile Include="RunCreation\ServiceClient\RunCreationServiceClient.cs" />
    184283    <Compile Include="HeuristicLabClientsOKBPlugin.cs" />

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/QueryClient.cs

    r5604 r5606  
    3333using HeuristicLab.PluginInfrastructure;
    3434
    35 namespace HeuristicLab.Clients.OKB {
    36   [Item("OKBClient", "Client for accessing the OKB.")]
    37   public sealed class OKBClient : IContent {
    38     private static OKBClient instance;
    39     public static OKBClient Instance {
     35namespace HeuristicLab.Clients.OKB.Query {
     36  [Item("QueryClient", "Client for accessing the OKB.")]
     37  public sealed class QueryClient : IContent {
     38    private static QueryClient instance;
     39    public static QueryClient Instance {
    4040      get {
    41         if (instance == null) instance = new OKBClient();
     41        if (instance == null) instance = new QueryClient();
    4242        return instance;
    4343      }
    … …  
    7575    #endregion
    7676
    77     private OKBClient() {
     77    private QueryClient() {
    7878      platforms = new ItemCollection<Platform>();
    7979      platforms.ItemsRemoved += new CollectionItemsChangedEventHandler<Platform>(platforms_ItemsRemoved);

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/QueryMenuItem.cs

    r5604 r5606  
    2323using HeuristicLab.Optimizer;
    2424
    25 namespace HeuristicLab.Clients.OKB {
     25namespace HeuristicLab.Clients.OKB.Query {
    2626  internal class QueryMenuItem : HeuristicLab.MainForm.WindowsForms.MenuItem, IOptimizerUserInterfaceItemProvider {
    2727    public override string Name {

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/CombinedFilter.cs

    r5605 r5606  
    2222using System.Linq;
    2323
    24 namespace HeuristicLab.Clients.OKB {
     24namespace HeuristicLab.Clients.OKB.Query {
    2525  public partial class CombinedFilter {
    2626    public override Filter Clone() {

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/Filter.cs

    r5605 r5606  
    2323using HeuristicLab.Common;
    2424
    25 namespace HeuristicLab.Clients.OKB {
     25namespace HeuristicLab.Clients.OKB.Query {
    2626  public partial class Filter : IContent {
    2727    public virtual Filter Clone() {

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/NameEqualityComparisonBoolFilter.cs

    r5605 r5606  
    2020#endregion
    2121
    22 using System;
    23 using HeuristicLab.Common;
    24 
    25 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2623  public partial class NameEqualityComparisonBoolFilter {
    2724    public override Filter Clone() {

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/NameEqualityComparisonByteArrayFilter.cs

    r5605 r5606  
    2020#endregion
    2121
    22 
    23 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2423  public partial class NameEqualityComparisonByteArrayFilter {
    2524    public override Filter Clone() {

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/NameOrdinalComparisonDoubleFilter.cs

    r5605 r5606  
    2020#endregion
    2121
    22 
    23 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2423  public partial class NameOrdinalComparisonDoubleFilter {
    2524    public override Filter Clone() {

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/NameOrdinalComparisonLongFilter.cs

    r5605 r5606  
    2020#endregion
    2121
    22 
    23 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2423  public partial class NameOrdinalComparisonLongFilter {
    2524    public override Filter Clone() {

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/NameStringComparisonAvailableValuesFilter.cs

    r5605 r5606  
    2020#endregion
    2121
    22 
    2322using System.Collections.Generic;
    24 namespace HeuristicLab.Clients.OKB {
    25   public partial class NameSetComparisonStringAvailableValuesFilter {
     23namespace HeuristicLab.Clients.OKB.Query {
     24  public partial class NameStringComparisonAvailableValuesFilter {
    2625    public override Filter Clone() {
    27       return new NameSetComparisonStringAvailableValuesFilter() { FilterTypeName = FilterTypeName, Label = Label, Name = Name, Comparison = Comparison, Value = Value, AvailableValues = new List<string>(AvailableValues) };
     26      return new NameStringComparisonAvailableValuesFilter() { FilterTypeName = FilterTypeName, Label = Label, Name = Name, Comparison = Comparison, Value = Value, AvailableValues = new List<string>(AvailableValues) };
    2827    }
    2928  }

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/NameStringComparisonFilter.cs

    r5605 r5606  
    2020#endregion
    2121
    22 
    23 namespace HeuristicLab.Clients.OKB {
    24   public partial class NameSetComparisonStringFilter {
     22namespace HeuristicLab.Clients.OKB.Query {
     23  public partial class NameStringComparisonFilter {
    2524    public override Filter Clone() {
    26       return new NameSetComparisonStringFilter() { FilterTypeName = FilterTypeName, Label = Label, Name = Name, Comparison = Comparison, Value = Value };
     25      return new NameStringComparisonFilter() { FilterTypeName = FilterTypeName, Label = Label, Name = Name, Comparison = Comparison, Value = Value };
    2726    }
    2827  }

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/OrdinalComparisonDateTimeFilter.cs

    r5605 r5606  
    2020#endregion
    2121
    22 
    23 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2423  public partial class OrdinalComparisonDateTimeFilter {
    2524    public override Filter Clone() {

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/OrdinalComparisonLongFilter.cs

    r5605 r5606  
    2020#endregion
    2121
    22 
    23 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2423  public partial class OrdinalComparisonLongFilter {
    2524    public override Filter Clone() {

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/StringComparisonAvailableValuesFilter.cs

    r5605 r5606  
    2020#endregion
    2121
    22 
    2322using System.Collections.Generic;
    24 namespace HeuristicLab.Clients.OKB {
    25   public partial class SetComparisonStringAvailableValuesFilter {
     23namespace HeuristicLab.Clients.OKB.Query {
     24  public partial class StringComparisonAvailableValuesFilter {
    2625    public override Filter Clone() {
    27       return new SetComparisonStringAvailableValuesFilter() { FilterTypeName = FilterTypeName, Label = Label, Comparison = Comparison, Value = Value, AvailableValues = new List<string>(AvailableValues) };
     26      return new StringComparisonAvailableValuesFilter() { FilterTypeName = FilterTypeName, Label = Label, Comparison = Comparison, Value = Value, AvailableValues = new List<string>(AvailableValues) };
    2827    }
    2928  }

  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/StringComparisonFilter.cs

    r5605 r5606  
    2020#endregion
    2121
    22 
    23 namespace HeuristicLab.Clients.OKB {
    24   public partial class SetComparisonStringFilter {
     22namespace HeuristicLab.Clients.OKB.Query {
     23  public partial class StringComparisonFilter {
    2524    public override Filter Clone() {
    26       return new SetComparisonStringFilter() { FilterTypeName = FilterTypeName, Label = Label, Comparison = Comparison, Value = Value };
     25      return new StringComparisonFilter() { FilterTypeName = FilterTypeName, Label = Label, Comparison = Comparison, Value = Value };
    2726    }
    2827  }

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2323  partial class CombinedFilterView {
    2424    /// <summary>

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

    r5604 r5606  
    2626using HeuristicLab.MainForm.WindowsForms;
    2727
    28 namespace HeuristicLab.Clients.OKB {
     28namespace HeuristicLab.Clients.OKB.Query {
    2929  [View("CombinedFilter View")]
    3030  [Content(typeof(CombinedFilter), true)]
    … …  
    4141    protected override void OnInitialized(System.EventArgs e) {
    4242      base.OnInitialized(e);
    43       IEnumerable<Filter> availableFilters = OKBClient.Instance.GetFilters();
     43      IEnumerable<Filter> availableFilters = QueryClient.Instance.GetFilters();
    4444      filtersComboBox.DataSource = availableFilters;
    4545      filtersComboBox.DisplayMember = "Label";

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2323  partial class EqualityComparisonFilterView {
    2424    /// <summary>

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

    r5604 r5606  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Clients.OKB {
     26namespace HeuristicLab.Clients.OKB.Query {
    2727  [View("EqualityComparisonFilter View")]
    2828  public partial class EqualityComparisonFilterView : FilterView {

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2323  partial class FilterView {
    2424    /// <summary>

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

    r5604 r5606  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Clients.OKB {
     26namespace HeuristicLab.Clients.OKB.Query {
    2727  [View("Filter View")]
    2828  [Content(typeof(Filter), true)]

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2323  partial class NameEqualityComparisonBoolFilterView {
    2424    /// <summary>

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

    r5604 r5606  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Clients.OKB {
     26namespace HeuristicLab.Clients.OKB.Query {
    2727  [View("NameEqualityComparisonBoolFilter View")]
    2828  [Content(typeof(NameEqualityComparisonBoolFilter), true)]

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2323  partial class NameOrdinalComparisonDoubleFilterView {
    2424    /// <summary>

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

    r5604 r5606  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Clients.OKB {
     26namespace HeuristicLab.Clients.OKB.Query {
    2727  [View("NameOrdinalComparisonDoubleFilter View")]
    2828  [Content(typeof(NameOrdinalComparisonDoubleFilter), true)]

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2323  partial class NameOrdinalComparisonLongFilterView {
    2424    /// <summary>

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

    r5604 r5606  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Clients.OKB {
     26namespace HeuristicLab.Clients.OKB.Query {
    2727  [View("NameOrdinalComparisonLongFilter View")]
    2828  [Content(typeof(NameOrdinalComparisonLongFilter), true)]

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
    23   partial class NameSetComparisonStringAvailableValuesFilterView {
     22namespace HeuristicLab.Clients.OKB.Query {
     23  partial class NameStringComparisonAvailableValuesFilterView {
    2424    /// <summary>
    2525    /// Required designer variable.

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

    r5604 r5606  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Clients.OKB {
    27   [View("NameSetComparisonStringAvailableValuesFilter View")]
    28   [Content(typeof(NameSetComparisonStringAvailableValuesFilter), true)]
    29   public partial class NameSetComparisonStringAvailableValuesFilterView : SetComparisonFilterView {
    30     public new NameSetComparisonStringAvailableValuesFilter Content {
    31       get { return (NameSetComparisonStringAvailableValuesFilter)base.Content; }
     26namespace HeuristicLab.Clients.OKB.Query {
     27  [View("NameStringComparisonAvailableValuesFilter View")]
     28  [Content(typeof(NameStringComparisonAvailableValuesFilter), true)]
     29  public partial class NameStringComparisonAvailableValuesFilterView : StringComparisonFilterView {
     30    public new NameStringComparisonAvailableValuesFilter Content {
     31      get { return (NameStringComparisonAvailableValuesFilter)base.Content; }
    3232      set { base.Content = value; }
    3333    }
    3434
    35     public NameSetComparisonStringAvailableValuesFilterView() {
     35    public NameStringComparisonAvailableValuesFilterView() {
    3636      InitializeComponent();
    3737    }

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
    23   partial class NameSetComparisonStringFilterView {
     22namespace HeuristicLab.Clients.OKB.Query {
     23  partial class NameStringComparisonFilterView {
    2424    /// <summary>
    2525    /// Required designer variable.

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

    r5604 r5606  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Clients.OKB {
    27   [View("NameSetComparisonStringFilter View")]
    28   [Content(typeof(NameSetComparisonStringFilter), true)]
    29   public partial class NameSetComparisonStringFilterView : SetComparisonFilterView {
    30     public new NameSetComparisonStringFilter Content {
    31       get { return (NameSetComparisonStringFilter)base.Content; }
     26namespace HeuristicLab.Clients.OKB.Query {
     27  [View("NameStringComparisonFilter View")]
     28  [Content(typeof(NameStringComparisonFilter), true)]
     29  public partial class NameStringComparisonFilterView : StringComparisonFilterView {
     30    public new NameStringComparisonFilter Content {
     31      get { return (NameStringComparisonFilter)base.Content; }
    3232      set { base.Content = value; }
    3333    }
    3434
    35     public NameSetComparisonStringFilterView() {
     35    public NameStringComparisonFilterView() {
    3636      InitializeComponent();
    3737    }

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2323  partial class OrdinalComparisonFilterView {
    2424    /// <summary>

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

    r5604 r5606  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Clients.OKB {
     26namespace HeuristicLab.Clients.OKB.Query {
    2727  [View("OrdinalComparisonFilter View")]
    2828  [Content(typeof(OrdinalComparisonFilter), true)]

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2323  partial class OrdinalComparisonLongFilterView {
    2424    /// <summary>

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

    r5604 r5606  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Clients.OKB {
     26namespace HeuristicLab.Clients.OKB.Query {
    2727  [View("OrdinalComparisonLongFilter View")]
    2828  [Content(typeof(OrdinalComparisonLongFilter), true)]

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2323  partial class QueryView {
    2424    /// <summary>

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

    r5604 r5606  
    2222using System;
    2323using System.IO;
    24 using System.Linq;
    2524using System.Threading;
    2625using System.Threading.Tasks;
    2726using System.Windows.Forms;
    2827using HeuristicLab.Core;
    29 using HeuristicLab.Data;
    3028using HeuristicLab.MainForm;
    3129using HeuristicLab.MainForm.WindowsForms;
    … …  
    3331using HeuristicLab.Persistence.Default.Xml;
    3432
    35 namespace HeuristicLab.Clients.OKB {
     33namespace HeuristicLab.Clients.OKB.Query {
    3634  [View("OKB Query")]
    3735  [Content(typeof(OKBClient), false)]

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
     22namespace HeuristicLab.Clients.OKB.Query {
    2323  partial class SetComparisonStringFilterView {
    2424    /// <summary>

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

    r5604 r5606  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Clients.OKB {
     26namespace HeuristicLab.Clients.OKB.Query {
    2727  [View("SetComparisonStringFilter View")]
    2828  [Content(typeof(SetComparisonStringFilter), true)]

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
    23   partial class SetComparisonStringAvailableValuesFilterView {
     22namespace HeuristicLab.Clients.OKB.Query {
     23  partial class StringComparisonAvailableValuesFilterView {
    2424    /// <summary>
    2525    /// Required designer variable.

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

    r5604 r5606  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Clients.OKB {
    27   [View("SetComparisonStringAvailableValuesFilter View")]
    28   [Content(typeof(SetComparisonStringAvailableValuesFilter), true)]
    29   public partial class SetComparisonStringAvailableValuesFilterView : SetComparisonFilterView {
    30     public new SetComparisonStringAvailableValuesFilter Content {
    31       get { return (SetComparisonStringAvailableValuesFilter)base.Content; }
     26namespace HeuristicLab.Clients.OKB.Query {
     27  [View("StringComparisonAvailableValuesFilter View")]
     28  [Content(typeof(StringComparisonAvailableValuesFilter), true)]
     29  public partial class StringComparisonAvailableValuesFilterView : StringComparisonFilterView {
     30    public new StringComparisonAvailableValuesFilter Content {
     31      get { return (StringComparisonAvailableValuesFilter)base.Content; }
    3232      set { base.Content = value; }
    3333    }
    3434
    35     public SetComparisonStringAvailableValuesFilterView() {
     35    public StringComparisonAvailableValuesFilterView() {
    3636      InitializeComponent();
    3737    }

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

    r5604 r5606  
    2020#endregion
    2121
    22 namespace HeuristicLab.Clients.OKB {
    23   partial class SetComparisonFilterView {
     22namespace HeuristicLab.Clients.OKB.Query {
     23  partial class StringComparisonFilterView {
    2424    /// <summary>
    2525    /// Required designer variable.
    … …  
    7575            "<>",
    7676            "contains",
    77             "not contains"});
     77            "not contains",
     78            "like",
     79            "not like"});
    7880      this.comparisonComboBox.Location = new System.Drawing.Point(3, 2);
    7981      this.comparisonComboBox.Name = "comparisonComboBox";

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

    r5604 r5606  
    2424using HeuristicLab.MainForm.WindowsForms;
    2525
    26 namespace HeuristicLab.Clients.OKB {
    27   [View("SetComparisonFilter View")]
    28   [Content(typeof(SetComparisonFilter), true)]
    29   public partial class SetComparisonFilterView : FilterView {
    30     public new SetComparisonFilter Content {
    31       get { return (SetComparisonFilter)base.Content; }
     26namespace HeuristicLab.Clients.OKB.Query {
     27  [View("StringComparisonFilter View")]
     28  [Content(typeof(StringComparisonFilter), true)]
     29  public partial class StringComparisonFilterView : FilterView {
     30    public new StringComparisonFilter Content {
     31      get { return (StringComparisonFilter)base.Content; }
    3232      set { base.Content = value; }
    3333    }
    3434
    35     public SetComparisonFilterView() {
     35    public StringComparisonFilterView() {
    3636      InitializeComponent();
    3737    }
    … …  
    4141      comparisonComboBox.SelectedIndex = -1;
    4242      if (Content != null) {
    43         if (Content.Comparison == SetComparison.Equal)
     43        if (Content.Comparison == StringComparison.Equal)
    4444          comparisonComboBox.SelectedItem = "=";
    45         else if (Content.Comparison == SetComparison.NotEqual)
     45        else if (Content.Comparison == StringComparison.NotEqual)
    4646          comparisonComboBox.SelectedItem = "<>";
    47         else if (Content.Comparison == SetComparison.Contains)
     47        else if (Content.Comparison == StringComparison.Contains)
    4848          comparisonComboBox.SelectedItem = "contains";
    49         else if (Content.Comparison == SetComparison.NotContains)
     49        else if (Content.Comparison == StringComparison.NotContains)
    5050          comparisonComboBox.SelectedItem = "not contains";
     51        else if (Content.Comparison == StringComparison.Like)
     52          comparisonComboBox.SelectedItem = "like";
     53        else if (Content.Comparison == StringComparison.NotLike)
     54          comparisonComboBox.SelectedItem = "not like";
    5155      }
    5256    }
    … …  
    6064      if (Content != null) {
    6165        if (comparisonComboBox.SelectedItem == "=")
    62           Content.Comparison = SetComparison.Equal;
     66          Content.Comparison = StringComparison.Equal;
    6367        else if (comparisonComboBox.SelectedItem == "<>")
    64           Content.Comparison = SetComparison.NotEqual;
     68          Content.Comparison = StringComparison.NotEqual;
    6569        else if (comparisonComboBox.SelectedItem == "contains")
    66           Content.Comparison = SetComparison.Contains;
     70          Content.Comparison = StringComparison.Contains;
    6771        else if (comparisonComboBox.SelectedItem == "not contains")
    68           Content.Comparison = SetComparison.NotContains;
     72          Content.Comparison = StringComparison.NotContains;
     73        else if (comparisonComboBox.SelectedItem == "like")
     74          Content.Comparison = StringComparison.Like;
     75        else if (comparisonComboBox.SelectedItem == "not like")
     76          Content.Comparison = StringComparison.NotLike;
    6977      }
    7078    }
Note: See TracChangeset for help on using the changeset viewer.