Author: frankb
Date: Fri Nov 3 15:18:02 2006
New Revision: 471047
URL: http://svn.apache.org/viewvc?view=rev&rev=471047
Log:
Enable implementation for SDO 2.1 interfaces
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java?view=diff&rev=471047&r1=471046&r2=471047
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
Fri Nov 3 15:18:02 2006
@@ -28,6 +28,8 @@
import java.text.SimpleDateFormat;
+import commonj.sdo.Property;
+import commonj.sdo.Type;
import commonj.sdo.helper.DataHelper;
/**
@@ -466,4 +468,15 @@
return toYearMonthDay(calendar.getTime());
}
+
+ public Object convert(Type type, Object value)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object convert(Property property, Object value)
+ {
+ throw new UnsupportedOperationException();
+ }
+
}
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java?view=diff&rev=471047&r1=471046&r2=471047
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
Fri Nov 3 15:18:02 2006
@@ -27,6 +27,9 @@
import java.io.StringWriter;
import java.io.Writer;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+
import org.eclipse.emf.ecore.util.ExtendedMetaData;
import commonj.sdo.DataObject;
@@ -83,6 +86,11 @@
return document;
}
+ public XMLDocument load(Source inputSource, String locationURI, Object
options) throws IOException
+ {
+ throw new UnsupportedOperationException();
+ }
+
public String save(DataObject dataObject, String rootElementURI, String
rootElementName)
{
StringWriter stringWriter = new StringWriter();
@@ -110,7 +118,12 @@
public void save(XMLDocument xmlDocument, Writer outputWriter, Object
options) throws IOException
{
((XMLDocumentImpl)xmlDocument).save(outputWriter, options);
- }
+ }
+
+ public void save(XMLDocument xmlDocument, Result outputResult, Object
options) throws IOException
+ {
+ throw new UnsupportedOperationException();
+ }
public XMLDocument createDocument(DataObject dataObject, String
rootElementURI, String rootElementName)
{
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java?view=diff&rev=471047&r1=471046&r2=471047
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
Fri Nov 3 15:18:02 2006
@@ -161,6 +161,26 @@
return featureMap;
}
}
+
+ public boolean isNullable()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isOpenContent()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public List getInstanceProperties()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object get(Property property)
+ {
+ throw new UnsupportedOperationException();
+ }
/////////////////////////////////////////////////////////////////////////////////////////////////////////
// org.apache.tuscany.sdo.model.Property methods
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java?view=diff&rev=471047&r1=471046&r2=471047
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
Fri Nov 3 15:18:02 2006
@@ -198,7 +198,17 @@
}
protected Map propertyNameToPropertyMap;
+
+ public List getInstanceProperties()
+ {
+ throw new UnsupportedOperationException();
+ }
+ public Object get(Property property)
+ {
+ throw new UnsupportedOperationException();
+ }
+
/////////////////////////////////////////////////////////////////////////////////////////////////////////
// org.apache.tuscany.sdo.model.Type method implementations
/////////////////////////////////////////////////////////////////////////////////////////////////////////
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java?view=diff&rev=471047&r1=471046&r2=471047
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
Fri Nov 3 15:18:02 2006
@@ -1282,6 +1282,14 @@
* <!-- end-user-doc -->
* @generated NOT
*/
+ public Property getInstanceProperty(String propertyName)
+ {
+ return DataObjectUtil.getProperty(this, propertyName);
+ }
+
+ /**
+ * @deprecated
+ */
public Property getProperty(String propertyName)
{
return DataObjectUtil.getProperty(this, propertyName);
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java?view=diff&rev=471047&r1=471046&r2=471047
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
Fri Nov 3 15:18:02 2006
@@ -167,7 +167,17 @@
{
return null;
}
+
+ public List getInstanceProperties()
+ {
+ throw new UnsupportedOperationException();
+ }
+ public Object get(Property property)
+ {
+ throw new UnsupportedOperationException();
+ }
+
/////////////////////////////////////////////////////////////////////////////////////////////////////////
// org.apache.tuscany.sdo.model.Type method implementations
/////////////////////////////////////////////////////////////////////////////////////////////////////////
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java?view=diff&rev=471047&r1=471046&r2=471047
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
Fri Nov 3 15:18:02 2006
@@ -169,5 +169,15 @@
{
return false;
}
+
+ public List getInstanceProperties()
+ {
+ throw new UnsupportedOperationException();
+ }
+ public Object get(Property property)
+ {
+ throw new UnsupportedOperationException();
+ }
+
} //EnumTypeImpl
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java?view=diff&rev=471047&r1=471046&r2=471047
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
Fri Nov 3 15:18:02 2006
@@ -131,7 +131,27 @@
{
return (Property)getEOpposite();
}
+
+ public boolean isNullable()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isOpenContent()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public List getInstanceProperties()
+ {
+ throw new UnsupportedOperationException();
+ }
+ public Object get(Property property)
+ {
+ throw new UnsupportedOperationException();
+ }
+
/////////////////////////////////////////////////////////////////////////////////////////////////////////
// org.apache.tuscany.sdo.model.Property methods
/////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -203,7 +223,7 @@
public boolean isSetContainment() {
return isContainment();
}
-
+
/////////////////////////////////////////////////////////////////////////////////////////////////////////
// DataObject method implementations
/////////////////////////////////////////////////////////////////////////////////////////////////////////
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java?view=diff&rev=471047&r1=471046&r2=471047
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
Fri Nov 3 15:18:02 2006
@@ -110,12 +110,28 @@
featureMap.add(index, (EStructuralFeature)property, value);
}
+ /**
+ * @deprecated
+ */
public void add(String text)
{
FeatureMapUtil.addText(featureMap, text);
}
+ /**
+ * @deprecated
+ */
public void add(int index, String text)
+ {
+ FeatureMapUtil.addText(featureMap, index, text);
+ }
+
+ public void addText(String text)
+ {
+ FeatureMapUtil.addText(featureMap, text);
+ }
+
+ public void addText(int index, String text)
{
FeatureMapUtil.addText(featureMap, index, text);
}
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java?view=diff&rev=471047&r1=471046&r2=471047
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
Fri Nov 3 15:18:02 2006
@@ -75,4 +75,20 @@
public List /*String*/ getAliasNames() {
throw new UnsupportedOperationException();
}
+
+ public boolean isNullable() {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isOpenContent() {
+ throw new UnsupportedOperationException();
+ }
+
+ public List getInstanceProperties() {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object get(Property property) {
+ throw new UnsupportedOperationException();
+ }
}
Modified:
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java?view=diff&rev=471047&r1=471046&r2=471047
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
Fri Nov 3 15:18:02 2006
@@ -93,4 +93,12 @@
public List /*String*/ getAliasNames() {
throw new UnsupportedOperationException();
}
+
+ public List getInstanceProperties() {
+ throw new UnsupportedOperationException();
+ }
+
+ public Object get(Property property) {
+ throw new UnsupportedOperationException();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
