[Mac] Remove old plist reading/writing APIs

Conflicts:

	main/src/addins/MonoDevelop.MacDev/Makefile.am

3 files changed, 10 insertions, 15 deletions

diff --git a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacBuildExtension.cs b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacBuildExtension.cs
index 65fde0d050..fa6776ca76 100644
--- a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacBuildExtension.cs
+++ b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacBuildExtension.cs
@@ -38,7 +38,7 @@ using System.CodeDom.Compiler;
 using Mono.Addins;
 using MonoDevelop.MacDev;
 using Mono.Unix;
-using MonoDevelop.MacDev.Plist;
+using MonoDevelop.MacDev.PlistEditor;
 using MonoDevelop.Core.Execution;
 
 namespace MonoDevelop.MonoMac
@@ -128,11 +128,8 @@ namespace MonoDevelop.MonoMac
 		BuildResult MergeInfoPlist (IProgressMonitor monitor, MonoMacProject proj, MonoMacProjectConfiguration conf, 
 		                            ProjectFile template, FilePath plistOut)
 		{
-			return MacBuildUtilities.CreateMergedPlist (monitor, template, plistOut, (PlistDocument doc) => {
+			return MacBuildUtilities.CreateMergedPlist (monitor, template, plistOut, (PDictionary dict) => {
 				var result = new BuildResult ();
-				var dict = doc.Root as PlistDictionary;
-				if (dict == null)
-					doc.Root = dict = new PlistDictionary ();
 				
 				//required keys that the user is likely to want to modify
 				SetIfNotPresent (dict, "CFBundleName", proj.Name);
@@ -152,7 +149,7 @@ namespace MonoDevelop.MonoMac
 			});
 		}
 		
-		static void SetIfNotPresent (PlistDictionary dict, string key, PlistObjectBase value)
+		static void SetIfNotPresent (PDictionary dict, string key, PObject value)
 		{
 			if (!dict.ContainsKey (key))
 				dict[key] = value;
diff --git a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacPackaging.cs b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacPackaging.cs
index 988ced1a81..76aa95c89b 100644
--- a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacPackaging.cs
+++ b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacPackaging.cs
@@ -36,7 +36,7 @@ using MonoDevelop.Projects;
 using System.Diagnostics;
 using System.IO;
 using MonoDevelop.Core.Serialization;
-using MonoDevelop.MacDev.Plist;
+using MonoDevelop.MacDev.PlistEditor;
 using MonoDevelop.MacInterop;
 
 namespace MonoDevelop.MonoMac.Gui
@@ -190,10 +190,9 @@ namespace MonoDevelop.MonoMac.Gui
 					}
 					
 					var plistFile = workingApp.Combine ("Contents", "Info.plist");
-					var plistDoc = new PlistDocument ();
-					plistDoc.LoadFromXmlFile (plistFile);
-					((PlistDictionary)plistDoc.Root)["MonoBundleExecutable"] = cfg.CompiledOutputName.FileName;
-					plistDoc.WriteToFile (plistFile);
+					var plistDoc = PDictionary.Load (plistFile);
+					plistDoc ["MonoBundleExecutable"] = cfg.CompiledOutputName.FileName;
+					plistDoc.Save (plistFile);
 					
 					monitor.EndTask ();
 				}
diff --git a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacProject.cs b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacProject.cs
index 9e87d60c6e..e5b90f3a05 100644
--- a/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacProject.cs
+++ b/extras/MonoDevelop.MonoMac/MonoDevelop.MonoMac/MonoMacProject.cs
@@ -36,7 +36,7 @@ using MonoDevelop.Core.ProgressMonitoring;
 using MonoDevelop.Core.Execution;
 using MonoDevelop.Ide;
 using System.Reflection;
-using MonoDevelop.MacDev.Plist;
+using MonoDevelop.MacDev.PlistEditor;
 using MonoDevelop.MacDev.XcodeSyncing;
 using MonoDevelop.MacDev.XcodeIntegration;
 using MonoDevelop.MacDev.NativeReferences;
@@ -259,9 +259,8 @@ namespace MonoDevelop.MonoMac
 			if (pf != null)
 				return pf;
 			
-			var doc = new PlistDocument ();
-			doc.Root = new PlistDictionary ();
-			doc.WriteToFile (name);
+			var doc = new PDictionary ();
+			doc.Save (name);
 			return AddFile (name);
 		}