You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2009/06/30 15:34:37 UTC

svn commit: r789720 - in /incubator/uima/uimaj/trunk: uimaj-distr/src/main/assembly/bin.xml uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java

Author: joern
Date: Tue Jun 30 13:34:37 2009
New Revision: 789720

URL: http://svn.apache.org/viewvc?rev=789720&view=rev
Log:
UIMA-1326 Applied patches provided by Burn Lewis

Modified:
    incubator/uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml
    incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java

Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml?rev=789720&r1=789719&r2=789720&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/assembly/bin.xml Tue Jun 30 13:34:37 2009
@@ -200,6 +200,8 @@
       <outputDirectory>/apache-uima/examples/src</outputDirectory>
       <excludes>
         <exclude> org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java</exclude>
+        <exclude> org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java</exclude>
+        <exclude> org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java</exclude>
       </excludes>
     </fileSet>
     <fileSet>
@@ -251,5 +253,15 @@
       <outputDirectory>/apache-uima/examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
       <fileMode>644</fileMode> 
     </file>
+    <file>
+      <source>../uimaj-examples/src/main/java/org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java</source>
+      <outputDirectory>/apache-uima/examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
+      <fileMode>644</fileMode> 
+    </file>
+    <file>
+      <source>../uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java</source>
+      <outputDirectory>/apache-uima/examples/ecore_src/org/apache/uima/examples/xmi</outputDirectory>
+      <fileMode>644</fileMode> 
+    </file>
   </files>
 </assembly>
\ No newline at end of file

Modified: incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java?rev=789720&r1=789719&r2=789720&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java Tue Jun 30 13:34:37 2009
@@ -185,7 +185,7 @@
         String supertypeName = type.getSupertypeName();
         EClassifier superclass = lookupEClassifierForType(supertypeName); // creates EClass if not
         // already existing
-        eclass.getESuperTypes().add(superclass);
+        eclass.getESuperTypes().add((EClass)superclass);
 
         // set features
         FeatureDescription[] features = type.getFeatures();