You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fr...@apache.org on 2007/03/03 00:44:41 UTC
svn commit: r514020 - in
/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo:
helper/XMLDocumentImpl.java impl/FactoryBase.java
model/impl/ModelFactoryImpl.java util/DataObjectUtil.java
Author: frankb
Date: Fri Mar 2 15:44:40 2007
New Revision: 514020
URL: http://svn.apache.org/viewvc?view=rev&rev=514020
Log:
Fix for TUSCANY-1132
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
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/helper/XMLDocumentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java?view=diff&rev=514020&r1=514019&r2=514020
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java Fri Mar 2 15:44:40 2007
@@ -47,6 +47,7 @@
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.ecore.util.ExtendedMetaData;
import org.eclipse.emf.ecore.util.FeatureMap;
+import org.eclipse.emf.ecore.util.FeatureMapUtil;
import org.eclipse.emf.ecore.xmi.XMLResource;
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
import org.xml.sax.InputSource;
@@ -167,7 +168,7 @@
}
if (oldContainer != documentRoot || oldContainmentReference != rootElement)
{
- if (oldContainmentReference != null && oldContainmentReference.isMany())
+ if (oldContainmentReference != null && FeatureMapUtil.isMany(oldContainer, oldContainmentReference))
{
oldContainmentIndex = ((List)oldContainer.eGet(oldContainmentReference)).indexOf(rootObject);
}
@@ -186,7 +187,7 @@
{
if (oldContainer != documentRoot || oldContainmentReference != rootElement)
{
- if (oldContainmentReference.isMany())
+ if (FeatureMapUtil.isMany(oldContainer, oldContainmentReference))
{
((List)oldContainer.eGet(oldContainmentReference)).add(oldContainmentIndex, rootObject);
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java?view=diff&rev=514020&r1=514019&r2=514020
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java Fri Mar 2 15:44:40 2007
@@ -33,7 +33,6 @@
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.impl.EPackageImpl;
import commonj.sdo.DataObject;
@@ -248,7 +247,7 @@
// private EMF-specific methods
- private static class SDOEFactoryImpl extends EFactoryImpl
+ private static class SDOEFactoryImpl extends DynamicDataObjectImpl.FactoryImpl
{
protected FactoryBase sdoFactory;
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java?view=diff&rev=514020&r1=514019&r2=514020
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java Fri Mar 2 15:44:40 2007
@@ -55,7 +55,9 @@
* 6. Comment out the call to registerStaticTypes of ModelFactory.class in the init() method
* 7. Change org.apache.tuscany.sdo.model.DataObject.class to commonj.sdo.DataObject.class for the following method found in method initializeMetaData();
* initializeType(dataObjectType, commonj.sdo.DataObject.class, "DataObject", true); // generated as org.apache.tuscany.sdo.model.DataObject.class
- * 8. Move this JavaDoc comment into the newly generated ModelFactoryImpl class.
+ * 8. Add the following case to the generated create() method:
+ * case DATA_OBJECT: return SDOFactory.eINSTANCE.createAnyTypeDataObject();
+ * 9. Move this JavaDoc comment into the newly generated ModelFactoryImpl class.
* <!-- end-user-doc -->
* @generated
*/
@@ -160,7 +162,7 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated NOT
*/
public DataObject create(int typeNumber)
{
@@ -172,6 +174,7 @@
case TYPE: return (DataObject)createType();
case TYPES: return (DataObject)createTypes();
case XSD_TYPE: return (DataObject)createXSDType();
+ case DATA_OBJECT: return SDOFactory.eINSTANCE.createAnyTypeDataObject();
default:
return super.create(typeNumber);
}
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=514020&r1=514019&r2=514020
==============================================================================
--- 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 Fri Mar 2 15:44:40 2007
@@ -2534,7 +2534,7 @@
boolean first = path.length() == 0;
Property property = dataObject.getContainmentProperty();
- if (property.isMany())
+ if (SDOUtil.isMany(property, dataObject))
{
List list = container.getList(property);
int pos = list.indexOf(dataObject);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org