Author: mhutch
Date: 2007-11-19 18:47:20 -0500 (Mon, 19 Nov 2007)
New Revision: 89951

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.CodeGeneration/BaseRefactorer.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs
Log:
* MonoDevelop.Projects/Combine.cs: Catch some potential nulls and
  replace them with warnings.
* MonoDevelop.Projects.CodeGeneration/BaseRefactorer.cs: Use
  non-obsolete CodeDom APIs.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog   2007-11-19 
23:43:49 UTC (rev 89950)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog   2007-11-19 
23:47:20 UTC (rev 89951)
@@ -1,3 +1,10 @@
+2007-11-19  Michael Hutchinson <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.Projects/Combine.cs: Catch some potential nulls and 
replace
+         them with warnings.
+       * MonoDevelop.Projects.CodeGeneration/BaseRefactorer.cs: Use 
non-obsolete
+         CodeDom APIs.
+
 2007-11-13  Michael Hutchinson <[EMAIL PROTECTED]> 
 
        * MonoDevelop.Projects.Parser/CodeCompletionDatabase.cs: Downgrade old 
pidb

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs 
    2007-11-19 23:43:49 UTC (rev 89950)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Combine.cs 
    2007-11-19 23:47:20 UTC (rev 89951)
@@ -718,9 +718,18 @@
                        CombineConfiguration config = ActiveConfiguration as 
CombineConfiguration;
                        if (config == null)
                                return;
+                       
+                       if (config.Entries == null) {
+                               LoggingService.LogWarning ("Combine.OnClean 
'{0}', configuration '{1}': Entries is null", Name, config.Name);
+                               return;
+                       }
 
-                       foreach (CombineConfigurationEntry cce in 
config.Entries)
-                               cce.Entry.Clean (monitor);
+                       foreach (CombineConfigurationEntry cce in 
config.Entries) {
+                               if (cce.Entry == null)
+                                       LoggingService.LogWarning 
("Combine.OnClean '{0}', configuration '{1}', entry '{2}': Entry is null", 
Name, config.Name, cce.EntryName);
+                               else
+                                       cce.Entry.Clean (monitor);
+                       }
                }
                
                protected internal override ICompilerResult OnBuild 
(IProgressMonitor monitor)

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.CodeGeneration/BaseRefactorer.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.CodeGeneration/BaseRefactorer.cs
       2007-11-19 23:43:49 UTC (rev 89950)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.CodeGeneration/BaseRefactorer.cs
       2007-11-19 23:47:20 UTC (rev 89951)
@@ -44,8 +44,8 @@
                        get { return RefactorOperations.All; }
                }
                
-               protected abstract ICodeGenerator GetGenerator ();
-       
+               protected abstract CodeDomProvider GetCodeDomProvider ();
+               
                public IClass CreateClass (RefactorerContext ctx, string 
directory, string namspace, CodeTypeDeclaration type)
                {
                        CodeCompileUnit unit = new CodeCompileUnit ();
@@ -56,8 +56,8 @@
                        string file = Path.Combine (directory, type.Name + 
".cs");
                        StreamWriter sw = new StreamWriter (file);
                        
-                       ICodeGenerator gen = GetGenerator ();
-                       gen.GenerateCodeFromCompileUnit (unit, sw, GetOptions 
(false));
+                       CodeDomProvider provider = GetCodeDomProvider ();
+                       provider.GenerateCodeFromCompileUnit (unit, sw, 
GetOptions (false));
                        
                        sw.Close ();
                        
@@ -609,9 +609,9 @@
                {
                        CodeTypeDeclaration type = new CodeTypeDeclaration 
("temp");
                        type.Members.Add (member);
-                       ICodeGenerator gen = GetGenerator ();
+                       CodeDomProvider provider = GetCodeDomProvider ();
                        StringWriter sw = new StringWriter ();
-                       gen.GenerateCodeFromType (type, sw, GetOptions (member 
is CodeMemberMethod));
+                       provider.GenerateCodeFromType (type, sw, GetOptions 
(member is CodeMemberMethod));
                        string code = sw.ToString ();
                        int i = code.IndexOf ('{');
                        int j = code.LastIndexOf ('}');

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to