Index: lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl
diff -u lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl:1.13 lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl:1.14
--- lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl:1.13	Mon Dec  6 18:40:04 2004
+++ lutingenerator/src/xsl/xmi1.2ToObjectModel.xsl	Fri Apr 22 17:06:29 2005
@@ -6,6 +6,7 @@
                 xmlns:redirect="http://xml.apache.org/xalan/redirect"
                 extension-element-prefixes="extensions redirect"
                 xmlns="http://www.codelutin.org/lutingenerator/objectModel"
+                xmlns:packageValidator="xalan://org.codelutin.generator.PackageValidator"
                 xmlns:UML="org.omg.xmi.namespace.UML">
 
   <xsl:output method="xml" 
@@ -13,18 +14,10 @@
               indent="yes" 
               xalan:indent-amount="2"/>
 
-
-              
-
-
-              
-
-             
-
-
             
   <!-- processing entry point. We'll process everything from that root package path. Everything else is ignored -->
   <xsl:param name="fullPackagePath"/>
+  <xsl:param name="extraPackages"/>
 
   
               
@@ -35,7 +28,7 @@
   .
   .
   -->
-  
+
   <xsl:template match="/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement">
     <xsl:element name="objectModel">
       <xsl:attribute name="name">
@@ -69,7 +62,7 @@
       <xsl:value-of select="@name"/>
     </xsl:variable>
 
-     <xsl:variable name="localPackageName">
+    <xsl:variable name="localPackageName">
       <xsl:value-of select="$parentLocalPackageName"/>
       <xsl:value-of select="$packageName"/>
     </xsl:variable>
@@ -79,14 +72,14 @@
     </xsl:variable>
 
     <xsl:choose>
-      <xsl:when test="starts-with($fullPackagePath, $localPackageNameDot)">
+      <xsl:when test="packageValidator:toContinue($fullPackagePath, $localPackageNameDot, $extraPackages)">
         <xsl:apply-templates> 
           <xsl:with-param name="parentLocalPackageName">
             <xsl:value-of select="$localPackageNameDot"/>
           </xsl:with-param>
         </xsl:apply-templates>
       </xsl:when>
-      <xsl:when test="starts-with($localPackageName, $fullPackagePath)">
+      <xsl:when test="packageValidator:isValid($fullPackagePath, $localPackageNameDot, $extraPackages)">
         <xsl:for-each select="UML:Namespace.ownedElement/UML:Class">
           <xsl:call-template name="UMLClass">
             <xsl:with-param name="localPackageName">
@@ -113,27 +106,11 @@
             <xsl:value-of select="$localPackageNameDot"/>
           </xsl:with-param>
         </xsl:apply-templates>
-      </xsl:when>
+	</xsl:when>
     </xsl:choose>
   </xsl:template>
 
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
+ 
   
   <!-- 
   .