Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8054


Ignore:
Timestamp:
06/19/12 13:42:55 (12 years ago)
Author:
ascheibe
Message:

#1174 separated views from OKB clients

Location:
branches/OKB (trunk integration)
Files:
76 added
7 deleted
3 edited

Legend:

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

    r7973 r8054  
    7575      <Private>False</Private>
    7676    </Reference>
    77     <Reference Include="HeuristicLab.MainForm-3.3">
    78       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
    79       <Private>False</Private>
    80     </Reference>
    81     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
    82       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    83       <Private>False</Private>
    84     </Reference>
    8577    <Reference Include="HeuristicLab.Operators-3.3">
    8678      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     
    9385    <Reference Include="HeuristicLab.Optimization.Views-3.3">
    9486      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
    95       <Private>False</Private>
    96     </Reference>
    97     <Reference Include="HeuristicLab.Optimizer-3.3">
    98       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimizer-3.3.dll</HintPath>
    9987      <Private>False</Private>
    10088    </Reference>
     
    124112  <ItemGroup>
    125113    <Compile Include="Administration\AdministrationClient.cs" />
    126     <Compile Include="Administration\AdministratorMenuItem.cs" />
    127114    <Compile Include="Administration\ServiceClient\AdministrationServiceClient.cs" />
    128115    <Compile Include="Administration\ServiceClient\Algorithm.cs" />
     
    136123    <Compile Include="Administration\ServiceClient\Problem.cs" />
    137124    <Compile Include="Administration\ServiceClient\ProblemClass.cs" />
    138     <Compile Include="Administration\Views\AdministratorView.cs">
    139       <SubType>UserControl</SubType>
    140     </Compile>
    141     <Compile Include="Administration\Views\AdministratorView.Designer.cs">
    142       <DependentUpon>AdministratorView.cs</DependentUpon>
    143     </Compile>
    144     <Compile Include="Administration\Views\AlgorithmClassCollectionView.cs">
    145       <SubType>UserControl</SubType>
    146     </Compile>
    147     <Compile Include="Administration\Views\AlgorithmClassCollectionView.Designer.cs">
    148       <DependentUpon>AlgorithmClassCollectionView.cs</DependentUpon>
    149     </Compile>
    150     <Compile Include="Administration\Views\AlgorithmCollectionView.cs">
    151       <SubType>UserControl</SubType>
    152     </Compile>
    153     <Compile Include="Administration\Views\AlgorithmCollectionView.Designer.cs">
    154       <DependentUpon>AlgorithmCollectionView.cs</DependentUpon>
    155     </Compile>
    156     <Compile Include="Administration\Views\AlgorithmView.cs">
    157       <SubType>UserControl</SubType>
    158     </Compile>
    159     <Compile Include="Administration\Views\AlgorithmView.Designer.cs">
    160       <DependentUpon>AlgorithmView.cs</DependentUpon>
    161     </Compile>
    162     <Compile Include="Administration\Views\OKBItemCollectionView.cs">
    163       <SubType>UserControl</SubType>
    164     </Compile>
    165     <Compile Include="Administration\Views\OKBItemCollectionView.Designer.cs">
    166       <DependentUpon>OKBItemCollectionView.cs</DependentUpon>
    167     </Compile>
    168     <Compile Include="Administration\Views\NamedOKBItemView.cs">
    169       <SubType>UserControl</SubType>
    170     </Compile>
    171     <Compile Include="Administration\Views\NamedOKBItemView.Designer.cs">
    172       <DependentUpon>NamedOKBItemView.cs</DependentUpon>
    173     </Compile>
    174     <Compile Include="Administration\Views\OKBItemView.cs">
    175       <SubType>UserControl</SubType>
    176     </Compile>
    177     <Compile Include="Administration\Views\OKBItemView.Designer.cs">
    178       <DependentUpon>OKBItemView.cs</DependentUpon>
    179     </Compile>
    180     <Compile Include="Administration\Views\PlatformCollectionView.cs">
    181       <SubType>UserControl</SubType>
    182     </Compile>
    183     <Compile Include="Administration\Views\PlatformCollectionView.Designer.cs">
    184       <DependentUpon>PlatformCollectionView.cs</DependentUpon>
    185     </Compile>
    186     <Compile Include="Administration\Views\ProblemClassCollectionView.cs">
    187       <SubType>UserControl</SubType>
    188     </Compile>
    189     <Compile Include="Administration\Views\ProblemClassCollectionView.Designer.cs">
    190       <DependentUpon>ProblemClassCollectionView.cs</DependentUpon>
    191     </Compile>
    192     <Compile Include="Administration\Views\ProblemCollectionView.cs">
    193       <SubType>UserControl</SubType>
    194     </Compile>
    195     <Compile Include="Administration\Views\ProblemCollectionView.Designer.cs">
    196       <DependentUpon>ProblemCollectionView.cs</DependentUpon>
    197     </Compile>
    198     <Compile Include="Administration\Views\ProblemView.cs">
    199       <SubType>UserControl</SubType>
    200     </Compile>
    201     <Compile Include="Administration\Views\ProblemView.Designer.cs">
    202       <DependentUpon>ProblemView.cs</DependentUpon>
    203     </Compile>
    204125    <Compile Include="OKBRoles.cs" />
    205126    <Compile Include="Plugin.cs" />
    206127    <Compile Include="Query\QueryClient.cs" />
    207     <Compile Include="Query\QueryMenuItem.cs" />
    208128    <Compile Include="Query\ServiceClient\CombinedFilter.cs" />
    209129    <Compile Include="Query\ServiceClient\ValueName.cs" />
     
    231151    <Compile Include="Query\ServiceClient\StringComparisonAvailableValuesFilter.cs" />
    232152    <Compile Include="Query\ServiceClient\StringComparisonFilter.cs" />
    233     <Compile Include="Query\Views\CombinedFilterView.cs">
    234       <SubType>UserControl</SubType>
    235     </Compile>
    236     <Compile Include="Query\Views\CombinedFilterView.Designer.cs">
    237       <DependentUpon>CombinedFilterView.cs</DependentUpon>
    238     </Compile>
    239     <Compile Include="Query\Views\OrdinalComparisonTimeSpanFilterView.cs">
    240       <SubType>UserControl</SubType>
    241     </Compile>
    242     <Compile Include="Query\Views\OrdinalComparisonTimeSpanFilterView.Designer.cs">
    243       <DependentUpon>OrdinalComparisonTimeSpanFilterView.cs</DependentUpon>
    244     </Compile>
    245     <Compile Include="Query\Views\OrdinalComparisonPercentFilterView.cs">
    246       <SubType>UserControl</SubType>
    247     </Compile>
    248     <Compile Include="Query\Views\OrdinalComparisonPercentFilterView.Designer.cs">
    249       <DependentUpon>OrdinalComparisonPercentFilterView.cs</DependentUpon>
    250     </Compile>
    251     <Compile Include="Query\Views\OrdinalComparisonDateTimeFilterView.cs">
    252       <SubType>UserControl</SubType>
    253     </Compile>
    254     <Compile Include="Query\Views\OrdinalComparisonDateTimeFilterView.Designer.cs">
    255       <DependentUpon>OrdinalComparisonDateTimeFilterView.cs</DependentUpon>
    256     </Compile>
    257     <Compile Include="Query\Views\OrdinalComparisonFloatFilterView.cs">
    258       <SubType>UserControl</SubType>
    259     </Compile>
    260     <Compile Include="Query\Views\OrdinalComparisonFloatFilterView.Designer.cs">
    261       <DependentUpon>OrdinalComparisonFloatFilterView.cs</DependentUpon>
    262     </Compile>
    263     <Compile Include="Query\Views\OrdinalComparisonIntFilterView.cs">
    264       <SubType>UserControl</SubType>
    265     </Compile>
    266     <Compile Include="Query\Views\OrdinalComparisonIntFilterView.Designer.cs">
    267       <DependentUpon>OrdinalComparisonIntFilterView.cs</DependentUpon>
    268     </Compile>
    269     <Compile Include="Query\Views\EqualityComparisonBoolFilterView.cs">
    270       <SubType>UserControl</SubType>
    271     </Compile>
    272     <Compile Include="Query\Views\EqualityComparisonBoolFilterView.Designer.cs">
    273       <DependentUpon>EqualityComparisonBoolFilterView.cs</DependentUpon>
    274     </Compile>
    275     <Compile Include="Query\Views\EqualityComparisonFilterView.cs">
    276       <SubType>UserControl</SubType>
    277     </Compile>
    278     <Compile Include="Query\Views\EqualityComparisonFilterView.Designer.cs">
    279       <DependentUpon>EqualityComparisonFilterView.cs</DependentUpon>
    280     </Compile>
    281     <Compile Include="Query\Views\FilterView.cs">
    282       <SubType>UserControl</SubType>
    283     </Compile>
    284     <Compile Include="Query\Views\FilterView.Designer.cs">
    285       <DependentUpon>FilterView.cs</DependentUpon>
    286     </Compile>
    287     <Compile Include="Query\Views\OrdinalComparisonDoubleFilterView.cs">
    288       <SubType>UserControl</SubType>
    289     </Compile>
    290     <Compile Include="Query\Views\OrdinalComparisonDoubleFilterView.Designer.cs">
    291       <DependentUpon>OrdinalComparisonDoubleFilterView.cs</DependentUpon>
    292     </Compile>
    293     <Compile Include="Query\Views\OrdinalComparisonFilterView.cs">
    294       <SubType>UserControl</SubType>
    295     </Compile>
    296     <Compile Include="Query\Views\OrdinalComparisonFilterView.Designer.cs">
    297       <DependentUpon>OrdinalComparisonFilterView.cs</DependentUpon>
    298     </Compile>
    299     <Compile Include="Query\Views\OrdinalComparisonLongFilterView.cs">
    300       <SubType>UserControl</SubType>
    301     </Compile>
    302     <Compile Include="Query\Views\OrdinalComparisonLongFilterView.Designer.cs">
    303       <DependentUpon>OrdinalComparisonLongFilterView.cs</DependentUpon>
    304     </Compile>
    305     <Compile Include="Query\Views\QueryView.cs">
    306       <SubType>UserControl</SubType>
    307     </Compile>
    308     <Compile Include="Query\Views\QueryView.Designer.cs">
    309       <DependentUpon>QueryView.cs</DependentUpon>
    310     </Compile>
    311     <Compile Include="Query\Views\StringComparisonAvailableValuesFilterView.cs">
    312       <SubType>UserControl</SubType>
    313     </Compile>
    314     <Compile Include="Query\Views\StringComparisonAvailableValuesFilterView.Designer.cs">
    315       <DependentUpon>StringComparisonAvailableValuesFilterView.cs</DependentUpon>
    316     </Compile>
    317     <Compile Include="Query\Views\StringComparisonFilterView.cs">
    318       <SubType>UserControl</SubType>
    319     </Compile>
    320     <Compile Include="Query\Views\StringComparisonFilterView.Designer.cs">
    321       <DependentUpon>StringComparisonFilterView.cs</DependentUpon>
    322     </Compile>
    323153    <Compile Include="RunCreation\EmptyAlgorithm.cs" />
    324154    <Compile Include="RunCreation\EmptyEvaluator.cs" />
     
    336166    <Compile Include="RunCreation\OKBProblem.cs" />
    337167    <Compile Include="RunCreation\OKBRun.cs" />
    338     <Compile Include="RunCreation\CreateFromExperimentMenuItem.cs" />
    339168    <Compile Include="RunCreation\RunCreationClient.cs" />
    340169    <Compile Include="RunCreation\ServiceClient\Algorithm.cs" />
     
    343172    <Compile Include="Properties\AssemblyInfo.cs" />
    344173    <Compile Include="RunCreation\SingleObjectiveOKBProblem.cs" />
    345     <Compile Include="RunCreation\Views\OKBAlgorithmView.cs">
    346       <SubType>UserControl</SubType>
    347     </Compile>
    348     <Compile Include="RunCreation\Views\OKBAlgorithmView.Designer.cs">
    349       <DependentUpon>OKBAlgorithmView.cs</DependentUpon>
    350     </Compile>
    351     <Compile Include="RunCreation\Views\OKBExperimentUploadView.cs">
    352       <SubType>UserControl</SubType>
    353     </Compile>
    354     <Compile Include="RunCreation\Views\OKBExperimentUploadView.Designer.cs">
    355       <DependentUpon>OKBExperimentUploadView.cs</DependentUpon>
    356     </Compile>
    357     <Compile Include="RunCreation\Views\OKBProblemView.cs">
    358       <SubType>UserControl</SubType>
    359     </Compile>
    360     <Compile Include="RunCreation\Views\OKBProblemView.Designer.cs">
    361       <DependentUpon>OKBProblemView.cs</DependentUpon>
    362     </Compile>
    363     <Compile Include="RunCreation\Views\OKBRunView.cs">
    364       <SubType>UserControl</SubType>
    365     </Compile>
    366     <Compile Include="RunCreation\Views\OKBRunView.Designer.cs">
    367       <DependentUpon>OKBRunView.cs</DependentUpon>
    368     </Compile>
    369174    <None Include="app.config" />
    370175    <None Include="ascheibe app.config" />
  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Plugin.cs.frame

    r8045 r8054  
    3636  [PluginDependency("HeuristicLab.Core", "3.3")]
    3737  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
    38   [PluginDependency("HeuristicLab.Data", "3.3")]
    39   [PluginDependency("HeuristicLab.MainForm", "3.3")]
    40   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
     38  [PluginDependency("HeuristicLab.Data", "3.3")] 
    4139  [PluginDependency("HeuristicLab.Operators", "3.3")]
    4240  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    43   [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    44   [PluginDependency("HeuristicLab.Optimizer", "3.3")]
     41  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")] 
    4542  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    4643  [PluginDependency("HeuristicLab.Persistence", "3.3")]
  • branches/OKB (trunk integration)/HeuristicLab.OKB.sln

    r5502 r8054  
    88Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.OKB-3.3", "HeuristicLab.Services.OKB\3.3\HeuristicLab.Services.OKB-3.3.csproj", "{766DA4B7-2A0E-4CDE-8F90-93D8B1AD62CF}"
    99EndProject
    10 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.OKB.DataAccess-3.3.Tests", "HeuristicLab.Services.OKB.DataAccess\3.3\Tests\HeuristicLab.Services.OKB.DataAccess-3.3.Tests.csproj", "{89234006-FE1B-4A15-AFEC-91CB3526F0A5}"
     10Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.OKB-3.3", "HeuristicLab.Clients.OKB\3.3\HeuristicLab.Clients.OKB-3.3.csproj", "{73857A9C-9706-4B72-8D9C-210B5B6A5691}"
    1111EndProject
    12 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.OKB-3.3", "HeuristicLab.Clients.OKB\3.3\HeuristicLab.Clients.OKB-3.3.csproj", "{73857A9C-9706-4B72-8D9C-210B5B6A5691}"
     12Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.OKB.Views-3.3", "HeuristicLab.Clients.OKB.Views\3.3\HeuristicLab.Clients.OKB.Views-3.3.csproj", "{399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}"
    1313EndProject
    1414Global
     
    4646    {766DA4B7-2A0E-4CDE-8F90-93D8B1AD62CF}.Release|x86.ActiveCfg = Release|x86
    4747    {766DA4B7-2A0E-4CDE-8F90-93D8B1AD62CF}.Release|x86.Build.0 = Release|x86
    48     {89234006-FE1B-4A15-AFEC-91CB3526F0A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    49     {89234006-FE1B-4A15-AFEC-91CB3526F0A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
    50     {89234006-FE1B-4A15-AFEC-91CB3526F0A5}.Debug|x64.ActiveCfg = Debug|Any CPU
    51     {89234006-FE1B-4A15-AFEC-91CB3526F0A5}.Debug|x86.ActiveCfg = Debug|Any CPU
    52     {89234006-FE1B-4A15-AFEC-91CB3526F0A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
    53     {89234006-FE1B-4A15-AFEC-91CB3526F0A5}.Release|Any CPU.Build.0 = Release|Any CPU
    54     {89234006-FE1B-4A15-AFEC-91CB3526F0A5}.Release|x64.ActiveCfg = Release|Any CPU
    55     {89234006-FE1B-4A15-AFEC-91CB3526F0A5}.Release|x86.ActiveCfg = Release|Any CPU
    5648    {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    5749    {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Debug|Any CPU.Build.0 = Debug|Any CPU
     
    6254    {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Release|x64.ActiveCfg = Release|Any CPU
    6355    {73857A9C-9706-4B72-8D9C-210B5B6A5691}.Release|x86.ActiveCfg = Release|Any CPU
     56    {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     57    {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
     58    {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}.Debug|x64.ActiveCfg = Debug|Any CPU
     59    {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}.Debug|x86.ActiveCfg = Debug|Any CPU
     60    {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
     61    {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}.Release|Any CPU.Build.0 = Release|Any CPU
     62    {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}.Release|x64.ActiveCfg = Release|Any CPU
     63    {399EBB6E-37A1-4AE4-B8CD-0D461FF286A3}.Release|x86.ActiveCfg = Release|Any CPU
    6464  EndGlobalSection
    6565  GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset for help on using the changeset viewer.