Author: mkrueger
Date: 2007-09-11 04:32:29 -0400 (Tue, 11 Sep 2007)
New Revision: 85623

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
   
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.CodeGeneration/CodeRefactorer.cs
Log:
* MonoDevelop.Projects.CodeGeneration/CodeRefactorer.cs: Added some
  error handling code to make it easier to track refactoring bugs.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog   2007-09-11 
08:31:49 UTC (rev 85622)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog   2007-09-11 
08:32:29 UTC (rev 85623)
@@ -1,5 +1,10 @@
 2007-09-11  Mike Krüger <[EMAIL PROTECTED]> 
 
+       * MonoDevelop.Projects.CodeGeneration/CodeRefactorer.cs: Added some 
error
+         handling code to make it easier to track refactoring bugs.
+
+2007-09-11  Mike Krüger <[EMAIL PROTECTED]> 
+
        * MonoDevelop.Projects.Parser/DefaultParserService.cs: Little change in
          parser service - it logs now an error instead of generating an
          exception, when a project database isn't found.

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.CodeGeneration/CodeRefactorer.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.CodeGeneration/CodeRefactorer.cs
       2007-09-11 08:31:49 UTC (rev 85622)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.CodeGeneration/CodeRefactorer.cs
       2007-09-11 08:32:29 UTC (rev 85623)
@@ -232,23 +232,32 @@
                
                public void RemoveMember (IClass cls, IMember member)
                {
-                       RefactorerContext gctx = GetGeneratorContext (cls);
-                       IRefactorer gen = GetGeneratorForClass (cls);
-                       gen.RemoveMember (gctx, cls, member);
-                       gctx.Save ();
+                       try {
+                               RefactorerContext gctx = GetGeneratorContext 
(cls);
+                               IRefactorer gen = GetGeneratorForClass (cls);
+                               gen.RemoveMember (gctx, cls, member);
+                               gctx.Save ();
+                       } catch (Exception e) {
+                               Runtime.LoggingService.Error 
(GettextCatalog.GetString ("Error while removing member {0}:{1}", member, 
e.ToString ()));
+                       }
                }
                
                public IMember RenameMember (IProgressMonitor monitor, IClass 
cls, IMember member, string newName, RefactoryScope scope)
                {
-                       MemberReferenceCollection refs = new 
MemberReferenceCollection ();
-                       Refactor (monitor, cls, scope, new RefactorDelegate 
(new RefactorFindMemberReferences (cls, member, refs).Refactor));
-                       refs.RenameAll (newName);
+                       try {
+                               MemberReferenceCollection refs = new 
MemberReferenceCollection ();
+                               Refactor (monitor, cls, scope, new 
RefactorDelegate (new RefactorFindMemberReferences (cls, member, 
refs).Refactor));
+                               refs.RenameAll (newName);
                        
-                       RefactorerContext gctx = GetGeneratorContext (cls);
-                       IRefactorer gen = GetGeneratorForClass (cls);
-                       IMember m = gen.RenameMember (gctx, cls, member, 
newName);
-                       gctx.Save ();
-                       return m;
+                               RefactorerContext gctx = GetGeneratorContext 
(cls);
+                               IRefactorer gen = GetGeneratorForClass (cls);
+                               IMember m = gen.RenameMember (gctx, cls, 
member, newName);
+                               gctx.Save ();
+                               return m;
+                       } catch (Exception e) {
+                               Runtime.LoggingService.Error 
(GettextCatalog.GetString ("Error while renaming member {0} to {1}: {2}",  
member, newName, e.ToString ()));
+                               return null;
+                       }
                }
                
                public MemberReferenceCollection FindMemberReferences 
(IProgressMonitor monitor, IClass cls, IMember member, RefactoryScope scope)

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

Reply via email to