merge conflicts

2 files changed, 40 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Models/StorageFileHandlerModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Models/StorageFileHandlerModel.cs
new file mode 100644
index 000000000..764512e77
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Models/StorageFileHandlerModel.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+using Tango.Integration.Storage;
+
+namespace Tango.MachineStudio.Storage.Models
+{
+    public class StorageFileHandlerModel : ExtendedObject
+    {
+        public StorageFileHandler Handler { get; set; }
+
+        public StorageFileHandlerType Type { get; set; }
+
+        public String FilePath { get; set; }
+
+        public StorageFileHandlerModel(StorageFileHandler handler, String filePath, StorageFileHandlerType type)
+        {
+            FilePath = filePath;
+            Handler = handler;
+            Type = type;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Models/StorageFileHandlerType.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Models/StorageFileHandlerType.cs
new file mode 100644
index 000000000..548b0fc86
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Storage/Models/StorageFileHandlerType.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.MachineStudio.Storage.Models
+{
+    public enum StorageFileHandlerType
+    {
+        Download,
+        Upload
+    }
+}