Changeset 11203 for branches/HiveStatistics/sources/HeuristicLab.MainForm

Timestamp:

07/18/14 12:35:00 (10 years ago)

Author:

ascheibe

Message:

reverted last commit

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (2 props)
• HeuristicLab.MainForm/3.3/ActionUserInterfaceItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/ContentAttribute.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IActionUserInterfaceItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IConfigureableView.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IContentView.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IMainForm.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IMenuItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IMenuSeparatorItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IPositionableUserInterfaceItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs (modified) (4 diffs)
• HeuristicLab.MainForm/3.3/Interfaces/IToolBarItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IToolBarSeparatorItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IUserInterfaceItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Interfaces/IView.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/MainFormManager.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/MenuSeparatorItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.MainForm/3.3/PositionableUserInterfaceItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/Progress.cs (modified) (9 diffs)
• HeuristicLab.MainForm/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
• HeuristicLab.MainForm/3.3/ToolBarSeparatorItem.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/TypeExtension.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/ViewAttribute.cs (modified) (4 diffs)
• HeuristicLab.MainForm/3.3/ViewEventArgs.cs (modified) (1 diff)
• HeuristicLab.MainForm/3.3/ViewShownEventArgs.cs (modified) (1 diff)

branches/HiveStatistics/sources

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
-Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
-HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -19 +17 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
-_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
-Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
-HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -19 +17 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
-_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/ActionUserInterfaceItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/ContentAttribute.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Interfaces/IActionUserInterfaceItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Interfaces/IConfigureableView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Interfaces/IContentView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Interfaces/IMainForm.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Interfaces/IMenuItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Interfaces/IMenuSeparatorItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Interfaces/IPositionableUserInterfaceItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Interfaces/IProgress.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -28 +28 @@
   public interface IProgress : IContent {
     /// <summary>
-    /// Gets or sets the currently associated status text with the progress.
+    /// Gets the currently associated status text with the progress.
     /// </summary>
-    string Status { get; set; }
+    string Status { get; }
     /// <summary>
-    /// Gets or sets the currently associated progress value in the range (0;1].
+    /// Gets the currently associated progress value in the range (0;1].
     ///  Values outside this range are permitted and need to be handled in some feasible manner.
     /// </summary>
-    double ProgressValue { get; set; }
+    double ProgressValue { get; }
     /// <summary>
-    /// Gets or sets the current state of the progress. Every progress starts in state
+    /// Gets the current state of the progress. Every progress starts in state
     /// Started and then becomes either Canceled or Finished.
     /// If it is reused it may be Started again.
@@ -54 +54 @@
     /// </summary>
     /// <exception cref="NotSupportedException">Thrown when cancellation is not supported.</exception>
-    void Cancel();
-    /// <summary>
-    /// Sets the ProgressValue to 1 and the ProgressState to Finished.
-    /// </summary>
-    void Finish();
-
-    /// <summary>
-    /// Starts or restarts a Progress. 
-    /// </summary>
-    void Start();
-
-    void Start(string status);
+    /// <param name="timeoutMs">The operation is given a certain timeout to cancel. If the operation doesn't cancel in this time it will be forcibly closed.</param>
+    void Cancel(int timeoutMs);
 
     /// <summary>
@@ -84 +74 @@
     event EventHandler CanBeCanceledChanged;
     /// <summary>
-    /// A cancelation is requested.
+    /// A cancelation is requested with a certain timeout (in ms) in which it should occur gracefully. If the timeout is surpassed, it should be forcibly canceled.
     /// </summary>
-    event EventHandler CancelRequested;
+    event EventHandler<EventArgs<int>> CancelRequested;
   }
 }

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Interfaces/IToolBarItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Interfaces/IToolBarSeparatorItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Interfaces/IUserInterfaceItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Interfaces/IView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/MainFormManager.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/MenuSeparatorItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26 +26 @@
 
 namespace HeuristicLab.MainForm {
-  [Plugin("HeuristicLab.MainForm", "3.3.10.$WCREV$")]
+  [Plugin("HeuristicLab.MainForm", "3.3.7.$WCREV$")]
   [PluginFile("HeuristicLab.MainForm-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/PositionableUserInterfaceItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Progress.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.MainForm {
@@ -49 +50 @@
     public ProgressState ProgressState {
       get { return progressState; }
-      private set {
+      set {
         if (progressState != value) {
           progressState = value;
@@ -69 +70 @@
 
     public Progress() {
-      progressState = ProgressState.Finished;
-      canBeCanceled = false;
+      progressState = ProgressState.Started;
     }
     public Progress(string status)
@@ -76 +76 @@
       this.status = status;
     }
-    public Progress(string status, ProgressState state)
-      : this() {
-      this.status = status;
-      this.progressState = state;
+    public Progress(string status, double progressValue)
+      : this(status) {
+      this.progressValue = progressValue;
     }
 
-    public void Cancel() {
+    public void Cancel(int timeoutMs) {
       if (canBeCanceled)
-        OnCancelRequested();
+        OnCancelRequested(timeoutMs);
     }
 
+    /// <summary>
+    /// Sets the ProgressValue to 1 and the ProgressState to Finished.
+    /// </summary>
     public void Finish() {
       if (ProgressValue != 1.0) ProgressValue = 1.0;
       ProgressState = ProgressState.Finished;
-    }
-
-    public void Start() {
-      ProgressValue = 0.0;
-      ProgressState = ProgressState.Started;
-    }
-
-    public void Start(string status) {
-      Start();
-      Status = status;
     }
 
@@ -106 +98 @@
     private void OnStatusChanged() {
       var handler = StatusChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
+      try {
+        if (handler != null) handler(this, EventArgs.Empty);
+      } catch { }
     }
 
@@ -112 +106 @@
     private void OnProgressChanged() {
       var handler = ProgressValueChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
+      try {
+        if (handler != null) handler(this, EventArgs.Empty);
+      } catch { }
     }
 
@@ -118 +114 @@
     private void OnProgressStateChanged() {
       var handler = ProgressStateChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
+      try {
+        if (handler != null) handler(this, EventArgs.Empty);
+      } catch { }
     }
 
@@ -124 +122 @@
     private void OnCanBeCanceledChanged() {
       var handler = CanBeCanceledChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
+      try {
+        if (handler != null) handler(this, EventArgs.Empty);
+      } catch { }
     }
 
-    public event EventHandler CancelRequested;
-    private void OnCancelRequested() {
+    public event EventHandler<EventArgs<int>> CancelRequested;
+    private void OnCancelRequested(int timeoutMs) {
       var handler = CancelRequested;
-      if (handler != null) throw new NotSupportedException("Cancel request was ignored.");
-      else handler(this, EventArgs.Empty);
+      try {
+        if (handler == null) throw new NotSupportedException("Cancel request was ignored.");
+        else handler(this, new EventArgs<int>(timeoutMs));
+      } catch { }
     }
     #endregion

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -32 +32 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.7.$WCREV$")]

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/ToolBarSeparatorItem.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/TypeExtension.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/ViewAttribute.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -28 +28 @@
     public ViewAttribute(string name) {
       this.name = name;
-      this.helpResourcePath = string.Empty;
-    }
-
-    public ViewAttribute(string name, string helpResourcePath) {
-      this.name = name;
-      this.helpResourcePath = helpResourcePath;
     }
 
@@ -40 +34 @@
       get { return this.name; }
       set { this.name = value; }
-    }
-
-    private string helpResourcePath;
-    public string HelpResourcePath {
-      get { return this.helpResourcePath; }
-      set { this.helpResourcePath = value; }
     }
 
@@ -59 +47 @@
       return viewType.Name;
     }
-
-    public static string GetHelpResourcePath(MemberInfo viewType) {
-      ViewAttribute[] attributes = (ViewAttribute[])viewType.GetCustomAttributes(typeof(ViewAttribute), false);
-      if (attributes.Length == 1)
-        return attributes[0].helpResourcePath;
-      return string.Empty;
-    }
-
-    public static bool HasHelpResourcePath(MemberInfo viewType) {
-      ViewAttribute[] attributes = (ViewAttribute[])viewType.GetCustomAttributes(typeof(ViewAttribute), false);
-      if (attributes.Length == 1)
-        return attributes[0].helpResourcePath != string.Empty;
-      return false;
-    }
   }
 }

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/ViewEventArgs.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

branches/HiveStatistics/sources/HeuristicLab.MainForm/3.3/ViewShownEventArgs.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
-Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
-HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -19 +17 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
-_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll