Author: brett
Date: Sat Dec 31 15:41:37 2011
New Revision: 1226108
URL: http://svn.apache.org/viewvc?rev=1226108&view=rev
Log:
refactor duplicate method FindPlugin
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/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyProjectImportSyncronization.cs
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/PomHelperUtility.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=1226108&r1=1226107&r2=1226108&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:41:37 2011
@@ -524,25 +524,6 @@ namespace NPanday.ProjectImporter.Conver
}
- protected Plugin FindPlugin(string groupId, string artifactId)
- {
- if (model.build.plugins == null)
- {
- return null;
- }
-
- foreach (Plugin plugin in model.build.plugins)
- {
- if (groupId.ToLower().Equals(plugin.groupId.ToLower(),
StringComparison.InvariantCultureIgnoreCase) &&
artifactId.ToLower().Equals(plugin.artifactId.ToLower(),
StringComparison.InvariantCultureIgnoreCase))
- {
- return plugin;
- }
- }
-
- return null;
-
- }
-
/// <summary>
/// Adds PluginExecution
/// </summary>
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs?rev=1226108&r1=1226107&r2=1226108&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/WebWithVbOrCsProjectFilePomConverter.cs
Sat Dec 31 15:41:37 2011
@@ -58,7 +58,7 @@ namespace NPanday.ProjectImporter.Conver
Model.build.sourceDirectory = ".";
// change the outputDirectory of the plugin
- Plugin compilePlugin = FindPlugin("org.apache.npanday.plugins",
"maven-compile-plugin");
+ Plugin compilePlugin = PomHelperUtility.FindPlugin(model,
"org.apache.npanday.plugins", "maven-compile-plugin");
AddPluginConfiguration(compilePlugin, "outputDirectory", "bin");
// Add NPanday compile plugin
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyProjectImportSyncronization.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyProjectImportSyncronization.cs?rev=1226108&r1=1226107&r2=1226108&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyProjectImportSyncronization.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Verifiers/VerifyProjectImportSyncronization.cs
Sat Dec 31 15:41:37 2011
@@ -26,6 +26,7 @@ using NPanday.ProjectImporter.Validator;
using System.IO;
using NPanday.Model.Pom;
using System.Xml;
+using NPanday.Utils;
/// Author: Leopoldo Lee Agdeppa III
@@ -128,7 +129,7 @@ namespace NPanday.ProjectImporter.Verifi
static bool IsProjectAnIntegrationTest(NPanday.Model.Pom.Model model)
{
- Plugin plugin = FindPlugin(
+ Plugin plugin = PomHelperUtility.FindPlugin(
model,
"org.apache.npanday.plugins",
"maven-test-plugin"
@@ -157,42 +158,5 @@ namespace NPanday.ProjectImporter.Verifi
return false;
}
-
- #region TODO: make utility together whats in the AbstractConverter
-
- static Plugin FindPlugin(NPanday.Model.Pom.Model model, string
groupId, string artifactId)
- {
- return FindPlugin(model, groupId, artifactId, null);
- }
-
- static Plugin FindPlugin(NPanday.Model.Pom.Model model, string
groupId, string artifactId, string version)
- {
- if (model.build.plugins == null)
- {
- return null;
- }
-
- foreach (Plugin plugin in model.build.plugins)
- {
- if (groupId.Equals(plugin.groupId) &&
artifactId.Equals(plugin.artifactId))
- {
- if (!string.IsNullOrEmpty(version) &&
version.Equals(plugin.version))
- {
- return plugin;
- }
- else if (string.IsNullOrEmpty(version))
- {
- return plugin;
- }
- }
- }
-
- return null;
-
- }
-
- #endregion
-
-
}
}
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/PomHelperUtility.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/PomHelperUtility.cs?rev=1226108&r1=1226107&r2=1226108&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/PomHelperUtility.cs
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.Utils/src/main/csharp/PomHelperUtility.cs
Sat Dec 31 15:41:37 2011
@@ -19,19 +19,11 @@
//
#endregion
using System;
-using System.IO;
using System.Collections.Generic;
-using System.Text;
-
+using System.IO;
using System.Xml;
using System.Xml.Serialization;
-using System.Xml.XPath;
-
-using NPanday.Logging;
using NPanday.Model.Pom;
-using NPanday.Model.Settings;
-
-using System.Windows.Forms;
namespace NPanday.Utils
{
@@ -112,16 +104,26 @@ namespace NPanday.Utils
public bool HasPlugin(string pluginGroupId, string pluginArtifactId)
{
NPanday.Model.Pom.Model model = ReadPomAsModel();
+ return FindPlugin(model, pluginGroupId, pluginArtifactId) != null;
+ }
+
+ public static Plugin FindPlugin(NPanday.Model.Pom.Model model, string
groupId, string artifactId)
+ {
+ if (model.build.plugins == null)
+ {
+ return null;
+ }
foreach (Plugin plugin in model.build.plugins)
{
- if (pluginGroupId.Equals(plugin.groupId.ToLower(),
StringComparison.InvariantCultureIgnoreCase)
- && pluginArtifactId.Equals(plugin.artifactId.ToLower(),
StringComparison.InvariantCultureIgnoreCase))
+ if (groupId.ToLower().Equals(plugin.groupId.ToLower(),
StringComparison.InvariantCultureIgnoreCase) &&
artifactId.ToLower().Equals(plugin.artifactId.ToLower(),
StringComparison.InvariantCultureIgnoreCase))
{
- return true;
+ return plugin;
}
}
- return false;
+
+ return null;
+
}
public void AddPlugin(string groupId, string artifactId, string
version, bool extensions, PluginConfiguration pluginConf)
