Merge commit 'e0bc93eb59673def9477f386ad625652c1073c6f' into mac-ui

Model/TagCompoundDataNode.cs

@@ -40,7 +40,7 @@ namespace NBTExplorer.Model
 
         public override bool CanPasteIntoNode
         {
-            get { return NbtClipboardData.ContainsData; }
+            get { return NbtClipboardController.ContainsData; }
         }
 
         public override bool CreateNode (TagType type)
@@ -68,8 +68,8 @@ namespace NBTExplorer.Model
             if (!CanPasteIntoNode)
                 return false;
 
-            NbtClipboardData clipboard = NbtClipboardData.CopyFromClipboard();
+            NbtClipboardData clipboard = NbtClipboardController.CopyFromClipboard();
-            if (clipboard.Node == null)
+            if (clipboard == null || clipboard.Node == null)
                 return false;
 
             string name = clipboard.Name;

Model/TagDataNode.cs

@@ -238,8 +238,7 @@ namespace NBTExplorer.Model
         public override bool CopyNode ()
         {
             if (CanCopyNode) {
-                NbtClipboardData clip = new NbtClipboardData(NodeName, Tag);
+                NbtClipboardController.CopyToClipboard(new NbtClipboardData(NodeName, Tag));
-                clip.CopyToClipboard();
                 return true;
             }
 
@@ -249,8 +248,7 @@ namespace NBTExplorer.Model
         public override bool CutNode ()
         {
             if (CanCutNode) {
-                NbtClipboardData clip = new NbtClipboardData(NodeName, Tag);
+                NbtClipboardController.CopyToClipboard(new NbtClipboardData(NodeName, Tag));
-                clip.CopyToClipboard();
 
                 TagParent.DeleteTag(Tag);
                 Parent.Nodes.Remove(this);

Model/TagListDataNode.cs

@@ -40,9 +40,12 @@ namespace NBTExplorer.Model
         {
             get
             {
-                if (NbtClipboardData.ContainsData) {
+                if (NbtClipboardController.ContainsData) {
-                    TagNode node = NbtClipboardData.CopyFromClipboard().Node;
+                    NbtClipboardData data = NbtClipboardController.CopyFromClipboard();
-                    if (node != null && node.GetTagType() == Tag.ValueType)
+                    if (data == null)
+                        return false;
+
+                    if (data.Node != null && data.Node.GetTagType() == Tag.ValueType)
                         return true;
                 }
 
@@ -68,8 +71,8 @@ namespace NBTExplorer.Model
             if (!CanPasteIntoNode)
                 return false;
 
-            NbtClipboardData clipboard = NbtClipboardData.CopyFromClipboard();
+            NbtClipboardData clipboard = NbtClipboardController.CopyFromClipboard();
-            if (clipboard.Node == null)
+            if (clipboard == null || clipboard.Node == null)
                 return false;
 
             AppendTag(clipboard.Node);

NBTExplorer.csproj

@@ -81,6 +81,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FormRegistry.cs" />
+    <Compile Include="NbtClipboardController.cs" />
     <Compile Include="Windows\CancelSearchForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -192,6 +193,7 @@
     <Compile Include="Vendor\Be.Windows.Forms.HexBox\NativeMethods.cs" />
     <Compile Include="Vendor\Be.Windows.Forms.HexBox\Util.cs" />
     <Compile Include="Windows\FormHandlers.cs" />
+    <Compile Include="Windows\NbtClipboardControllerWin.cs" />
     <EmbeddedResource Include="Windows\CancelSearchForm.resx">
       <DependentUpon>CancelSearchForm.cs</DependentUpon>
     </EmbeddedResource>

NbtClipboardController.cs

@@ -0,0 +1,51 @@
+using System;
+
+namespace NBTExplorer
+{
+    public static class NbtClipboardController
+    {
+        private static INbtClipboardController _instance;
+
+        public static void Initialize (INbtClipboardController controller)
+        {
+            _instance = controller;
+        }
+
+        public static bool IsInitialized
+        {
+            get { return _instance != null; }
+        }
+
+        public static bool ContainsData
+        {
+            get 
+            {
+                if (_instance == null)
+                    return false;
+                return _instance.ContainsData; 
+            }
+        }
+
+        public static NbtClipboardData CopyFromClipboard ()
+        {
+            if (_instance == null)
+                return null;
+            return _instance.CopyFromClipboard();
+        }
+
+        public static void CopyToClipboard (NbtClipboardData data)
+        {
+            if (_instance == null)
+                return;
+            _instance.CopyToClipboard(data);
+        }
+    }
+
+    public interface INbtClipboardController
+    {
+        bool ContainsData { get; }
+
+        void CopyToClipboard (NbtClipboardData data);
+        NbtClipboardData CopyFromClipboard ();
+    }
+}

NbtClipboardData.cs

@@ -1,53 +1,51 @@
 using System;
 using System.IO;
-using System.Windows.Forms;
 using Substrate.Nbt;
 
 namespace NBTExplorer
 {
-    [Serializable]
     public class NbtClipboardData
     {
-        public string Name;
+        private string _name;
+        private TagNode _node;
 
-        private byte[] _data;
+        public string Name
-
-        [NonSerialized]
-        public TagNode Node;
-
-        public NbtClipboardData (String name, TagNode node)
         {
-            Name = name;
+            get { return _name; }
+            set { _name = value; }
+        }
 
+        public TagNode Node
+        {
+            get { return _node; }
+            set { _node = value; }
+        }
+
+        public NbtClipboardData (string name, TagNode node)
+        {
+            _name = name;
+            _node = node;
+        }
+
+        public static byte[] SerializeNode (TagNode node)
+        {
             TagNodeCompound root = new TagNodeCompound();
             root.Add("root", node);
             NbtTree tree = new NbtTree(root);
 
             using (MemoryStream ms = new MemoryStream()) {
                 tree.WriteTo(ms);
-                _data = new byte[ms.Length];
+                byte[] data = new byte[ms.Length];
-                Array.Copy(ms.GetBuffer(), _data, ms.Length);
+                Array.Copy(ms.GetBuffer(), data, ms.Length);
+
+                return data;
             }
         }
 
-        public static bool ContainsData
+        public static TagNode DeserializeNode (byte[] data)
         {
-            get { return Clipboard.ContainsData(typeof(NbtClipboardData).FullName); }
-        }
-
-        public void CopyToClipboard ()
-        {
-            Clipboard.SetData(typeof(NbtClipboardData).FullName, this);
-        }
-
-        public static NbtClipboardData CopyFromClipboard ()
-        {
-            NbtClipboardData clip = Clipboard.GetData(typeof(NbtClipboardData).FullName) as NbtClipboardData;
-            if (clip == null)
-                return null;
-
             NbtTree tree = new NbtTree();
-            using (MemoryStream ms = new MemoryStream(clip._data)) {
+            using (MemoryStream ms = new MemoryStream(data)) {
                 tree.ReadFrom(ms);
             }
 
@@ -55,8 +53,7 @@ namespace NBTExplorer
             if (root == null || !root.ContainsKey("root"))
                 return null;
 
-            clip.Node = root["root"];
+            return root["root"];
-            return clip;
         }
     }
 }

Windows/MainForm.cs

@@ -45,6 +45,7 @@ namespace NBTExplorer.Windows
             InitializeComponent();
             InitializeIconRegistry();
             FormHandlers.Register();
+            NbtClipboardController.Initialize(new NbtClipboardControllerWin());
 
             FormClosing += MainForm_Closing;
 
@@ -662,21 +663,21 @@ namespace NBTExplorer.Windows
             _buttonAddTagString.Enabled = node.CanCreateTag(TagType.TAG_STRING);
 
             _buttonSave.Enabled = CheckModifications();
-            _buttonCopy.Enabled = node.CanCopyNode;
+            _buttonCopy.Enabled = node.CanCopyNode && NbtClipboardController.IsInitialized;
-            _buttonCut.Enabled = node.CanCutNode;
+            _buttonCut.Enabled = node.CanCutNode && NbtClipboardController.IsInitialized;
             _buttonDelete.Enabled = node.CanDeleteNode;
             _buttonEdit.Enabled = node.CanEditNode;
             _buttonFindNext.Enabled = node.CanSearchNode || _searchState != null;
-            _buttonPaste.Enabled = node.CanPasteIntoNode;
+            _buttonPaste.Enabled = node.CanPasteIntoNode && NbtClipboardController.IsInitialized;
             _buttonRename.Enabled = node.CanRenameNode;
 
             _menuItemSave.Enabled = _buttonSave.Enabled;
-            _menuItemCopy.Enabled = node.CanCopyNode;
+            _menuItemCopy.Enabled = node.CanCopyNode && NbtClipboardController.IsInitialized;
-            _menuItemCut.Enabled = node.CanCutNode;
+            _menuItemCut.Enabled = node.CanCutNode && NbtClipboardController.IsInitialized;
             _menuItemDelete.Enabled = node.CanDeleteNode;
             _menuItemEditValue.Enabled = node.CanEditNode;
             _menuItemFind.Enabled = node.CanSearchNode;
-            _menuItemPaste.Enabled = node.CanPasteIntoNode;
+            _menuItemPaste.Enabled = node.CanPasteIntoNode && NbtClipboardController.IsInitialized;
             _menuItemRename.Enabled = node.CanRenameNode;
             _menuItemFind.Enabled = node.CanSearchNode;
             _menuItemFindNext.Enabled = _searchState != null;

Windows/NbtClipboardControllerWin.cs

@@ -0,0 +1,58 @@
+using System;
+using System.Windows.Forms;
+using Substrate.Nbt;
+
+namespace NBTExplorer.Windows
+{
+    public class NbtClipboardControllerWin : INbtClipboardController
+    {
+        public bool ContainsData
+        {
+            get { return Clipboard.ContainsData(typeof(NbtClipboardDataWin).FullName); }
+        }
+
+        public void CopyToClipboard (NbtClipboardData data)
+        {
+            NbtClipboardDataWin dataWin = new NbtClipboardDataWin(data);
+            Clipboard.SetData(typeof(NbtClipboardDataWin).FullName, dataWin);
+        }
+
+        public NbtClipboardData CopyFromClipboard ()
+        {
+            NbtClipboardDataWin clip = Clipboard.GetData(typeof(NbtClipboardDataWin).FullName) as NbtClipboardDataWin;
+            if (clip == null)
+                return null;
+
+            TagNode node = clip.Node;
+            if (node == null)
+                return null;
+
+            return new NbtClipboardData(clip.Name, node);
+        }
+    }
+
+    [Serializable]
+    public class NbtClipboardDataWin
+    {
+        private string _name;
+        private byte[] _data;
+
+        public NbtClipboardDataWin (NbtClipboardData data)
+        {
+            Name = data.Name;
+            Node = data.Node;
+        }
+
+        public string Name
+        {
+            get { return _name; }
+            set { _name = value; }
+        }
+
+        public TagNode Node
+        {
+            get { return NbtClipboardData.DeserializeNode(_data); }
+            set { _data = NbtClipboardData.SerializeNode(value); }
+        }
+    }
+}