Author: frankb
Date: Tue Sep 12 09:42:00 2006
New Revision: 442644
URL: http://svn.apache.org/viewvc?view=rev&rev=442644
Log:
Fix for TUSCANY-714
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java?view=diff&rev=442644&r1=442643&r2=442644
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
Tue Sep 12 09:42:00 2006
@@ -2409,36 +2409,25 @@
if (registrations == null)
{
Map result = new HashMap();
-
- if
(!(Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.datagraph"))
instanceof DataGraphResourceFactoryImpl))
- {
- result.put("datagraph", new DataGraphResourceFactoryImpl());
- }
- if
(!(Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.ecore"))
instanceof EcoreResourceFactoryImpl))
- {
- result.put("ecore", new EcoreResourceFactoryImpl());
- }
-
- if
(!(Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.emof"))
instanceof EMOFResourceFactoryImpl))
- {
- result.put("emof", new EMOFResourceFactoryImpl());
- }
-
- if
(!(Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.xsd"))
instanceof XSDResourceFactoryImpl))
- {
- result.put("xsd", new XSDResourceFactoryImpl());
- }
-
- if
(!(Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.wsdl"))
instanceof XSDResourceFactoryImpl))
- {
- result.put("wsdl", new XSDResourceFactoryImpl());
- }
-
- if
(!(Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.*"))
instanceof SDOXMLResourceFactoryImpl))
- {
- result.put("*", new SDOXMLResourceFactoryImpl());
- }
-
+
+ Resource.Factory factory =
Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.datagraph"));
+ result.put("datagraph", factory instanceof DataGraphResourceFactoryImpl
? factory : new DataGraphResourceFactoryImpl());
+
+ factory =
Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.ecore"));
+ result.put("ecore", factory instanceof EcoreResourceFactoryImpl ?
factory : new EcoreResourceFactoryImpl());
+
+ factory =
Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.emof"));
+ result.put("emof", factory instanceof EMOFResourceFactoryImpl ? factory
: new EMOFResourceFactoryImpl());
+
+ factory =
Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.xsd"));
+ result.put("xsd", factory instanceof XSDResourceFactoryImpl ? factory :
new XSDResourceFactoryImpl());
+
+ factory =
Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.wsdl"));
+ result.put("wsdl", factory instanceof XSDResourceFactoryImpl ? factory :
new XSDResourceFactoryImpl());
+
+ factory =
Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.*"));
+ result.put("*", factory instanceof SDOXMLResourceFactoryImpl ? factory :
new SDOXMLResourceFactoryImpl());
+
registrations = result;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
