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 br...@apache.org on 2011/12/31 15:49:26 UTC
svn commit: r1226114 - in
/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp:
Converter/Algorithms/AbstractPomConverter.cs Digest/ProjectDigester.cs
Verifiers/VerifyUnitTestsForm.cs
Author: brett
Date: Sat Dec 31 15:49:26 2011
New Revision: 1226114
URL: http://svn.apache.org/viewvc?rev=1226114&view=rev
Log:
simplify references that depend on extension of the project file
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyUnitTestsForm.cs
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs?rev=1226114&r1=1226113&r2=1226114&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/AbstractPomConverter.cs Sat Dec 31 15:49:26 2011
@@ -329,23 +329,8 @@ namespace NPanday.ProjectImporter.Conver
string projectName = projectDigest.AssemblyName;
if (HasSpecialCharacters(projectDigest.AssemblyName))
{
- string[] projectFullName = projectDigest.FullFileName.Split("\\".ToCharArray());
- projectName = projectFullName[projectFullName.Length - 1];
-
- if (projectName.Equals("."))
- {
- projectName = projectFullName[projectFullName.Length - 2];
- }
-
- if (projectName.Contains(".csproj"))
- {
- projectName = projectName.Replace(".csproj", "");
- }
- if (projectName.Contains(".vbproj"))
- {
- projectName = projectName.Replace(".vbproj", "");
- }
-
+ FileInfo f = new FileInfo(ProjectDigest.FullFileName);
+ projectName = f.Name.Substring(0, f.Name.Length - f.Extension.Length);
}
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs?rev=1226114&r1=1226113&r2=1226114&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Digest/ProjectDigester.cs Sat Dec 31 15:49:26 2011
@@ -27,6 +27,7 @@ using NPanday.ProjectImporter.Digest.Mod
using NPanday.ProjectImporter.Digest.Algorithms;
using NPanday.ProjectImporter.Parser.VisualStudioProjectTypes;
+using System;
/// Author: Leopoldo Lee Agdeppa III
@@ -212,14 +213,16 @@ namespace NPanday.ProjectImporter.Digest
public static Project GetProject(string projectFile)
{
- if (!new FileInfo(projectFile).Exists)
+ FileInfo projectFileInfo = new FileInfo(projectFile);
+
+ if (!projectFileInfo.Exists)
{
return null;
}
- if (!(projectFile.ToUpper().EndsWith(".CSPROJ") || projectFile.ToUpper().EndsWith(".VBPROJ")))
+ if (!(projectFileInfo.Extension.ToUpper().Equals(".CSPROJ") || projectFileInfo.Extension.ToUpper().Equals(".VBPROJ")))
{
- return null;
+ throw new Exception( "Unrecognized project type: " + projectFileInfo.Extension + " for file " + projectFile );
}
// gets the directory path of mscorlib using the System.String Type Assembly path
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyUnitTestsForm.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyUnitTestsForm.cs?rev=1226114&r1=1226113&r2=1226114&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyUnitTestsForm.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyUnitTestsForm.cs Sat Dec 31 15:49:26 2011
@@ -27,6 +27,7 @@ using System.Text;
using System.Windows.Forms;
using NPanday.ProjectImporter.Digest;
using NPanday.ProjectImporter.Digest.Model;
+using System.IO;
/// Author: Leopoldo Lee Agdeppa III
@@ -60,24 +61,9 @@ namespace NPanday.ProjectImporter.Verifi
projectDigest.FullFileName = projectDigest.FullFileName.Substring(0, projectDigest.FullFileName.LastIndexOf("\\"));
}
- String[] projectNameTokens = projectDigest.FullFileName.Split("\\".ToCharArray());
- String projectName = projectNameTokens[projectNameTokens.Length - 1];
-
- if (projectName.Contains(".csproj") || projectName.Contains(".vbproj"))
+ if (chkListTestUnits.CheckedItems.Contains(projectDigest.AssemblyName))
{
- if (projectName.Contains(".csproj"))
- {
- projectName = projectName.Substring(0, projectName.LastIndexOf(".csproj"));
- }
- else
- {
- projectName = projectName.Substring(0, projectName.LastIndexOf(".vbproj"));
- }
-
- if (chkListTestUnits.CheckedItems.Contains(projectName))
- {
- projectDigest.UnitTest = true;
- }
+ projectDigest.UnitTest = true;
}
}
this.Close();
@@ -102,20 +88,7 @@ namespace NPanday.ProjectImporter.Verifi
projectName = projectNameTokens[projectNameTokens.Length - 2];
}
- if (projectName.Contains(".csproj") || projectName.Contains(".vbproj"))
- {
- if (projectName.Contains(".csproj"))
- {
- projectName = projectName.Substring(0, projectName.LastIndexOf(".csproj"));
- }
- else
- {
- projectName = projectName.Substring(0, projectName.LastIndexOf(".vbproj"));
- }
-
- }
-
- chkListTestUnits.Items.Add(projectName, projectDigest.UnitTest);
+ chkListTestUnits.Items.Add(projectDigest.AssemblyName, projectDigest.UnitTest);
}
}