Author: frankb
Date: Tue Feb 27 12:59:04 2007
New Revision: 512405
URL: http://svn.apache.org/viewvc?view=rev&rev=512405
Log:
Fix for TUSCANY-1141
Modified:
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
Modified:
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java?view=diff&rev=512405&r1=512404&r2=512405
==============================================================================
---
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
(original)
+++
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
Tue Feb 27 12:59:04 2007
@@ -345,10 +345,11 @@
for (Iterator iter = packageList.iterator(); iter.hasNext();)
{
EPackage currentEPackage = (EPackage)iter.next();
- String currentBasePackage = extractBasePackageName(currentEPackage,
javaPackage);
- String currentPrefix = prefix == null ? CodeGenUtil.capName(shortName !=
null ? shortName : currentEPackage.getName()) : prefix;
+ boolean generateCurrent = currentEPackage.getNsURI().equals(packageURI);
+ String currentBasePackage = extractBasePackageName(currentEPackage,
generateCurrent ? javaPackage : null);
+ String currentPrefix = generateCurrent && prefix != null ? prefix :
CodeGenUtil.capName(shortName != null ? shortName : currentEPackage.getName());
GenPackage currentGenPackage = createGenPackage(currentEPackage,
currentBasePackage, currentPrefix, genOptions, resourceSet);
- if (currentEPackage.getNsURI().equals(packageURI))
+ if (generateCurrent)
{
genModel = currentGenPackage.getGenModel();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
