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/24 17:02:17 UTC
svn commit: r522045 - in /incubator/tuscany/java/sdo:
impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/ObtainingDataGraphFromXml.java
Author: frankb
Date: Sat Mar 24 09:02:17 2007
New Revision: 522045
URL: http://svn.apache.org/viewvc?view=rev&rev=522045
Log:
Fix ObtainingDataGraphFromXml Sample
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/ObtainingDataGraphFromXml.java
Modified: incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java?view=diff&rev=522045&r1=522044&r2=522045
==============================================================================
--- incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java (original)
+++ incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java Sat Mar 24 09:02:17 2007
@@ -563,7 +563,13 @@
}
}
+ //FB TEMPORARY allow loading proper serialization (global element instead of type name)
+ //FB Proper fix is to reimplement DataGraph as proper DataObject, and remove this entire class
+ EStructuralFeature rootFeature = extendedMetaData.getElement(helper.getURI(prefix), name);
+ if (rootFeature != null) name = rootFeature.getEType().getName();
+
EObject rootObject = createObjectByType(prefix, name, false);
+
eDataGraph.setERootObject(rootObject);
processObject(rootObject);
if (rootObject != null
Modified: incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/ObtainingDataGraphFromXml.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/ObtainingDataGraphFromXml.java?view=diff&rev=522045&r1=522044&r2=522045
==============================================================================
--- incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/ObtainingDataGraphFromXml.java (original)
+++ incubator/tuscany/java/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/ObtainingDataGraphFromXml.java Sat Mar 24 09:02:17 2007
@@ -103,7 +103,7 @@
System.out.println("SDO Sample ObtainingDataGraphFromXml");
System.out.println("***************************************");
System.out.println("Demonstrates a vareity of methods available to obtain the root DataObject"
- + "contained within an xml representation of a DataGraph.");
+ + " contained within an xml representation of a DataGraph.");
System.out.println("***************************************");
@@ -146,9 +146,8 @@
DataObject company = null;
/**
- * Use specification mechanism for obtaining a DataObject that represents
+ * Use specification mechanism for obtaining a DataObject that represents the datagraph
*/
- // the a datagraph
System.out.println("Using specification methods to obtain DataObject represeenting a datagraph from xml");
// When the xml file represents a DataGraph the root Object
@@ -157,8 +156,7 @@
ClassLoader.getSystemResourceAsStream(SdoSampleConstants.COMPANY_DATAGRAPH_XML)).getRootObject();
// Obtain the company DataObject from the DataObject representing the datagraph
- Sequence mySeq = (Sequence) dataObjectRepresentingDataGraph.getSequence("any");
- company = (DataObject) mySeq.getValue(0);
+ company = dataObjectRepresentingDataGraph.getDataObject("company");
System.out.println("Obtained DataObject representing datagraph");
System.out.println(dataObjectRepresentingDataGraph);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org