Changeset 9961 for stable/HeuristicLab.Data.Views/3.3/Path Views

Timestamp:

09/13/13 13:49:03 (11 years ago)

Author:

mkommend

Message:

#2081: Merged path data types into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Data.Views/3.3 (modified) (1 prop)
• HeuristicLab.Data.Views/3.3/Path Views (copied) (copied from trunk/sources/HeuristicLab.Data.Views/3.3/Path Views)
• HeuristicLab.Data.Views/3.3/Path Views/DirectoryValueView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Data.Views/3.3/Path Views/DirectoryValueView.cs (modified) (4 diffs)
• HeuristicLab.Data.Views/3.3/Path Views/FileValueView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Data.Views/3.3/Path Views/FileValueView.cs (modified) (4 diffs)
• HeuristicLab.Data.Views/3.3/Path Views/TextFileView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Data.Views/3.3/Path Views/TextFileView.Designer.cs)
• HeuristicLab.Data.Views/3.3/Path Views/TextFileView.cs (modified) (11 diffs)

stable/HeuristicLab.Data.Views/3.3/Path Views/DirectoryValueView.Designer.cs

@@ -48 +48 @@
       this.openButton = new System.Windows.Forms.Button();
       this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
-      this.splitContainer.Panel1.SuspendLayout();
-      this.splitContainer.Panel2.SuspendLayout();
-      this.splitContainer.SuspendLayout();
+      this.stringConvertibleValueView = new HeuristicLab.Data.Views.StringConvertibleValueView();
       this.SuspendLayout();
-      // 
-      // valueTextBox
-      // 
-      this.errorProvider.SetIconAlignment(this.valueTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
-      this.errorProvider.SetIconPadding(this.valueTextBox, 2);
-      this.valueTextBox.Location = new System.Drawing.Point(17, 2);
-      this.valueTextBox.Size = new System.Drawing.Size(87, 20);
-      // 
-      // valueLabel
-      // 
-      this.valueLabel.Location = new System.Drawing.Point(3, 5);
-      this.valueLabel.Size = new System.Drawing.Size(52, 13);
-      this.valueLabel.Text = "Directory:";
-      // 
-      // splitContainer
-      // 
-      // 
-      // splitContainer.Panel2
-      // 
-      this.splitContainer.Panel2.Controls.Add(this.openButton);
-      this.splitContainer.Size = new System.Drawing.Size(194, 24);
-      this.splitContainer.SplitterDistance = 56;
       // 
       // openButton
@@ -81 +55 @@
       this.openButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.openButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
-      this.openButton.Location = new System.Drawing.Point(110, 0);
+      this.openButton.Location = new System.Drawing.Point(167, 0);
       this.openButton.Name = "openButton";
       this.openButton.Size = new System.Drawing.Size(24, 24);
@@ -88 +62 @@
       this.openButton.Click += new System.EventHandler(this.openButton_Click);
       // 
+      // stringConvertibleValueView
+      // 
+      this.stringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.stringConvertibleValueView.Caption = "StringConvertibleValue View";
+      this.stringConvertibleValueView.Content = null;
+      this.stringConvertibleValueView.LabelVisible = true;
+      this.stringConvertibleValueView.Location = new System.Drawing.Point(4, 2);
+      this.stringConvertibleValueView.Name = "stringConvertibleValueView";
+      this.stringConvertibleValueView.ReadOnly = false;
+      this.stringConvertibleValueView.Size = new System.Drawing.Size(157, 21);
+      this.stringConvertibleValueView.TabIndex = 4;
+      // 
       // DirectoryValueView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.stringConvertibleValueView);
+      this.Controls.Add(this.openButton);
       this.Name = "DirectoryValueView";
       this.Size = new System.Drawing.Size(194, 24);
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
-      this.splitContainer.Panel1.ResumeLayout(false);
-      this.splitContainer.Panel1.PerformLayout();
-      this.splitContainer.Panel2.ResumeLayout(false);
-      this.splitContainer.Panel2.PerformLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
-      this.splitContainer.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -109 +91 @@
     protected System.Windows.Forms.Button openButton;
     protected System.Windows.Forms.FolderBrowserDialog folderBrowserDialog;
+    private StringConvertibleValueView stringConvertibleValueView;
 
   }

stable/HeuristicLab.Data.Views/3.3/Path Views/DirectoryValueView.cs

@@ -22 +22 @@
 using System;
 using System.Windows.Forms;
+using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 
@@ -27 +28 @@
   [View("DirectoryValueView")]
   [Content(typeof(DirectoryValue), true)]
-  public partial class DirectoryValueView : StringConvertibleValueView {
+  public partial class DirectoryValueView : ItemView {
     public new DirectoryValue Content {
       get { return (DirectoryValue)base.Content; }
       set { base.Content = value; }
-    }
-
-    public override bool ReadOnly {
-      get {
-        if ((Content != null) && Content.ReadOnly) return true;
-        return base.ReadOnly;
-      }
-      set { base.ReadOnly = value; }
     }
 
@@ -47 +40 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      valueTextBox.Enabled = !Locked && !ReadOnly && Content != null;
-      valueTextBox.ReadOnly = Locked || ReadOnly || Content == null;
       openButton.Enabled = !Locked && !ReadOnly && Content != null;
     }
@@ -55 +46 @@
       base.OnContentChanged();
       if (Content == null) {
-        valueTextBox.Text = string.Empty;
+        stringConvertibleValueView.Content = null;
         return;
       }
 
-      valueTextBox.Text = Content.Value;
-      openButton.Enabled = !Content.ReadOnly;
+      stringConvertibleValueView.Content = Content.StringValue;
     }
 

stable/HeuristicLab.Data.Views/3.3/Path Views/FileValueView.Designer.cs

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FileValueView));
       this.openButton = new System.Windows.Forms.Button();
       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
-      this.splitContainer.Panel1.SuspendLayout();
-      this.splitContainer.Panel2.SuspendLayout();
-      this.splitContainer.SuspendLayout();
+      this.stringConvertibleValueView = new HeuristicLab.Data.Views.StringConvertibleValueView();
       this.SuspendLayout();
-      // 
-      // valueTextBox
-      // 
-      this.errorProvider.SetIconAlignment(this.valueTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
-      this.errorProvider.SetIconPadding(this.valueTextBox, 2);
-      this.valueTextBox.Location = new System.Drawing.Point(17, 2);
-      this.valueTextBox.Size = new System.Drawing.Size(116, 20);
-      // 
-      // valueLabel
-      // 
-      this.valueLabel.Location = new System.Drawing.Point(3, 5);
-      this.valueLabel.Size = new System.Drawing.Size(26, 13);
-      this.valueLabel.Text = "File:";
-      // 
-      // splitContainer
-      // 
-      // 
-      // splitContainer.Panel2
-      // 
-      this.splitContainer.Panel2.Controls.Add(this.openButton);
-      this.splitContainer.Size = new System.Drawing.Size(194, 24);
-      this.splitContainer.SplitterDistance = 27;
       // 
       // openButton
@@ -81 +54 @@
       this.openButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.openButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
-      this.openButton.Location = new System.Drawing.Point(139, 0);
+      this.openButton.Location = new System.Drawing.Point(167, 0);
       this.openButton.Name = "openButton";
       this.openButton.Size = new System.Drawing.Size(24, 24);
@@ -88 +61 @@
       this.openButton.Click += new System.EventHandler(this.openButton_Click);
       // 
+      // stringConvertibleValueView
+      // 
+      this.stringConvertibleValueView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.stringConvertibleValueView.Caption = "StringConvertibleValue View";
+      this.stringConvertibleValueView.Content = null;
+      this.stringConvertibleValueView.LabelVisible = true;
+      this.stringConvertibleValueView.Location = new System.Drawing.Point(4, 2);
+      this.stringConvertibleValueView.Name = "stringConvertibleValueView";
+      this.stringConvertibleValueView.ReadOnly = false;
+      this.stringConvertibleValueView.Size = new System.Drawing.Size(157, 21);
+      this.stringConvertibleValueView.TabIndex = 0;
+      // 
       // FileValueView
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
+      this.Controls.Add(this.stringConvertibleValueView);
+      this.Controls.Add(this.openButton);
       this.Name = "FileValueView";
       this.Size = new System.Drawing.Size(194, 24);
-      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
-      this.splitContainer.Panel1.ResumeLayout(false);
-      this.splitContainer.Panel1.PerformLayout();
-      this.splitContainer.Panel2.ResumeLayout(false);
-      this.splitContainer.Panel2.PerformLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
-      this.splitContainer.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -109 +89 @@
     protected System.Windows.Forms.Button openButton;
     protected System.Windows.Forms.OpenFileDialog openFileDialog;
+    protected StringConvertibleValueView stringConvertibleValueView;
   }
 }

stable/HeuristicLab.Data.Views/3.3/Path Views/FileValueView.cs

@@ -22 +22 @@
 using System;
 using System.Windows.Forms;
+using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
 
@@ -27 +28 @@
   [View("FileValueView")]
   [Content(typeof(FileValue), true)]
-  public partial class FileValueView : StringConvertibleValueView {
+  public partial class FileValueView : ItemView {
     public new FileValue Content {
       get { return (FileValue)base.Content; }
       set { base.Content = value; }
-    }
-
-    public override bool ReadOnly {
-      get {
-        if ((Content != null) && Content.ReadOnly) return true;
-        return base.ReadOnly;
-      }
-      set { base.ReadOnly = value; }
     }
 
@@ -45 +38 @@
     }
 
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      Content.FileOpenDialogFilterChanged += new EventHandler(Content_FileOpenDialogFilterChanged);
-    }
-    protected override void DeregisterContentEvents() {
-      Content.FileOpenDialogFilterChanged -= new EventHandler(Content_FileOpenDialogFilterChanged);
-      base.DeregisterContentEvents();
-    }
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      valueTextBox.Enabled = !Locked && !ReadOnly && Content != null;
-      valueTextBox.ReadOnly = Locked || ReadOnly || Content == null;
       openButton.Enabled = !Locked && !ReadOnly && Content != null;
     }
@@ -63 +46 @@
       base.OnContentChanged();
       if (Content == null) {
-        valueTextBox.Text = string.Empty;
+        stringConvertibleValueView.Content = null;
         return;
       }
 
-      valueTextBox.Text = Content.Value;
-      openButton.Enabled = !Content.ReadOnly;
-      openFileDialog.Filter = Content.FileDialogFilter;
-    }
-
-    protected virtual void Content_FileOpenDialogFilterChanged(object sender, EventArgs e) {
+      stringConvertibleValueView.Content = Content.StringValue;
       openFileDialog.Filter = Content.FileDialogFilter;
     }
 
     protected virtual void openButton_Click(object sender, EventArgs e) {
+      openFileDialog.Filter = Content.FileDialogFilter;
       if (openFileDialog.ShowDialog(this) != DialogResult.OK) return;
       Content.Value = openFileDialog.FileName;

stable/HeuristicLab.Data.Views/3.3/Path Views/TextFileView.cs

@@ -24 +24 @@
 using System.IO;
 using System.Windows.Forms;
-using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Data.Views {
   [View("TextFileView")]
   [Content(typeof(TextFileValue), true)]
-  public sealed partial class TextFileView : ItemView {
-    private bool changedFileContent;
-    private bool ChangedFileContent {
-      get { return changedFileContent; }
+  public sealed partial class TextFileView : FileValueView {
+    private bool fileContentChanged;
+    private bool FileContentChanged {
+      get { return fileContentChanged; }
       set {
-        if (changedFileContent != value) {
-          changedFileContent = value;
-          OnChangedFileContent();
+        if (fileContentChanged != value) {
+          fileContentChanged = value;
+          OnFileContentChanged();
         }
       }
@@ -49 +49 @@
     public TextFileView() {
       InitializeComponent();
-      changedFileContent = false;
+      fileContentChanged = false;
     }
 
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.ValueChanged += Content_FilePathChanged;
-      Content.FileOpenDialogFilterChanged += Content_FileDialogFilterChanged;
+      Content.StringValue.ValueChanged += Content_FilePathChanged;
     }
     protected override void DeregisterContentEvents() {
-      Content.ValueChanged -= Content_FilePathChanged;
-      Content.FileOpenDialogFilterChanged -= Content_FileDialogFilterChanged;
+      Content.StringValue.ValueChanged -= Content_FilePathChanged;
       fileSystemWatcher.EnableRaisingEvents = false;
       base.DeregisterContentEvents();
@@ -66 +64 @@
       base.SetEnabledStateOfControls();
       textBox.ReadOnly = Locked || ReadOnly || Content == null;
-      saveButton.Enabled = !Locked && !ReadOnly && Content != null && ChangedFileContent;
+      saveButton.Enabled = !Locked && !ReadOnly && Content != null && FileContentChanged;
 
       if (Content != null && Content.Exists()) {
@@ -83 +81 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      ChangedFileContent = false;
+      FileContentChanged = false;
       if (Content == null) {
-        fileValueView.Content = null;
         textBox.Text = string.Empty;
         //mkommend: other properties of the file system watcher cannot be cleared (e.g., path) as this leads to an ArgumentException
@@ -91 +88 @@
         return;
       }
-
-      fileValueView.Content = Content;
       saveFileDialog.Filter = Content.FileDialogFilter;
       UpdateTextBox();
@@ -101 +96 @@
       SetEnabledStateOfControls();
     }
-    private void Content_FileDialogFilterChanged(object sender, EventArgs e) {
-      saveFileDialog.Filter = Content.FileDialogFilter;
-    }
 
     private void textBox_TextChanged(object sender, EventArgs e) {
-      ChangedFileContent = fileText != textBox.Text;
-    }
-
-    private void OnChangedFileContent() {
+      FileContentChanged = fileText != textBox.Text;
+    }
+
+    private void OnFileContentChanged() {
       SetEnabledStateOfControls();
-      if (ChangedFileContent) {
-        textBox.ForeColor = Color.Red;
-      } else {
-        textBox.ForeColor = Color.Black;
-      }
+      textBox.ForeColor = FileContentChanged ? Color.Red : Color.Black;
     }
 
@@ -146 +134 @@
         } else {
           fileText = newContent;
-          ChangedFileContent = true;
+          FileContentChanged = true;
         }
       }
@@ -185 +173 @@
       WriteFile(path, textBox.Text);
       Content.Value = path;
-      ChangedFileContent = false;
+      FileContentChanged = false;
       fileSystemWatcher.EnableRaisingEvents = true;
     }
@@ -212 +200 @@
     }
     private void textBox_Validated(object sender, EventArgs e) {
-      if (!ChangedFileContent) return;
+      if (!FileContentChanged) return;
       string msg = string.Format("You have not saved the changes in the file \"{0}\" yet. Do you want to save the changes?", Content.Value);
       var result = MessageBox.Show(this, msg, "Save changes?", MessageBoxButtons.YesNo, MessageBoxIcon.Information);
@@ -229 +217 @@
       if (!File.Exists(path)) return null;
       string fileContent = string.Empty;
-      using (FileStream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read)) {
-        using (StreamReader streamReader = new StreamReader(fileStream)) {
-          fileContent = streamReader.ReadToEnd();
-        }
+      try {
+        using (FileStream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) {
+          using (StreamReader streamReader = new StreamReader(fileStream)) {
+            fileContent = streamReader.ReadToEnd();
+          }
+        }
+      }
+      catch (Exception e) {
+        ErrorHandling.ShowErrorDialog(e);
       }
       return fileContent;
@@ -238 +231 @@
 
     private static void WriteFile(string path, string fileContent) {
-      using (FileStream fileStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Write)) {
-        using (StreamWriter streamWriter = new StreamWriter(fileStream)) {
-          streamWriter.Write(fileContent);
-        }
+      try {
+        using (FileStream fileStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None)) {
+          using (StreamWriter streamWriter = new StreamWriter(fileStream)) {
+            streamWriter.Write(fileContent);
+          }
+        }
+      }
+      catch (Exception e) {
+        ErrorHandling.ShowErrorDialog(e);
       }
     }