You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by aw...@apache.org on 2007/10/13 22:45:37 UTC

svn commit: r584452 - in /myfaces/trinidad-maven/trunk: maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/ maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/

Author: awiner
Date: Sat Oct 13 13:45:36 2007
New Revision: 584452

URL: http://svn.apache.org/viewvc?rev=584452&view=rev
Log:
TRINIDAD-756: Event delivery phases get overwritten
- Patch from Bud Osterberg

Modified:
    myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventRefBean.java
    myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java

Modified: myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventRefBean.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventRefBean.java?rev=584452&r1=584451&r2=584452&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventRefBean.java (original)
+++ myfaces/trinidad-maven/trunk/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/parse/EventRefBean.java Sat Oct 13 13:45:36 2007
@@ -59,7 +59,20 @@
   public void setEventDeliveryPhases(
     String[] deliveryPhases)
   {
-    _deliveryPhases = deliveryPhases;
+    if ((_deliveryPhases != null) && (_deliveryPhases.length > 0))
+    {
+      int oldLen = _deliveryPhases.length;
+      int newLen = deliveryPhases.length;
+      String[] newDeliveryPhases = new String[oldLen + newLen];
+      System.arraycopy(_deliveryPhases, 0, newDeliveryPhases, 0, oldLen);
+      System.arraycopy(deliveryPhases, 0, newDeliveryPhases, oldLen, newLen);
+      _deliveryPhases = newDeliveryPhases;
+    }
+    else
+    {
+      _deliveryPhases = deliveryPhases;
+    }
+    
   }
 
   /**

Modified: myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java?rev=584452&r1=584451&r2=584452&view=diff
==============================================================================
--- myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java (original)
+++ myfaces/trinidad-maven/trunk/maven-tagdoc-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/tagdoc/TagdocReport.java Sat Oct 13 13:45:36 2007
@@ -967,7 +967,7 @@
       for (int i = 0; i < phases.length; i++)
       {
         if (i > 0)
-          out.write("<br/>");
+          out.write(",<br/>");
         out.write((String) phases[i]);
       }