Changeset 9714 for trunk

Timestamp:

07/17/13 13:35:44 (11 years ago)

Author:

mkommend

Message:

#2081: Integrated new HL path data types from the branch.

Location:

trunk/sources

Files:

• HeuristicLab.Data.Views/3.3 (modified) (1 prop)
• HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Data.Views/3.3/Path Views (copied) (copied from branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data.Views/3.3/Path Views)
• HeuristicLab.Data.Views/3.3/Path Views/TextFileView.cs (modified) (11 diffs)
• HeuristicLab.Data.Views/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Data.Views/3.3/StringConvertibleArrayView.cs (modified) (1 diff)
• HeuristicLab.Data/3.3 (modified) (1 prop)
• HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Data/3.3/Path Types (copied) (copied from branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data/3.3/Path Types)
• HeuristicLab.Data/3.3/Path Types/TextFile.cs (deleted)
• HeuristicLab.Data/3.3/Path Types/TextFileValue.cs (copied) (copied from branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data/3.3/Path Types/TextFile.cs) (1 diff)

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

@@ -133 +133 @@
       <DependentUpon>IntRangeView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Path Views\DirectoryValueView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Path Views\DirectoryValueView.Designer.cs">
+      <DependentUpon>DirectoryValueView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Path Views\FileValueView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Path Views\FileValueView.Designer.cs">
+      <DependentUpon>FileValueView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Path Views\TextFileView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Path Views\TextFileView.Designer.cs">
+      <DependentUpon>TextFileView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="StringConvertibleMatrixColumnVisibilityDialog.cs">
@@ -196 +214 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
+      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>

trunk/sources/HeuristicLab.Data.Views/3.3/Path Views/TextFileView.cs

@@ -29 +29 @@
 namespace HeuristicLab.Data.Views {
   [View("TextFileView")]
-  [Content(typeof(TextFile), true)]
-  public partial class TextFileView : ItemView {
+  [Content(typeof(TextFileValue), true)]
+  public sealed partial class TextFileView : ItemView {
     private bool changedFileContent;
-    protected bool ChangedFileContent {
+    private bool ChangedFileContent {
       get { return changedFileContent; }
       set {
@@ -42 +42 @@
     }
 
-    public new TextFile Content {
-      get { return (TextFile)base.Content; }
+    public new TextFileValue Content {
+      get { return (TextFileValue)base.Content; }
       set { base.Content = value; }
     }
@@ -97 +97 @@
     }
 
-    protected virtual void Content_FilePathChanged(object sender, EventArgs e) {
+    private void Content_FilePathChanged(object sender, EventArgs e) {
       UpdateTextBox();
       SetEnabledStateOfControls();
     }
-    protected virtual void Content_FileDialogFilterChanged(object sender, EventArgs e) {
+    private void Content_FileDialogFilterChanged(object sender, EventArgs e) {
       saveFileDialog.Filter = Content.FileDialogFilter;
     }
 
-    protected virtual void textBox_TextChanged(object sender, EventArgs e) {
+    private void textBox_TextChanged(object sender, EventArgs e) {
       ChangedFileContent = fileText != textBox.Text;
     }
 
-    protected virtual void OnChangedFileContent() {
+    private void OnChangedFileContent() {
       SetEnabledStateOfControls();
       if (ChangedFileContent) {
@@ -118 +118 @@
     }
 
-    protected bool fileSystemWatcherChangedFired = false;
-    protected virtual void fileSystemWatcher_Changed(object sender, FileSystemEventArgs e) {
+    private bool fileSystemWatcherChangedFired = false;
+    private void fileSystemWatcher_Changed(object sender, FileSystemEventArgs e) {
       //mkommend: cannot react on visible changed, because this event is not fired when the parent control gets visible set to false
       if (!Visible) return;
@@ -162 +162 @@
     }
 
-    protected virtual void fileSystemWatcher_Renamed(object sender, RenamedEventArgs e) {
+    private void fileSystemWatcher_Renamed(object sender, RenamedEventArgs e) {
       //mkommend: cannot react on visible changed, because this event is not fired when the parent control gets visible set to false
       if (!Visible) return;
@@ -174 +174 @@
     }
 
-    protected virtual void SaveFile() {
+    private void SaveFile() {
       //omit circular events by changing the file from HL
       fileSystemWatcher.EnableRaisingEvents = false;
@@ -189 +189 @@
     }
 
-    protected virtual void saveButton_Click(object sender, EventArgs e) {
+    private void saveButton_Click(object sender, EventArgs e) {
       SaveFile();
     }
 
-    protected string fileText;
-    protected virtual void UpdateTextBox() {
+    private string fileText;
+    private void UpdateTextBox() {
       if (string.IsNullOrEmpty(Content.Value)) {
         textBox.Enabled = false;
@@ -201 +201 @@
       }
 
-      fileText = ReadFile(Content.Value) ?? string.Empty;
-      if (string.IsNullOrEmpty(fileText)) {
+      fileText = ReadFile(Content.Value);
+      if (fileText == null) {
         textBox.Enabled = false;
         textBox.Text = string.Format("The specified file \"{0}\" cannot be found.", Content.Value);
@@ -211 +211 @@
       textBox.Text = fileText;
     }
-    protected virtual void textBox_Validated(object sender, EventArgs e) {
+    private void textBox_Validated(object sender, EventArgs e) {
       if (!ChangedFileContent) 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);
@@ -226 +226 @@
     }
 
-    public static string ReadFile(string path) {
+    private static string ReadFile(string path) {
       if (!File.Exists(path)) return null;
-      string fileContent;
+      string fileContent = string.Empty;
       using (FileStream fileStream = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read)) {
         using (StreamReader streamReader = new StreamReader(fileStream)) {
@@ -237 +237 @@
     }
 
-    public static void WriteFile(string path, string fileContent) {
+    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)) {

trunk/sources/HeuristicLab.Data.Views/3.3/Plugin.cs.frame

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

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

@@ -125 +125 @@
         Invoke(new EventHandler<EventArgs<int>>(Content_ItemChanged), sender, e);
       else {
+        // if a resize of the array occurs and some other class handles the event and provides default values
+        //then the itemChanged will occur before the reset event. hence the check was added
+        if (dataGridView.RowCount <= e.Value) return;
         dataGridView.Rows[e.Value].Cells[0].Value = Content.GetValue(e.Value);
         Size size = dataGridView.Rows[e.Value].Cells[0].PreferredSize;

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

@@ -117 +117 @@
     <Compile Include="Comparison.cs" />
     <Compile Include="ComparisonType.cs" />
+    <Compile Include="Path Types\DirectoryValue.cs" />
+    <Compile Include="Path Types\FileValue.cs" />
+    <Compile Include="Path Types\PathValue.cs" />
+    <Compile Include="Path Types\TextFileValue.cs" />
     <Compile Include="PercentMatrix.cs" />
     <Compile Include="PercentArray.cs" />
@@ -212 +216 @@
   -->
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -219 +223 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

trunk/sources/HeuristicLab.Data/3.3/Path Types/TextFileValue.cs

@@ -27 +27 @@
   [Item("TextFile", "Represents the content and path to a text file.")]
   [StorableClass]
-  public class TextFile : FileValue {
+  public class TextFileValue : FileValue {
     [StorableConstructor]
-    protected TextFile(bool deserializing) : base(deserializing) { }
-    protected TextFile(TextFile original, Cloner cloner)
+    protected TextFileValue(bool deserializing) : base(deserializing) { }
+    protected TextFileValue(TextFileValue original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new TextFile(this, cloner);
+      return new TextFileValue(this, cloner);
     }
 
-    public TextFile()
+    public TextFileValue()
       : base() {
     }