Move transfer helpers to sub namespaces

NAPS2.Sdk/EtoForms/ProfileListViewBehavior.cs

@@ -5,7 +5,7 @@ using Eto.Drawing;
 using Eto.Forms;
 using Eto.WinForms;
 using NAPS2.Images;
-using NAPS2.ImportExport;
+using NAPS2.ImportExport.Profiles;
 using NAPS2.Logging;
 using NAPS2.Scan;
 

NAPS2.Sdk/EtoForms/Ui/ProfilesForm.cs

@@ -7,7 +7,7 @@ using Eto.WinForms;
 using Eto.WinForms.Forms;
 using NAPS2.Config;
 using NAPS2.Images;
-using NAPS2.ImportExport;
+using NAPS2.ImportExport.Profiles;
 using NAPS2.Lang.Resources;
 using NAPS2.Scan;
 using NAPS2.Serialization;

NAPS2.Sdk/ImportExport/DirectImportOperation.cs

@@ -1,11 +1,11 @@
 using System;
-using Google.Protobuf;
 using NAPS2.Lang.Resources;
 using NAPS2.Logging;
 using NAPS2.Operation;
 using NAPS2.Images;
 using NAPS2.Images.Storage;
 using NAPS2.Images.Transforms;
+using NAPS2.ImportExport.Images;
 using NAPS2.Serialization;
 
 namespace NAPS2.ImportExport

NAPS2.Sdk/ImportExport/Images/ImageTransfer.cs

@@ -5,7 +5,7 @@ using NAPS2.Images;
 using NAPS2.Images.Storage;
 using NAPS2.Serialization;
 
-namespace NAPS2.ImportExport
+namespace NAPS2.ImportExport.Images
 {
     public class ImageTransfer : TransferHelper<IEnumerable<ScannedImage>, ImageTransferData>
     {

NAPS2.Sdk/ImportExport/Images/ImageTransferData.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package NAPS2.ImportExport;
+package NAPS2.ImportExport.Images;
 
 import "Serialization/SerializedImage.proto";
 
@@ -8,9 +8,3 @@ message ImageTransferData {
     int32 processId = 1;
     repeated NAPS2.Serialization.SerializedImage serializedImages = 2;
 }
-
-message ProfileTransferData {
-    int32 processId = 1;
-    string scanProfileXml = 2;
-    bool locked = 3;
-}

NAPS2.Sdk/ImportExport/Profiles/ProfileTransfer.cs

@@ -2,7 +2,7 @@ using System.Diagnostics;
 using NAPS2.Scan;
 using NAPS2.Serialization;
 
-namespace NAPS2.ImportExport
+namespace NAPS2.ImportExport.Profiles
 {
     public class ProfileTransfer : TransferHelper<ScanProfile, ProfileTransferData>
     {

NAPS2.Sdk/ImportExport/Profiles/ProfileTransferData.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package NAPS2.ImportExport.Profiles;
+
+message ProfileTransferData {
+    int32 processId = 1;
+    string scanProfileXml = 2;
+    bool locked = 3;
+}

NAPS2.Sdk/ImportExport/TransferHelper.cs

@@ -3,10 +3,19 @@ using Google.Protobuf;
 
 namespace NAPS2.ImportExport
 {
+    /// <summary>
+    /// Generic helper for transferring data through copy/paste or drag/drop.
+    /// </summary>
+    /// <typeparam name="TInput">The domain type to be transferred.</typeparam>
+    /// <typeparam name="TData">The protobuf type representing the transferred data.</typeparam>
     public abstract class TransferHelper<TInput, TData> where TData : IMessage<TData>, new()
     {
         private readonly string _typeName = typeof(TData).FullName;
 
+        /// <summary>
+        /// Clears the clipboard and stores the serialized input.
+        /// </summary>
+        /// <param name="input"></param>
         public void SetClipboard(TInput input)
         {
             Clipboard.Instance.Clear();
@@ -34,6 +43,11 @@ namespace NAPS2.ImportExport
             return data;
         }
 
+        /// <summary>
+        /// Converts the domain type to the protobuf type for serialization.
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
         protected abstract TData AsData(TInput input);
     }
 }

NAPS2.Sdk/WinForms/FDesktop.cs

@@ -26,6 +26,7 @@ using NAPS2.Recovery;
 using NAPS2.Scan;
 using NAPS2.Images;
 using NAPS2.Images.Storage;
+using NAPS2.ImportExport.Images;
 using NAPS2.Remoting.Worker;
 using NAPS2.Wia;
 using NAPS2.Update;

NAPS2.Sdk/WinForms/ImageClipboard.cs

@@ -9,7 +9,7 @@ using Eto.Forms;
 using Eto.WinForms;
 using NAPS2.Images;
 using NAPS2.Images.Storage;
-using NAPS2.ImportExport;
+using NAPS2.ImportExport.Images;
 
 namespace NAPS2.WinForms
 {