svn commit: r1351167 - in /ant/sandbox/antdsl: build.xml org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDslXTextProjectHelper.java

[hibou]

Author: hibou
Date: Sun Jun 17 21:18:14 2012
New Revision: 1351167

URL: http://svn.apache.org/viewvc?rev=1351167&view=rev
Log:
Fix xtext parser

Modified:
    ant/sandbox/antdsl/build.xml
    
ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDslXTextProjectHelper.java

Modified: ant/sandbox/antdsl/build.xml
URL: 
http://svn.apache.org/viewvc/ant/sandbox/antdsl/build.xml?rev=1351167&r1=1351166&r2=1351167&view=diff
==============================================================================
--- ant/sandbox/antdsl/build.xml (original)
+++ ant/sandbox/antdsl/build.xml Sun Jun 17 21:18:14 2012
@@ -100,7 +100,7 @@
     </target>
 
     <target name="test-xtext" description="Test the run of an antdsl file with 
Xtext-generated parser">
-        <typedef 
classname="org.apache.ant.antdsl.antmodel.xtext.AntDslXtextProjectHelper" 
name="antDslProjectHelper">
+        <typedef 
classname="org.apache.ant.antdsl.xtext.AntDslXTextProjectHelper" 
name="antDslProjectHelper">
             <classpath>
                 <fileset dir="${basedir}/lib" includes="*.jar" />
                 <pathelement path="${basedir}/build/antdsl.jar" />

Modified: 
ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDslXTextProjectHelper.java
URL: 
http://svn.apache.org/viewvc/ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDslXTextProjectHelper.java?rev=1351167&r1=1351166&r2=1351167&view=diff
==============================================================================
--- 
ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDslXTextProjectHelper.java
 (original)
+++ 
ant/sandbox/antdsl/org.apache.ant.antdsl/src/org/apache/ant/antdsl/xtext/AntDslXTextProjectHelper.java
 Sun Jun 17 21:18:14 2012
@@ -223,6 +223,7 @@ public class AntDslXTextProjectHelper ex
                 for (ETask t : if_.getTasks().getTasks()) {
                     main.addTask(mapTask(project, context, t));
                 }
+                ifTask.setMain(main);
             }
             EList<EConditionedTasks> elseifs = eBranch.getElseif();
             if (elseifs != null) {
@@ -233,6 +234,7 @@ public class AntDslXTextProjectHelper ex
                     for (ETask t : elseif.getTasks().getTasks()) {
                         ei.addTask(mapTask(project, context, t));
                     }
+                    ifTask.addElseIf(ei);
                 }
             }
             ETaskLists else_ = eBranch.getElse();
@@ -254,7 +256,7 @@ public class AntDslXTextProjectHelper ex
             return null;
         }
         InnerElement innerElement = new InnerElement();
-        innerElement.ns = eInnerElement.getName().getName();
+        innerElement.ns = eInnerElement.getName().getNamespace();
         innerElement.name = eInnerElement.getName().getName();
 
         EArguments arguments = eInnerElement.getArguments();