svn commit: r469238 - in /incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo: helper/SDOExtendedMetaDataImpl.java util/SDOUtil.java

[kelvingoodson]

Author: kelvingoodson
Date: Mon Oct 30 11:22:12 2006
New Revision: 469238

URL: http://svn.apache.org/viewvc?view=rev&rev=469238
Log:
TUSCANY-829 addressing Frank's point 3 in his comment of 26th Oct on this Jira 
-- making the empty string equivalent to null when considering namespaces for 
type definitions/lookup.

Modified:
    
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
    
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java

Modified: 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java?view=diff&rev=469238&r1=469237&r2=469238
==============================================================================
--- 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
 (original)
+++ 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
 Mon Oct 30 11:22:12 2006
@@ -27,6 +27,7 @@
 import org.apache.tuscany.sdo.SDOExtendedMetaData;
 import org.eclipse.emf.ecore.EAnnotation;
 import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EPackage.Registry;
 import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
 
@@ -50,6 +51,12 @@
 
   public SDOExtendedMetaDataImpl(String annotationURI, Registry registry) {
     super(annotationURI, registry);
+  }
+  
+  public EPackage getPackage(String namespace)
+  {
+    if ("".equals(namespace)) namespace = null; //FB
+    return super.getPackage(namespace);
   }
 
   /**

Modified: 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java?view=diff&rev=469238&r1=469237&r2=469238
==============================================================================
--- 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
 (original)
+++ 
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
 Mon Oct 30 11:22:12 2006
@@ -376,6 +376,7 @@
   public static Type createType(TypeHelper scope, String uri, String name, 
boolean isDataType)
   {
     ExtendedMetaData extendedMetaData = 
((TypeHelperImpl)scope).getExtendedMetaData();
+    if ("".equals(uri)) uri = null; //FB
     
     EPackage ePackage = extendedMetaData.getPackage(uri);
     if (ePackage == null)
@@ -383,7 +384,7 @@
       ePackage = EcoreFactory.eINSTANCE.createEPackage();
       ePackage.setEFactoryInstance(new DynamicDataObjectImpl.FactoryImpl());
       ePackage.setNsURI(uri);
-      String packagePrefix = 
URI.createURI(uri).trimFileExtension().lastSegment();
+      String packagePrefix = uri != null ? 
URI.createURI(uri).trimFileExtension().lastSegment() : ""; //FB
       ePackage.setName(packagePrefix);
       ePackage.setNsPrefix(packagePrefix);
       extendedMetaData.putPackage(uri, ePackage);



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]