Author: brett
Date: Wed Mar 21 03:43:15 2012
New Revision: 1303271
URL: http://svn.apache.org/viewvc?rev=1303271&view=rev
Log:
[NPANDAY-168] Generating a POM for a solution that already has them should use
defaults from the current POM
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs?rev=1303271&r1=1303270&r2=1303271&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.VisualStudio.Addin/src/main/csharp/NPandayImportProjectForm.cs
Wed Mar 21 03:43:15 2012
@@ -84,7 +84,7 @@ namespace NPanday.VisualStudio.Addin
}
groupId = groupId + FilterID(ConvertToPascalCase(new
FileInfo(applicationObject.Solution.FileName).Name.Replace(".sln", "")));
- txtGroupId.Text = groupId;
+
string scmTag = string.Empty;
//getSCMTag(applicationObject.Solution.FileName);
string version = "1.0-SNAPSHOT";
string pomFilePath =
applicationObject.Solution.FileName.Substring(0,
applicationObject.Solution.FileName.LastIndexOf("\\"));
@@ -105,6 +105,11 @@ namespace NPanday.VisualStudio.Addin
{
version = node.InnerText;
}
+ node =
doc.SelectSingleNode("/pom:project/pom:groupId", xmlnsManager);
+ if (node != null)
+ {
+ groupId = node.InnerText;
+ }
}
if (!string.IsNullOrEmpty(scmTag))
@@ -112,6 +117,7 @@ namespace NPanday.VisualStudio.Addin
txtSCMTag.Text = scmTag;
}
+ txtGroupId.Text = groupId;
txtVersion.Text = version;
// assuming just one cloud project for now
