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/02/23 03:16:05 UTC
svn commit: r510762 - in /incubator/tuscany/java/sdo/impl/src:
main/java/org/apache/tuscany/sdo/helper/
main/java/org/apache/tuscany/sdo/impl/
main/java/org/apache/tuscany/sdo/util/resource/
test/java/org/apache/tuscany/sdo/test/
Author: frankb
Date: Thu Feb 22 18:16:04 2007
New Revision: 510762
URL: http://svn.apache.org/viewvc?view=rev&rev=510762
Log:
Fix for TUSCANY-1093 and cleanup of some unused imports
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.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/ReferenceImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/RecordedEventXMLStreamReader.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataGraphTestCase.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java
incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java?view=diff&rev=510762&r1=510761&r2=510762
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java Thu Feb 22 18:16:04 2007
@@ -22,7 +22,6 @@
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.util.EcoreUtil;
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=510762&r1=510761&r2=510762
==============================================================================
--- 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 Thu Feb 22 18:16:04 2007
@@ -86,6 +86,14 @@
return !isChangeable(); //TODO semantics don't exactly match?
}
+ /**
+ * Single-valued SDO properties behave as EMF unsettable, multi-valued properties as EMF !unsettable
+ */
+ public boolean isUnsettable()
+ {
+ return !isMany();
+ }
+
protected List aliasNames = null;
/**
@@ -267,7 +275,7 @@
}
public boolean isSetNullable() {
- return isReadOnly();
+ return isUnsettable();
}
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=510762&r1=510761&r2=510762
==============================================================================
--- 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 Thu Feb 22 18:16:04 2007
@@ -82,6 +82,14 @@
return !isChangeable(); //TODO semantics don't exactly match?
}
+ /**
+ * Single-valued SDO properties behave as EMF unsettable, multi-valued properties as EMF !unsettable
+ */
+ public boolean isUnsettable()
+ {
+ return !isMany();
+ }
+
protected List aliasNames = null;
/**
@@ -233,7 +241,7 @@
}
public boolean isSetNullable() {
- return isReadOnly();
+ return isNullable();
}
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/RecordedEventXMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/RecordedEventXMLStreamReader.java?view=diff&rev=510762&r1=510761&r2=510762
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/RecordedEventXMLStreamReader.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/RecordedEventXMLStreamReader.java Thu Feb 22 18:16:04 2007
@@ -425,7 +425,7 @@
Event event = new ValueEvent(value);
event.type = type;
event.location(locator);
- int index = events.size();
+ //int index = events.size();
add(event);
}
Modified: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java?view=diff&rev=510762&r1=510761&r2=510762
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java Thu Feb 22 18:16:04 2007
@@ -36,11 +36,9 @@
import commonj.sdo.DataObject;
import commonj.sdo.Property;
import commonj.sdo.Type;
-import commonj.sdo.helper.DataFactory;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XSDHelper;
-import commonj.sdo.helper.XMLHelper;
public class ChangeSummaryOnDataObjectTestCase extends TestCase {
Modified: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataGraphTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataGraphTestCase.java?view=diff&rev=510762&r1=510761&r2=510762
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataGraphTestCase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataGraphTestCase.java Thu Feb 22 18:16:04 2007
@@ -22,8 +22,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.List;
-import java.util.Iterator;
import junit.framework.TestCase;
@@ -32,7 +30,6 @@
import commonj.sdo.DataGraph;
import commonj.sdo.DataObject;
import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XSDHelper;
/**
Modified: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java?view=diff&rev=510762&r1=510761&r2=510762
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java Thu Feb 22 18:16:04 2007
@@ -183,6 +183,10 @@
DataObject customer1 = factory.create("http://example.com/customer",
"Customer");
+
+ customer1.setInt("custNum", 0);
+ assertTrue(customer1.isSet("custNum"));
+
customer1.setInt("custNum", 1);
customer1.set("firstName", "John");
customer1.set("lastName", "Adams");
@@ -662,7 +666,7 @@
List ts = new ArrayList();
ts.add(t1);
ts.add(t2);
- List types = TypeHelper.INSTANCE.define(ts);
+ List types = hc.getTypeHelper().define(ts);
Type first = (Type)types.get(0);
Type second = (Type)types.get(1);
Modified: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java?view=diff&rev=510762&r1=510761&r2=510762
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java Thu Feb 22 18:16:04 2007
@@ -24,16 +24,15 @@
import java.io.InputStream;
import java.net.URL;
-import org.apache.tuscany.sdo.util.SDOUtil;
-
import junit.framework.TestCase;
+import org.apache.tuscany.sdo.util.SDOUtil;
+
import commonj.sdo.DataObject;
import commonj.sdo.Type;
import commonj.sdo.helper.DataFactory;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XSDHelper;
public class DotNameTest extends TestCase {
Modified: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java?view=diff&rev=510762&r1=510761&r2=510762
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java Thu Feb 22 18:16:04 2007
@@ -27,18 +27,14 @@
import java.math.BigDecimal;
import java.net.URL;
-import org.apache.tuscany.sdo.util.SDOUtil;
-
import junit.framework.TestCase;
+import org.apache.tuscany.sdo.util.SDOUtil;
+
import commonj.sdo.DataObject;
-import commonj.sdo.Property;
import commonj.sdo.Type;
-import commonj.sdo.helper.DataFactory;
import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
public class SimpleDynamicTestCase extends TestCase {
@@ -46,9 +42,9 @@
private final String TEST_NAMESPACE = "http://www.example.com/simple";
private final String QUOTE_XML = "/quote.xml";
- private final String TEST_MODEL2 = "/simple2.xsd";
- private final String TEST_NAMESPACE2 = "http://www.example.com/simple2";
- private final String QUOTE_XML2 = "/quote2.xml";
+ //private final String TEST_MODEL2 = "/simple2.xsd";
+ //private final String TEST_NAMESPACE2 = "http://www.example.com/simple2";
+ //private final String QUOTE_XML2 = "/quote2.xml";
HelperContext hc;
TypeHelper th;
@@ -81,6 +77,7 @@
assertTrue(TestUtil.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(QUOTE_XML)));
}
+ /*
public void dontTestResolveXSDWithoutSchemaLocation() throws IOException {
URL url = getClass().getResource(TEST_MODEL2);
@@ -106,6 +103,7 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
hc.getXMLHelper().save(quote2, TEST_NAMESPACE2, "stockQuote", System.out);
}
+ */
protected void setUp() throws Exception {
super.setUp();
Modified: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java?view=diff&rev=510762&r1=510761&r2=510762
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java Thu Feb 22 18:16:04 2007
@@ -28,7 +28,6 @@
import junit.framework.TestCase;
import org.apache.tuscany.sdo.util.SDOUtil;
-import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
import commonj.sdo.Type;
import commonj.sdo.helper.DataHelper;
Modified: incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java?view=diff&rev=510762&r1=510761&r2=510762
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java (original)
+++ incubator/tuscany/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java Thu Feb 22 18:16:04 2007
@@ -30,7 +30,6 @@
import org.apache.tuscany.sdo.util.SDOUtil;
import com.example.simple.SimpleFactory;
-import com.example.simple.impl.SimpleFactoryImpl;
import commonj.sdo.DataObject;
import commonj.sdo.Type;
import commonj.sdo.helper.DataFactory;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org