Changeset 7582 for trunk/sources/HeuristicLab.Clients.Hive/3.3

Timestamp:

03/07/12 19:14:08 (13 years ago)

Author:

ascheibe

Message:

#1762 moved ProgressView from Hive to MainForms

Location:

trunk/sources/HeuristicLab.Clients.Hive/3.3

Files:

• HeuristicLab.Clients.Hive-3.3.csproj (modified) (2 diffs)
• HiveClient.cs (modified) (5 diffs)
• Plugin.cs.frame (modified) (1 diff)
• Progress (deleted)
• RefreshableJob.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

@@ -155 +155 @@
     <Compile Include="Util\PersistenceUtil.cs" />
     <Compile Include="Util\PluginUtil.cs" />
-    <Compile Include="Progress\IProgress.cs" />
-    <Compile Include="Progress\IProgressReporter.cs" />
-    <Compile Include="Progress\Progress.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
@@ -224 +221 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
+      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
+      <Name>HeuristicLab.MainForm-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -30 +30 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.MainForm;
 using HeuristicLab.PluginInfrastructure;
 using TS = System.Threading.Tasks;
@@ -113 +114 @@
         jobs = null;
         throw;
-      } finally {
+      }
+      finally {
         OnRefreshed();
       }
@@ -312 +314 @@
         }
         refreshableJob.Job.Modified = false;
-      } finally {
+      }
+      finally {
         refreshableJob.IsProgressing = false;
       }
@@ -414 +417 @@
           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
         }
-      } finally {
+      }
+      finally {
         if (!semaphoreReleased) taskUploadSemaphore.Release();
       }
@@ -465 +469 @@
         }
         refreshableJob.OnLoaded();
-      } finally {
+      }
+      finally {
         refreshableJob.IsProgressing = false;
       }

trunk/sources/HeuristicLab.Clients.Hive/3.3/Plugin.cs.frame

@@ -35 +35 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]  
   [PluginDependency("HeuristicLab.Hive", "3.3")]  
+  [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]

trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -28 +28 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Clients.Hive {