Changeset 2669 for trunk/sources/HeuristicLab.Data.Views

Timestamp:

01/22/10 03:29:02 (14 years ago)

Author:

swagner

Message:

Continued work on adapting and refactoring HeuristicLab.Data according to the changes in HeuristicLab.Core (#95)

Location:

trunk/sources/HeuristicLab.Data.Views/3.3

Files:

• BoolDataView.cs (modified) (4 diffs)
• HeuristicLab.Data.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLabDataViewsPlugin.cs (modified) (1 diff)
• StringConvertibleArrayDataView.Designer.cs (added)
• StringConvertibleArrayDataView.cs (added)
• StringConvertibleDataView.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Data.Views/3.3/BoolDataView.cs

@@ -27 +27 @@
 using System.Text;
 using System.Windows.Forms;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -48 +49 @@
 
     protected override void DeregisterObjectEvents() {
-      BoolData.ValueChanged -= new EventHandler(BoolData_ValueChanged);
+      BoolData.Changed -= new ChangedEventHandler(BoolData_Changed);
       base.DeregisterObjectEvents();
     }
@@ -54 +55 @@
     protected override void RegisterObjectEvents() {
       base.RegisterObjectEvents();
-      BoolData.ValueChanged += new EventHandler(BoolData_ValueChanged);
+      BoolData.Changed += new ChangedEventHandler(BoolData_Changed);
     }
 
@@ -70 +71 @@
     }
 
-    private void BoolData_ValueChanged(object sender, EventArgs e) {
+    private void BoolData_Changed(object sender, ChangedEventArgs e) {
       if (InvokeRequired)
-        Invoke(new EventHandler(BoolData_ValueChanged), sender, e);
+        Invoke(new ChangedEventHandler(BoolData_Changed), sender, e);
       else
         valueCheckBox.Checked = BoolData.Value;

trunk/sources/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

@@ -57 +57 @@
       <DependentUpon>BoolDataView.cs</DependentUpon>
     </Compile>
+    <Compile Include="StringConvertibleArrayDataView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="StringConvertibleArrayDataView.Designer.cs">
+      <DependentUpon>StringConvertibleArrayDataView.cs</DependentUpon>
+    </Compile>
     <Compile Include="StringConvertibleDataView.cs">
       <SubType>UserControl</SubType>
@@ -71 +77 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Common\3.2\HeuristicLab.Common-3.2.csproj">
+      <Project>{1FC004FC-59AF-4249-B1B6-FF25873A20E4}</Project>
+      <Name>HeuristicLab.Common-3.2</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>

trunk/sources/HeuristicLab.Data.Views/3.3/HeuristicLabDataViewsPlugin.cs

@@ -31 +31 @@
   [Plugin("HeuristicLab.Data.Views-3.3", "")]
   [PluginFile("HeuristicLab.Data.Views-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Common-3.2")]
   [PluginDependency("HeuristicLab.Core-3.3")]
   [PluginDependency("HeuristicLab.Core.Views-3.3")]

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleDataView.cs

@@ -27 +27 @@
 using System.Text;
 using System.Windows.Forms;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -48 +49 @@
 
     protected override void DeregisterObjectEvents() {
-      StringConvertibleData.ValueChanged -= new EventHandler(StringConvertibleData_ValueChanged);
+      StringConvertibleData.Changed -= new ChangedEventHandler(StringConvertibleData_Changed);
       base.DeregisterObjectEvents();
     }
@@ -54 +55 @@
     protected override void RegisterObjectEvents() {
       base.RegisterObjectEvents();
-      StringConvertibleData.ValueChanged += new EventHandler(StringConvertibleData_ValueChanged);
+      StringConvertibleData.Changed += new ChangedEventHandler(StringConvertibleData_Changed);
     }
 
@@ -61 +62 @@
       if (StringConvertibleData == null) {
         Caption = "StringConvertibleData View";
-        valueTextBox.Text = "-";
+        valueTextBox.Text = string.Empty;
         valueTextBox.Enabled = false;
       } else {
@@ -70 +71 @@
     }
 
-    private void StringConvertibleData_ValueChanged(object sender, EventArgs e) {
+    private void StringConvertibleData_Changed(object sender, ChangedEventArgs e) {
       if (InvokeRequired)
-        Invoke(new EventHandler(StringConvertibleData_ValueChanged), sender, e);
+        Invoke(new ChangedEventHandler(StringConvertibleData_Changed), sender, e);
       else
         valueTextBox.Text = StringConvertibleData.GetValue();
@@ -78 +79 @@
 
     private void valueTextBox_Validating(object sender, CancelEventArgs e) {
-      e.Cancel = !StringConvertibleData.SetValue(valueTextBox.Text);
+      e.Cancel = e.Cancel || !StringConvertibleData.SetValue(valueTextBox.Text);
       if (e.Cancel) {
         MessageBox.Show(this, "\"" + valueTextBox.Text + "\" is not a valid value.", "Invalid Value", MessageBoxButtons.OK, MessageBoxIcon.Error);