svn commit: r669283 - /myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java

[sk...@apache.org]

Author: skitching
Date: Wed Jun 18 13:35:52 2008
New Revision: 669283

URL: http://svn.apache.org/viewvc?rev=669283&view=rev
Log:
Fix logic to determine whether to calculate innersource now that ClassMeta property meanings have changed.
New code is also simpler.

Modified:
    myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java

Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java?rev=669283&r1=669282&r2=669283&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java Wed Jun 18 13:35:52 2008
@@ -345,14 +345,7 @@
         Context context = new VelocityContext(baseContext);
         context.put("component", component);
 
-        //Part of the content source in the source class should be
-        //included only if this class is not its parent class and is
-        //not the same class (class outside the hierarchy).
-        //One example of why is useful do this is in 
-        //javax.faces.component.HtmlDataTable (myfaces 1.1),
-        //in this class it is overriden encodeBegin.
-        if (!component.getSourceClassName().equals(component.getClassName()) &&
-            !component.getSourceClassName().equals(component.getSourceClassParentClassName()))
+        if (Boolean.TRUE.equals(component.isTemplate()))
         {
             String source = this.getInnerSourceCode(builder, component);