svn commit: r1572078 - /incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/Connect.cs

[br...@apache.org]

Author: brett
Date: Wed Feb 26 15:03:59 2014
New Revision: 1572078

URL: http://svn.apache.org/r1572078
Log:
avoid exceptions on project load

Modified:
    incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/Connect.cs

Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/Connect.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/Connect.cs?rev=1572078&r1=1572077&r2=1572078&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/Connect.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/Connect.cs Wed Feb 26 15:03:59 2014
@@ -653,7 +653,7 @@ namespace NPanday.VisualStudio.Addin
             }
             catch (Exception e)
             {
-                log.Error(e.Message);
+                log.Error("Unable to insert key tag in POM: " + e.Message);
             }
 
 
@@ -661,6 +661,9 @@ namespace NPanday.VisualStudio.Addin
 
         void SigningEvents_SignatureAdded()
         {
+            // TODO: Currently it seems this code is called unnecessarily sometimes, and should not iterate all projects (which may not require it - e.g. parent and ccproj)
+            // TODO: should also use PomHelperUtility instead of DOM manipulation
+
             Solution2 solution = (Solution2)_applicationObject.Solution;
             string pomFilePath = string.Empty;
             foreach (Project project in GetAllProjects(solution.Projects))
@@ -714,7 +717,7 @@ namespace NPanday.VisualStudio.Addin
                 }
                 catch (Exception e)
                 {
-                    log.Error(e.Message);
+                    log.Error("Unable to find signing tags in POM: " + e.Message, e);
                 }
                 try
                 {
@@ -732,6 +735,12 @@ namespace NPanday.VisualStudio.Addin
                         }
                     }
 
+                    if (configurationNode == null)
+                    {
+                        // TODO: perhaps should add it here and proceed instead?
+                        return;
+                    }
+
                     //isSigned adding keyfile tag
                     if (!configurationNode.InnerText.Contains(".snk") && key != string.Empty)
                     {
@@ -755,7 +764,7 @@ namespace NPanday.VisualStudio.Addin
                 }
                 catch (Exception e)
                 {
-                    log.Error(e.Message);
+                    log.Error("Unable to add signing configuration in POM: " + e.Message, e);
                 }
             }
         }