You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by oc...@apache.org on 2011/05/01 03:58:43 UTC
svn commit: r1098218 - in
/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin:
Connect.cs NPandayImportProjectForm.cs
Author: oching
Date: Sun May 1 03:58:42 2011
New Revision: 1098218
URL: http://svn.apache.org/viewvc?rev=1098218&view=rev
Log:
[NPANDAY-394] set logger on NPandayProjectImporterForm construct so it wouldn't cause 'Object reference not set to an instance of object' error when used
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/NPandayImportProjectForm.cs
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs?rev=1098218&r1=1098217&r2=1098218&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/Connect.cs Sun May 1 03:58:42 2011
@@ -2079,7 +2079,7 @@ namespace NPanday.VisualStudio.Addin
else if (result == DialogResult.OK)
{
SaveAllDocuments();
- NPandayImportProjectForm frm = new NPandayImportProjectForm(_applicationObject);
+ NPandayImportProjectForm frm = new NPandayImportProjectForm(_applicationObject, logger);
frm.SetOutputWindowPane(outputWindowPane);
frm.ShowDialog();
currentPom = this.CurrentSelectedProjectPom;
@@ -2130,7 +2130,7 @@ namespace NPanday.VisualStudio.Addin
private void cbChangeProjectImportForm_Click(CommandBarButton btn, ref bool Cancel)
{
SaveAllDocuments();
- NPandayImportProjectForm frm = new NPandayImportProjectForm(_applicationObject);
+ NPandayImportProjectForm frm = new NPandayImportProjectForm(_applicationObject, logger);
frm.SetOutputWindowPane(outputWindowPane);
frm.ShowDialog();
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/NPandayImportProjectForm.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/NPandayImportProjectForm.cs?rev=1098218&r1=1098217&r2=1098218&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/NPandayImportProjectForm.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPanday/VisualStudio/Addin/NPandayImportProjectForm.cs Sun May 1 03:58:42 2011
@@ -35,6 +35,7 @@ using Microsoft.Win32;
using NPanday.ProjectImporter;
+using NPanday.Logging;
using System.Xml;
namespace NPanday.VisualStudio.Addin
@@ -66,9 +67,10 @@ namespace NPanday.VisualStudio.Addin
return filtered;
}
- public NPandayImportProjectForm(DTE2 applicationObject)
+ public NPandayImportProjectForm(DTE2 applicationObject, Logger logger)
{
this.applicationObject = applicationObject;
+ this.logger = logger;
InitializeComponent();
if (applicationObject != null && applicationObject.Solution != null && applicationObject.Solution.FileName != null)