svn commit: r766464 - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/component/ tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/ tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/

[bo...@apache.org]

Author: bommel
Date: Sun Apr 19 13:16:25 2009
New Revision: 766464

URL: http://svn.apache.org/viewvc?rev=766464&view=rev
Log:
fixed errors in jsf 1.2 build

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java
    myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg
    myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/tag1.2.stg

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java?rev=766464&r1=766463&r2=766464&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/AbstractUITreeNode.java Sun Apr 19 13:16:25 2009
@@ -19,6 +19,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.event.TreeExpansionListener;
 import org.apache.myfaces.tobago.event.TreeExpansionEvent;
 import org.apache.myfaces.tobago.model.MixedTreeModel;
 import org.apache.myfaces.tobago.model.TreePath;
@@ -286,6 +287,19 @@
 
   public abstract void setTreeExpansionListener(MethodBinding treeExpansionListener);
 
+  public void addTreeExpansionListener(TreeExpansionListener listener) {
+    addFacesListener(listener);
+  }
+
+  public TreeExpansionListener[] getTreeExpansionListeners() {
+    return (TreeExpansionListener[]) getFacesListeners(TreeExpansionListener.class);
+  }
+
+  public void removeStateChangeListener(TreeExpansionListener listener) {
+    removeFacesListener(listener);
+  }
+
+
   public abstract void setExpanded(Boolean expanded);
 
   public abstract void setMarked(Boolean b);

Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java?rev=766464&r1=766463&r2=766464&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionListener.java Sun Apr 19 13:16:25 2009
@@ -1,6 +1,8 @@
 package org.apache.myfaces.tobago.event;
 
-public interface TreeExpansionListener {
+import javax.faces.event.FacesListener;
+
+public interface TreeExpansionListener  extends FacesListener {
 
   void treeExpanded(TreeExpansionEvent event);
 }

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg?rev=766464&r1=766463&r2=766464&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg Sun Apr 19 13:16:25 2009
@@ -345,7 +345,7 @@
 field() ::= <<
 <if(it.elAlternativeAvailable)>
 <else>
-private <it.type> <it.propertyName>;
+private <it.internalType> <it.propertyName>;
 <endif>
 >>
 

Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/tag1.2.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/tag1.2.stg?rev=766464&r1=766463&r2=766464&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/tag1.2.stg (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/tag1.2.stg Sun Apr 19 13:16:25 2009
@@ -225,7 +225,7 @@
   if (!<it.propertyName>.isLiteralText()) {
     <createValueBinding(it)>
   } else {
-    component.set<it.upperCamelCaseName>(org.apache.myfaces.tobago.layout.Measure.parse(<it.propertyName>));
+    component.set<it.upperCamelCaseName>(org.apache.myfaces.tobago.layout.Measure.parse(<it.propertyName>.getExpressionString()));
   }
 }
 >>