[nb-maven-generators~mercurial:128] refactorings

[mkleint@kenai.com]

Project:    nb-maven-generators
Repository: mercurial
Revision:   128
Author:     mkleint
Date:       2009-12-01 21:45:59 UTC
Link:       

Log Message:
------------
refactorings


Revisions:
----------
128


Modified Paths:
---------------
generator/src/main/scala/org/mkleint/scalarebel/Coordinates.scala
generator/src/main/scala/org/mkleint/scalarebel/GeneratorFactory.scala
generator/src/main/scala/org/mkleint/scalarebel/GroovyGenerator.scala
generator/src/main/scala/org/mkleint/scalarebel/ProGuardGenerator.scala
generator/src/main/scala/org/mkleint/scalarebel/RebelGenerator.scala
generator/src/main/scala/org/mkleint/scalarebel/ShaderGenerator.scala
generator/src/main/scala/org/mkleint/scalarebel/SnifferGenerator.scala
generator/src/main/scala/org/mkleint/scalarebel/convert/RichPlugin.scala


Diffs:
------
diff -r 3f1f76e74cf7 -r 16567632af7f 
generator/src/main/scala/org/mkleint/scalarebel/Coordinates.scala
--- a/generator/src/main/scala/org/mkleint/scalarebel/Coordinates.scala Sun 
Nov 29 21:53:37 2009 +0100
+++ b/generator/src/main/scala/org/mkleint/scalarebel/Coordinates.scala Tue 
Dec 01 22:45:59 2009 +0100
@@ -51,7 +51,9 @@
     val proguardPlugin = Coordinates("com.pyx4me", "proguard-maven-plugin", 
"2.0.4")
     val releasePlugin = Coordinates(DEFAULT_PLUGIN_GROUP, 
"maven-release-plugin", "2.0-beta-9")
 
-    val snifferPlugin = Coordinates("org.codehaus.mojo", 
"animal-sniffer-maven-plugin", "1.3")
-    val snifferDependency = Coordinates("org.codehaus.mojo", 
"animal-sniffer-annotations", "1.3")
+    val snifferPlugin = Coordinates("org.codehaus.mojo", 
"animal-sniffer-maven-plugin", "1.4")
+    val snifferDependency = Coordinates("org.codehaus.mojo", 
"animal-sniffer-annotations", "1.4")
+    val enforcerPlugin = Coordinates(DEFAULT_PLUGIN_GROUP, 
"maven-enforcer-plugin", "1.0-beta-1")
+
 
 }

diff -r 3f1f76e74cf7 -r 16567632af7f 
generator/src/main/scala/org/mkleint/scalarebel/GeneratorFactory.scala
--- a/generator/src/main/scala/org/mkleint/scalarebel/GeneratorFactory.scala  
  Sun Nov 29 21:53:37 2009 +0100
+++ b/generator/src/main/scala/org/mkleint/scalarebel/GeneratorFactory.scala  
  Tue Dec 01 22:45:59 2009 +0100
@@ -52,12 +52,12 @@
 
     private def sniffer(m : POMModel, l : Lookup) : Option[CodeGenerator] = {
         val (prj, mavenprj) = Utils.modelToProject(m)
-        if ("jar" == mavenprj.getPackaging) {
-            findPlugin(mavenprj, exactMatch(snifferPlugin, _)) match {
-                case None => Some(new SnifferGenerator(m))
-                case _ => None
-            }
-        } else None
+        findPlugin(mavenprj, exactMatch(snifferPlugin, _)) match {
+            case None => if 
(m.getProject().findProfileById(SnifferGenerator.PROFILE_ID) == null) 
+                                Some(new SnifferGenerator(m))
+                         else None
+            case _ => None
+        }
     }
 
     private def proguard(m : POMModel, l : Lookup) : Option[CodeGenerator] = 
{

diff -r 3f1f76e74cf7 -r 16567632af7f 
generator/src/main/scala/org/mkleint/scalarebel/GroovyGenerator.scala
--- a/generator/src/main/scala/org/mkleint/scalarebel/GroovyGenerator.scala   
  Sun Nov 29 21:53:37 2009 +0100
+++ b/generator/src/main/scala/org/mkleint/scalarebel/GroovyGenerator.scala   
  Tue Dec 01 22:45:59 2009 +0100
@@ -56,14 +56,10 @@
 
                 findPlugin(mavenprj, isGroovyPlugin) match {
                     case None => {
-                         val plugin = factory.createPlugin
-                         if (isPom) {
-                             project.build.pluginManagement += plugin
-                         } else {
-                             project.build += plugin
-                         }
-                         plugin.groupId = groovyPlugin.groupId
-                         plugin.artifactId = groovyPlugin.artifactId
+                         val plugin = 
+                             if (isPom) 
project.build.pluginManagement.plugin(groovyPlugin.groupId, 
groovyPlugin.artifactId)
+                                 else   
project.build.plugin(groovyPlugin.groupId, groovyPlugin.artifactId)
+
                          if (findManagedPlugin(mavenprj, isGroovyPlugin) == 
None) {
                             plugin.version = if (pluginVersion != version) 
pluginVersion 
                                              else {

diff -r 3f1f76e74cf7 -r 16567632af7f 
generator/src/main/scala/org/mkleint/scalarebel/ProGuardGenerator.scala
--- a/generator/src/main/scala/org/mkleint/scalarebel/ProGuardGenerator.scala 
  Sun Nov 29 21:53:37 2009 +0100
+++ b/generator/src/main/scala/org/mkleint/scalarebel/ProGuardGenerator.scala 
  Tue Dec 01 22:45:59 2009 +0100
@@ -67,9 +67,8 @@
                              }
                          if (findManagedPlugin(mavenprj, isProGuard) == 
None) {
                              plugin.version = pluginVersion
-                             val exec = model.getFactory.createExecution
-                             plugin += exec
-                             exec += PROFILE_ID
+                             val exec = plugin.exec(PROFILE_ID)
+                             exec += "proguard"
                              exec.phase = "package"
                              val conf = plugin.configuration
                              conf.setSimpleParameter("attached", "true")

diff -r 3f1f76e74cf7 -r 16567632af7f 
generator/src/main/scala/org/mkleint/scalarebel/RebelGenerator.scala
--- a/generator/src/main/scala/org/mkleint/scalarebel/RebelGenerator.scala    
  Sun Nov 29 21:53:37 2009 +0100
+++ b/generator/src/main/scala/org/mkleint/scalarebel/RebelGenerator.scala    
  Tue Dec 01 22:45:59 2009 +0100
@@ -62,16 +62,14 @@
                 case pack => {
                     plugin.configuration.setSimpleParameter("packaging",
                         if (findPlugin(mavenprj, 
-                                       
exactMatch(Coordinates("org.apache.maven.plugins", "maven-war-plugin"), _)) 
!= None) {
+                                       
exactMatch(Coordinates(DEFAULT_PLUGIN_GROUP, "maven-war-plugin"), _)) != 
None) {
                             "war"
                         } else {
                             "jar"
                         })
                 }
             }
-            val execution = factory.createExecution
-            plugin += execution
-            execution.id = "generate-rebel-xml"
+            val execution = plugin.exec("generate-rebel-xml")
             execution.phase = "process-resources"
             //add generate goal
             execution += "generate"

diff -r 3f1f76e74cf7 -r 16567632af7f 
generator/src/main/scala/org/mkleint/scalarebel/ShaderGenerator.scala
--- a/generator/src/main/scala/org/mkleint/scalarebel/ShaderGenerator.scala   
  Sun Nov 29 21:53:37 2009 +0100
+++ b/generator/src/main/scala/org/mkleint/scalarebel/ShaderGenerator.scala   
  Tue Dec 01 22:45:59 2009 +0100
@@ -63,9 +63,8 @@
                              }
                          if (findManagedPlugin(mavenprj, isShadePlugin) == 
None) {
                              plugin.version = pluginVersion
-                             val exec = model.getFactory.createExecution
-                             plugin += exec
-                             exec += PROFILE_ID
+                             val exec = plugin.exec(PROFILE_ID)
+                             exec += "shade"
                              exec.phase = "package"
                              val conf = plugin.configuration
                              
conf.setSimpleParameter("shadedArtifactAttached", "true")

diff -r 3f1f76e74cf7 -r 16567632af7f 
generator/src/main/scala/org/mkleint/scalarebel/SnifferGenerator.scala
--- a/generator/src/main/scala/org/mkleint/scalarebel/SnifferGenerator.scala  
  Sun Nov 29 21:53:37 2009 +0100
+++ b/generator/src/main/scala/org/mkleint/scalarebel/SnifferGenerator.scala  
  Tue Dec 01 22:45:59 2009 +0100
@@ -40,6 +40,7 @@
 
     def isSnifferPlugin(p : Coordinates) = exactMatch(snifferPlugin, p)
     def isSnifferDependency(p : Coordinates) = exactMatch(snifferDependency, 
p)
+    def isEnforcerPlugin(p : Coordinates) = exactMatch(enforcerPlugin, p)
 
     override def getDisplayName = locMessage("NAME_Sniffer")
 
@@ -50,12 +51,28 @@
     def showDialogAndGenerate(wrapInTransaction : Boolean) : Boolean = {
         val (prj, mavenprj) = modelToProject()
 
-        val (proceed, pluginVersion, profileOnly, signature) = showDialog()
+        val (proceed, pluginVersion, profileOnly, signature, enforcer) = 
showDialog()
 
         if (proceed) {
             generate(wrapInTransaction) {
                 val isPom = "pom" == mavenprj.getPackaging
 
+                if (enforcer) {
+//                    val enfPlg = findPlugin(mavenprj, isEnforcerPlugin) 
match {
+//                        case None => {
+//                            val plugin =
+//                             if (profileOnly) {
+//                               
project.profile(PROFILE_ID).buildBase.plugin(enforcerPlugin.groupId, 
enforcerPlugin.artifactId)
+//                             } else {
+//                                
project.build.plugin(enforcerPlugin.groupId, enforcerPlugin.artifactId)
+//                             }
+//                        }
+//                        case _ => {
+//                            project.getBuild.findPluginById(x$1, x$2)
+//                        }
+//                    }
+                }
+
                 findPlugin(mavenprj, isSnifferPlugin) match {
                     case None => {
                          val plugin =
@@ -66,9 +83,7 @@
                              }
                          if (findManagedPlugin(mavenprj, isSnifferPlugin) == 
None) {
                              plugin.version = pluginVersion
-                             val exec = model.getFactory.createExecution
-                             plugin += exec
-                             exec.id = PROFILE_ID
+                             val exec = plugin.exec(PROFILE_ID)
                              exec += "check"
                              exec.phase = "test"
                              val conf = plugin.configuration
@@ -129,7 +144,7 @@
     }
 
 
-    def showDialog() : (Boolean,  String,  Boolean, Coordinates) = {
+    def showDialog() : (Boolean,  String,  Boolean, Coordinates, Boolean) = {
         var pluginVersion = pluginPrefVersion(snifferPlugin)
         val confNode = 
NbPreferences.root().node("org/mkleint/scalarebel/sniffer") //NOI18N
         val profileOnly = true
@@ -162,7 +177,7 @@
 //            confNode.put("classifier", classifier)
 //            confNode.flush
 //        }
-        ( true, pluginVersion, profileOnly, jdk15)
+        ( true, pluginVersion, profileOnly, jdk15, false)
     }
 }
 

diff -r 3f1f76e74cf7 -r 16567632af7f 
generator/src/main/scala/org/mkleint/scalarebel/convert/RichPlugin.scala
--- 
a/generator/src/main/scala/org/mkleint/scalarebel/convert/RichPlugin.scala  
Sun Nov 29 21:53:37 2009 +0100
+++ 
b/generator/src/main/scala/org/mkleint/scalarebel/convert/RichPlugin.scala  
Tue Dec 01 22:45:59 2009 +0100
@@ -40,6 +40,18 @@
         conf
     }
 
+    def exec(id : String) : PluginExecution = {
+        val exec = original.findExecutionById(id)
+        if (exec == null) {
+            val newone = original.getModel.getFactory.createExecution
+            newone.setId(id)
+            this += newone
+            newone
+        } else {
+            exec
+        }
+    }
+
     def +=(add : POMComponent) : Unit = {
         add match {
             case ex : PluginExecution => original.addExecution(ex)