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 2006/11/18 23:15:23 UTC
svn commit: r476622 [1/4] - in /incubator/tuscany/java/sdo:
impl/src/main/java/org/apache/tuscany/sdo/helper/
impl/src/main/java/org/apache/tuscany/sdo/impl/
tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/
tools/src/main/java/org/a...
Author: frankb
Date: Sat Nov 18 14:15:22 2006
New Revision: 476622
URL: http://svn.apache.org/viewvc?view=rev&rev=476622
Log:
Fixed many noEMF generator problems
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
incubator/tuscany/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java
incubator/tuscany/java/sdo/tools/templates/models/SDOClass.javajet
incubator/tuscany/java/sdo/tools/templates/models/SDOFactoryClass.javajet
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=476622&r1=476621&r2=476622
==============================================================================
--- 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 Sat Nov 18 14:15:22 2006
@@ -186,7 +186,7 @@
XSDSchema schema = (XSDSchema)schemaIter.next();
EPackage ePackage = extendedMetaData.getPackage(schema.getTargetNamespace());
- if (ePackage == null)
+ if (ePackage == null) //FB Comment out this line to regenerate sdoModel.xsd
{
Collection originalEPackages = new HashSet(ecoreBuilder.getTargetNamespaceToEPackageMap().values());
ecoreBuilder.generate(schema);
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java?view=diff&rev=476622&r1=476621&r2=476622
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java Sat Nov 18 14:15:22 2006
@@ -232,9 +232,14 @@
}
}
- protected boolean isProxy()
+ protected boolean isProxy() // FB TODO : regen models and then remove this method
{
return eIsProxy();
+ }
+
+ protected boolean isProxy(Object object)
+ {
+ return ((EObject)object).eIsProxy();
}
protected Object resolveProxy(Object proxy)
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=476622&r1=476621&r2=476622
==============================================================================
--- 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 Sat Nov 18 14:15:22 2006
@@ -19,8 +19,6 @@
*/
package org.apache.tuscany.sdo.impl;
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-import org.apache.tuscany.sdo.model.impl.ModelPackageImpl;
import org.apache.tuscany.sdo.util.DataObjectUtil;
import org.eclipse.emf.ecore.EAnnotation;
import org.eclipse.emf.ecore.EAttribute;
@@ -68,6 +66,16 @@
return null;
}
+ public Object createFromString(int typeNumber, String stringValue)
+ {
+ return ((SDOEFactoryImpl)getEFactoryInstance()).createFromString(typeNumber, stringValue);
+ }
+
+ public String convertToString(int typeNumber, Object objectValue)
+ {
+ return ((SDOEFactoryImpl)getEFactoryInstance()).convertToString(typeNumber, objectValue);
+ }
+
protected Type createType(boolean isDataType, int typeNumber)
{
if (isDataType)
@@ -195,18 +203,6 @@
return ePackage instanceof FactoryBase ? (Object)ePackage : (Object)ePackage.getEFactoryInstance();
}
- // default implementation of createFromString
- public Object createFromString(Type type, String stringValue, int propertyValue)
- {
- return (String)ModelFactoryImpl.eINSTANCE.createFromString(ModelPackageImpl.Literals.STRING, stringValue);
- }
-
- // default implementation of convertToString
- public String convertToString(Type type, Object objectValue, int propertyValue)
- {
- return ModelFactoryImpl.eINSTANCE.convertToString(ModelPackageImpl.Literals.STRING, objectValue);
- }
-
// private EMF-specific methods
private static class SDOEFactoryImpl extends EFactoryImpl
@@ -229,12 +225,22 @@
public Object createFromString(EDataType eDataType, String stringValue)
{
- return sdoFactory.createFromString((Type)eDataType, stringValue, eDataType.getClassifierID());
+ return sdoFactory.createFromString(eDataType.getClassifierID(), stringValue);
}
public String convertToString(EDataType eDataType, Object objectValue)
{
- return sdoFactory.convertToString((Type)eDataType, objectValue, eDataType.getClassifierID());
+ return sdoFactory.convertToString(eDataType.getClassifierID(), objectValue);
+ }
+
+ protected Object createFromString(int typeNumber, String stringValue)
+ {
+ return super.createFromString((EDataType)sdoFactory.getEClassifiers().get(typeNumber), stringValue);
+ }
+
+ protected String convertToString(int typeNumber, Object objectValue)
+ {
+ return super.convertToString((EDataType)sdoFactory.getEClassifiers().get(typeNumber), objectValue);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org