Author: frankb
Date: Tue Feb 27 14:31:01 2007
New Revision: 512457
URL: http://svn.apache.org/viewvc?view=rev&rev=512457
Log:
Fix for TUSCANY-1130
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java?view=diff&rev=512457&r1=512456&r2=512457
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
Tue Feb 27 14:31:01 2007
@@ -70,14 +70,6 @@
}
/**
- * @deprecated
- */
- public SDOXSDEcoreBuilder(ExtendedMetaData extendedMetaData)
- {
- this(extendedMetaData, false);
- }
-
- /**
* Overrides method in EMF. This will cause the SDO Properties to be in the
* order in which the Attributes appeared in the XSD.
*/
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java?view=diff&rev=512457&r1=512456&r2=512457
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
Tue Feb 27 14:31:01 2007
@@ -70,16 +70,19 @@
public class XSDHelperImpl implements XSDHelper
{
protected boolean extensibleNamespaces = false;
+ protected XSDEcoreBuilder ecoreBuilder;
+ protected ExtendedMetaData extendedMetaData;
- private XSDEcoreBuilder ecoreBuilder;
-
- private ExtendedMetaData extendedMetaData;
+ private static synchronized XSDEcoreBuilder
createXSDEcoreBuilder(ExtendedMetaData extendedMetaData, boolean
extensibleNamespaces)
+ {
+ return new SDOXSDEcoreBuilder(extendedMetaData, extensibleNamespaces);
+ }
public XSDHelperImpl(ExtendedMetaData extendedMetaData, String
redefineBuiltIn, boolean extensibleNamespaces)
{
this.extendedMetaData = extendedMetaData;
this.extensibleNamespaces = extensibleNamespaces;
- ecoreBuilder = new SDOXSDEcoreBuilder(extendedMetaData,
extensibleNamespaces);
+ ecoreBuilder = createXSDEcoreBuilder(extendedMetaData,
extensibleNamespaces);
// Add the built-in models to the targetNamespaceToEPackageMap so they
can't be (re)defined/overridden
for (Iterator iter = TypeHelperImpl.getBuiltInModels().iterator();
iter.hasNext(); ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
