Changeset 7582


Ignore:
Timestamp:
03/07/12 19:14:08 (8 years ago)
Author:
ascheibe
Message:

#1762 moved ProgressView from Hive to MainForms

Location:
trunk/sources
Files:
5 added
2 deleted
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

    r7409 r7582  
    2626using System.Threading.Tasks;
    2727using System.Windows.Forms;
    28 using HeuristicLab.Clients.Hive.Views;
    2928using HeuristicLab.Collections;
    3029using HeuristicLab.Common;
    3130using HeuristicLab.Core;
    3231using HeuristicLab.MainForm;
     32using HeuristicLab.MainForm.WindowsForms;
    3333using HeuristicLab.Optimization;
    3434using HeuristicLab.PluginInfrastructure;
  • trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HeuristicLab.Clients.Hive.Views-3.3.csproj

    r7410 r7582  
    165165    <None Include="Plugin.cs.frame" />
    166166    <Compile Include="Plugin.cs" />
    167     <Compile Include="Progress\ProgressView.cs">
    168       <SubType>UserControl</SubType>
    169     </Compile>
    170     <Compile Include="Progress\ProgressView.designer.cs">
    171       <DependentUpon>ProgressView.cs</DependentUpon>
    172     </Compile>
    173167    <Compile Include="Properties\AssemblyInfo.cs" />
    174168    <None Include="Properties\AssemblyInfo.cs.frame" />
  • trunk/sources/HeuristicLab.Clients.Hive.Views/3.3/HiveTasks/OptimizerHiveTaskView.cs

    r7259 r7582  
    2121
    2222using System;
     23using System.Threading.Tasks;
    2324using System.Windows.Forms;
    2425using HeuristicLab.MainForm;
    25 using System.Threading.Tasks;
     26using HeuristicLab.MainForm.WindowsForms;
    2627using HeuristicLab.PluginInfrastructure;
    2728
     
    7576        FinishProgressView();
    7677        ErrorHandling.ShowErrorDialog(this, "An error occured while resuming the task.", t.Exception);
    77       }, TaskContinuationOptions.OnlyOnFaulted); 
     78      }, TaskContinuationOptions.OnlyOnFaulted);
    7879    }
    7980
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

    r7249 r7582  
    155155    <Compile Include="Util\PersistenceUtil.cs" />
    156156    <Compile Include="Util\PluginUtil.cs" />
    157     <Compile Include="Progress\IProgress.cs" />
    158     <Compile Include="Progress\IProgressReporter.cs" />
    159     <Compile Include="Progress\Progress.cs" />
    160157    <Compile Include="Properties\AssemblyInfo.cs" />
    161158    <None Include="Properties\AssemblyInfo.cs.frame" />
     
    224221      <Private>False</Private>
    225222    </ProjectReference>
     223    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
     224      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
     225      <Name>HeuristicLab.MainForm-3.3</Name>
     226      <Private>False</Private>
     227    </ProjectReference>
    226228    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    227229      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

    r7259 r7582  
    3030using HeuristicLab.Common;
    3131using HeuristicLab.Core;
     32using HeuristicLab.MainForm;
    3233using HeuristicLab.PluginInfrastructure;
    3334using TS = System.Threading.Tasks;
     
    113114        jobs = null;
    114115        throw;
    115       } finally {
     116      }
     117      finally {
    116118        OnRefreshed();
    117119      }
     
    312314        }
    313315        refreshableJob.Job.Modified = false;
    314       } finally {
     316      }
     317      finally {
    315318        refreshableJob.IsProgressing = false;
    316319      }
     
    414417          if (!ae.InnerExceptions.All(e => e is TaskCanceledException)) throw ae; // for some reason the WaitAll throws a AggregateException containg a TaskCanceledException. i don't know where it comes from, however the tasks all finish properly, so for now just ignore it
    415418        }
    416       } finally {
     419      }
     420      finally {
    417421        if (!semaphoreReleased) taskUploadSemaphore.Release();
    418422      }
     
    465469        }
    466470        refreshableJob.OnLoaded();
    467       } finally {
     471      }
     472      finally {
    468473        refreshableJob.IsProgressing = false;
    469474      }
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame

    r7259 r7582  
    3535  [PluginDependency("HeuristicLab.Core", "3.3")] 
    3636  [PluginDependency("HeuristicLab.Hive", "3.3")] 
     37  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3738  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3839  [PluginDependency("HeuristicLab.Persistence", "3.3")]
  • trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

    r7409 r7582  
    2828using HeuristicLab.Common;
    2929using HeuristicLab.Core;
     30using HeuristicLab.MainForm;
    3031
    3132namespace HeuristicLab.Clients.Hive {
  • trunk/sources/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj

    r7021 r7582  
    186186    </Compile>
    187187    <Compile Include="ToolBarItem.cs" />
     188    <Compile Include="Views\ProgressView.cs">
     189      <SubType>UserControl</SubType>
     190    </Compile>
     191    <Compile Include="Views\ProgressView.designer.cs">
     192      <DependentUpon>ProgressView.cs</DependentUpon>
     193    </Compile>
    188194    <Compile Include="Views\View.cs">
    189195      <SubType>UserControl</SubType>
  • trunk/sources/HeuristicLab.MainForm/3.3/HeuristicLab.MainForm-3.3.csproj

    r6866 r7582  
    116116    <None Include="Plugin.cs.frame" />
    117117    <Compile Include="Interfaces\IConfigureableView.cs" />
     118    <Compile Include="Interfaces\IProgress.cs" />
     119    <Compile Include="Interfaces\IProgressReporter.cs" />
    118120    <Compile Include="Plugin.cs" />
     121    <Compile Include="Progress.cs" />
    119122    <Compile Include="ViewAttribute.cs" />
    120123    <Compile Include="Interfaces\IContentView.cs" />
Note: See TracChangeset for help on using the changeset viewer.