You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by kw...@apache.org on 2006/08/17 00:44:42 UTC
svn commit: r432058 - in
/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb:
graphbuilder/schema/ESchemaMaker.java merge/impl/GraphMerger.java
Author: kwilliams
Date: Wed Aug 16 15:44:41 2006
New Revision: 432058
URL: http://svn.apache.org/viewvc?rev=432058&view=rev
Log:
Applying Brent's patch for TUSCANY-571: Replace reference to ePackage with SDO equivalent
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java?rev=432058&r1=432057&r2=432058&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java Wed Aug 16 15:44:41 2006
@@ -21,16 +21,15 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import org.apache.tuscany.das.rdb.config.Relationship;
import org.apache.tuscany.das.rdb.config.wrapper.MappingWrapper;
import org.apache.tuscany.das.rdb.graphbuilder.impl.GraphBuilderMetadata;
import org.apache.tuscany.das.rdb.graphbuilder.impl.ResultMetadata;
import org.apache.tuscany.das.rdb.util.DebugUtil;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
import org.apache.tuscany.sdo.util.DataObjectUtil;
import org.apache.tuscany.sdo.util.SDOUtil;
-import org.eclipse.emf.ecore.EPackage;
import commonj.sdo.Property;
import commonj.sdo.Type;
@@ -188,10 +187,11 @@
public Type createTypes(String uri) {
Type rootType = SDOUtil.createType(typeHelper, getURI() + "/DataGraphRoot", "DataGraphRoot", false);
- EPackage pkg = ((TypeHelperImpl)typeHelper).getExtendedMetaData().getPackage(uri);
- if ( pkg == null )
+ List types = SDOUtil.getTypes(typeHelper, uri);
+ if ( types == null )
throw new RuntimeException("SDO Types have not been registered for URI " + uri);
- Iterator i = pkg.getEClassifiers().iterator();
+
+ Iterator i = types.iterator();
while ( i.hasNext() ) {
Type type = (Type) i.next();
Property property = SDOUtil.createProperty(rootType, type.getName(), type);
Modified: incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java?rev=432058&r1=432057&r2=432058&view=diff
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java (original)
+++ incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java Wed Aug 16 15:44:41 2006
@@ -28,10 +28,8 @@
import org.apache.tuscany.das.rdb.config.wrapper.QualifiedColumn;
import org.apache.tuscany.das.rdb.graphbuilder.impl.MultiTableRegistry;
import org.apache.tuscany.das.rdb.graphbuilder.impl.TableRegistry;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
import org.apache.tuscany.sdo.impl.ChangeSummaryImpl;
import org.apache.tuscany.sdo.util.SDOUtil;
-import org.eclipse.emf.ecore.EPackage;
import commonj.sdo.ChangeSummary;
import commonj.sdo.DataGraph;
@@ -66,12 +64,11 @@
Type rootType = SDOUtil.createType(typeHelper, uri + "/DataGraphRoot",
"DataGraphRoot", false);
- EPackage pkg = ((TypeHelperImpl) typeHelper).getExtendedMetaData()
- .getPackage(config.getDataObjectModel());
- if (pkg == null)
- throw new RuntimeException(
- "SDO Types have not been registered for URI " + uri);
- Iterator i = pkg.getEClassifiers().iterator();
+ List types = SDOUtil.getTypes(typeHelper, config.getDataObjectModel());
+ if ( types == null )
+ throw new RuntimeException("SDO Types have not been registered for URI " + config.getDataObjectModel());
+
+ Iterator i = types.iterator();
while (i.hasNext()) {
Type type = (Type) i.next();
Property property = SDOUtil.createProperty(rootType,
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org