Author: antelder
Date: Fri Jul 27 08:58:17 2007
New Revision: 560291
URL: http://svn.apache.org/viewvc?view=rev&rev=560291
Log:
TUSCANY-1468 - Use HelperContext for scope in Tuscany API
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
incubator/tuscany/java/sdo/lib/src/main/java/org/apache/tuscany/sdo/api/SDOHelper.java
incubator/tuscany/java/sdo/lib/src/main/java/org/apache/tuscany/sdo/api/SDOUtil.java
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java?view=diff&rev=560291&r1=560290&r2=560291
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java
Fri Jul 27 08:58:17 2007
@@ -147,42 +147,35 @@
options.put(LOADING_SCOPE, extendedMetaData);
}
- /**
- * @deprecated Replaced by loadDataGraph(InptuStream, Map, HelperContext)
- */
- public DataGraph loadDataGraph(InputStream inputStream, Map options,
TypeHelper scope) throws IOException {
- DataGraph result = null;
- if (scope == null || scope == TypeHelper.INSTANCE) {
- result = loadDataGraph(inputStream, options);
- } else if (options == null) {
- options = new HashMap();
- registerLoadingScope(options, scope);
- result = loadDataGraph(inputStream, options);
- } else if (options.containsKey(LOADING_SCOPE)) {
- Object restore = options.get(LOADING_SCOPE);
- registerLoadingScope(options, scope);
- try {
- result = loadDataGraph(inputStream, options);
- } finally {
- options.put(LOADING_SCOPE, restore);
- }
- } else {
- registerLoadingScope(options, scope);
- try {
- result = loadDataGraph(inputStream, options);
- } finally {
- options.remove(LOADING_SCOPE);
- }
- }
- return result;
- }
-
- public DataGraph loadDataGraph(InputStream inputStream, Map options,
HelperContext hc) throws IOException {
- if (hc == null) {
- hc = HelperProvider.getDefaultContext();
+ public DataGraph loadDataGraph(InputStream inputStream, Map options,
HelperContext scope) throws IOException {
+ if (scope == null) {
+ scope = HelperProvider.getDefaultContext();
}
- TypeHelper scope = hc.getTypeHelper();
- return loadDataGraph(inputStream, options, scope);
+ TypeHelper th = scope.getTypeHelper();
+ DataGraph result = null;
+ if (th == null || th == TypeHelper.INSTANCE) {
+ result = loadDataGraph(inputStream, options);
+ } else if (options == null) {
+ options = new HashMap();
+ registerLoadingScope(options, th);
+ result = loadDataGraph(inputStream, options);
+ } else if (options.containsKey(LOADING_SCOPE)) {
+ Object restore = options.get(LOADING_SCOPE);
+ registerLoadingScope(options, th);
+ try {
+ result = loadDataGraph(inputStream, options);
+ } finally {
+ options.put(LOADING_SCOPE, restore);
+ }
+ } else {
+ registerLoadingScope(options, th);
+ try {
+ result = loadDataGraph(inputStream, options);
+ } finally {
+ options.remove(LOADING_SCOPE);
+ }
+ }
+ return result;
}
public void saveDataGraph(DataGraph dataGraph, OutputStream outputStream,
Map options) throws IOException {
@@ -229,39 +222,16 @@
return new HelperContextImpl(extensibleNamespaces, options);
}
- /**
- * @deprecated Replaced by createCrossScopeCopyHelper(HelperContext)
- */
- public CopyHelper createCrossScopeCopyHelper(TypeHelper targetScope) {
- return new CrossScopeCopyHelperImpl(targetScope);
- }
public CopyHelper createCrossScopeCopyHelper(HelperContext hc) {
return new CrossScopeCopyHelperImpl(hc.getTypeHelper());
}
- /**
- * @deprecated Replaced by createXMLStreamHelper(HelperContext)
- */
- public XMLStreamHelper createXMLStreamHelper(TypeHelper scope) {
- return (new HelperContextImpl(scope)).getXMLStreamHelper();
- }
public XMLStreamHelper createXMLStreamHelper(HelperContext hc) {
return ((HelperContextImpl)hc).getXMLStreamHelper();
}
- /**
- * @deprecated
- */
- public List getTypes(TypeHelper scope, String uri) {
-
- EPackage ePackage =
((TypeHelperImpl)scope).getExtendedMetaData().getPackage(uri);
- if (ePackage != null) {
- return new ArrayList(ePackage.getEClassifiers());
- }
- return null;
- }
public List getTypes(HelperContext hc, String uri) {
@@ -282,45 +252,6 @@
return
"".equals(SDOExtendedMetaData.INSTANCE.getName((EClassifier)type));
}
- /**
- * @deprecated
- */
- public Type createType(TypeHelper scope, String uri, String name, boolean
isDataType) {
- ExtendedMetaData extendedMetaData =
((TypeHelperImpl)scope).getExtendedMetaData();
- if ("".equals(uri))
- uri = null; // FB
-
- EPackage ePackage = extendedMetaData.getPackage(uri);
- if (ePackage == null) {
- ePackage = EcoreFactory.eINSTANCE.createEPackage();
- ePackage.setEFactoryInstance(new
DynamicDataObjectImpl.FactoryImpl());
- ePackage.setNsURI(uri);
- String packagePrefix = uri != null ?
URI.createURI(uri).trimFileExtension().lastSegment() : ""; // FB
- ePackage.setName(packagePrefix);
- ePackage.setNsPrefix(packagePrefix);
- extendedMetaData.putPackage(uri, ePackage);
- }
-
- EClassifier eClassifier = ePackage.getEClassifier(name);
- if (eClassifier != null) // already defined?
- {
- // throw new IllegalArgumentException();
- return null;
- }
-
- if (name != null) {
- eClassifier =
- isDataType ?
(EClassifier)SDOFactory.eINSTANCE.createDataType() :
(EClassifier)SDOFactory.eINSTANCE
- .createClass();
- eClassifier.setName(name);
- } else {
- eClassifier = DataObjectUtil.createDocumentRoot();
- }
-
- ePackage.getEClassifiers().add(eClassifier);
-
- return (Type)eClassifier;
- }
public Type createType(HelperContext hc, String uri, String name, boolean
isDataType) {
ExtendedMetaData extendedMetaData =
((HelperContextImpl)hc).getExtendedMetaData();
@@ -474,32 +405,6 @@
}
}
- /**
- * @deprecated replaced by createOpenContentProperty(HelperContext, String,
String, Type)
- */
- public Property createOpenContentProperty(TypeHelper scope, String uri,
String name, Type type)
- {
- ExtendedMetaData extendedMetaData =
((TypeHelperImpl)scope).getExtendedMetaData();
-
- // get/create document root
- EPackage ePackage = extendedMetaData.getPackage(uri);
- Type documentRoot = ePackage != null ?
(Type)extendedMetaData.getType(ePackage, "") : null;
- if (documentRoot == null) {
- documentRoot = createType(scope, uri, null, false);
- }
-
- // Determine if property already exists
- Property newProperty = documentRoot.getProperty(name);
- if (newProperty == null) {
- // Create the new property 'under' the document root.....
- newProperty = createProperty(documentRoot, name, type);
- } else {
- // if property already exists, validate the expected type
- if (!newProperty.getType().equals(type))
- throw new IllegalArgumentException();
- }
- return newProperty;
- }
public Property createOpenContentProperty(HelperContext hc, String uri,
String name, Type type)
{
Modified:
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java?view=diff&rev=560291&r1=560290&r2=560291
==============================================================================
---
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
(original)
+++
incubator/tuscany/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
Fri Jul 27 08:58:17 2007
@@ -353,7 +353,7 @@
*/
public static DataGraph loadDataGraph(InputStream inputStream, Map options,
TypeHelper scope) throws IOException
{
- return org.apache.tuscany.sdo.api.SDOUtil.loadDataGraph(inputStream,
options, scope);
+ return org.apache.tuscany.sdo.api.SDOUtil.loadDataGraph(inputStream,
options, ((TypeHelperImpl)scope).getHelperContext());
}
/**
@@ -398,7 +398,7 @@
*/
public static CopyHelper createCrossScopeCopyHelper(TypeHelper targetScope)
{
- return
org.apache.tuscany.sdo.api.SDOUtil.createCrossScopeCopyHelper(targetScope);
+ return
org.apache.tuscany.sdo.api.SDOUtil.createCrossScopeCopyHelper(((TypeHelperImpl)targetScope).getHelperContext());
}
/**
@@ -407,7 +407,7 @@
*/
public static XMLStreamHelper createXMLStreamHelper(TypeHelper scope)
{
- return
(XMLStreamHelper)org.apache.tuscany.sdo.api.SDOUtil.createXMLStreamHelper(scope);
+ return
(XMLStreamHelper)org.apache.tuscany.sdo.api.SDOUtil.createXMLStreamHelper(((TypeHelperImpl)scope).getHelperContext());
}
/**
@@ -434,7 +434,7 @@
*/
public static List getTypes(TypeHelper scope, String uri) {
- return org.apache.tuscany.sdo.api.SDOUtil.getTypes(scope, uri);
+ return
org.apache.tuscany.sdo.api.SDOUtil.getTypes(((TypeHelperImpl)scope).getHelperContext(),
uri);
}
/**
@@ -461,7 +461,7 @@
*/
public static Type createType(TypeHelper scope, String uri, String name,
boolean isDataType)
{
- return org.apache.tuscany.sdo.api.SDOUtil.createType(scope, uri, name,
isDataType);
+ return
org.apache.tuscany.sdo.api.SDOUtil.createType(((TypeHelperImpl)scope).getHelperContext(),
uri, name, isDataType);
}
/**
@@ -533,7 +533,7 @@
*/
public static Property createGlobalProperty(TypeHelper scope, String uri,
String name, Type type)
{
- return org.apache.tuscany.sdo.api.SDOUtil.createOpenContentProperty(scope,
uri, name, type);
+ return
org.apache.tuscany.sdo.api.SDOUtil.createOpenContentProperty(((TypeHelperImpl)scope).getHelperContext(),
uri, name, type);
}
/**
Modified:
incubator/tuscany/java/sdo/lib/src/main/java/org/apache/tuscany/sdo/api/SDOHelper.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/lib/src/main/java/org/apache/tuscany/sdo/api/SDOHelper.java?view=diff&rev=560291&r1=560290&r2=560291
==============================================================================
---
incubator/tuscany/java/sdo/lib/src/main/java/org/apache/tuscany/sdo/api/SDOHelper.java
(original)
+++
incubator/tuscany/java/sdo/lib/src/main/java/org/apache/tuscany/sdo/api/SDOHelper.java
Fri Jul 27 08:58:17 2007
@@ -169,19 +169,6 @@
*
* @param inputStream the inputStream of the data graph.
* @param options loader control options, or null.
- * @param scope the TypeHelper in which to register deserialized Types and
to find Types when
- * creating DataObject instances, or null for default
TypeHelper.
- * @return the de-serialized data graph.
- * @throws IOException
- * @deprecated Replaced by loadDataGraph(InptuStream, Map, HelperContext)
- */
- public DataGraph loadDataGraph(InputStream inputStream, Map options,
TypeHelper scope) throws IOException;
-
- /**
- * Load a serialized data graph from the specified insputStream.
- *
- * @param inputStream the inputStream of the data graph.
- * @param options loader control options, or null.
* @param hc the HelperContext in which to register deserialized Types and
to find Types when
* creating DataObject instances, or null for default
HelperContext.
* @return the de-serialized data graph.
@@ -208,14 +195,6 @@
* types used by the objects in the DataGraph).
*/
public void registerDataGraphTypes(DataGraph dataGraph, List/*Type*/types);
-
- /**
- * Create a new cross scope CopyHelper.
- * @param targetScope the TypeHelper containing the Types to use to create
the copy objects.
- * @return the new CopyHelper.
- * @deprecated
- */
- public CopyHelper createCrossScopeCopyHelper(TypeHelper targetScope);
/**
* Create a new cross scope CopyHelper.
@@ -224,13 +203,6 @@
*/
public CopyHelper createCrossScopeCopyHelper(HelperContext targetScope);
- /**
- * Create a new XMLStreamHelper, with visibility to types in the specified
TypeHelper scope.
- * @param scope the TypeHelper to use for locating types.
- * @return the new XMLStreamHelper.
- * @deprecated
- */
- public XMLStreamHelper createXMLStreamHelper(TypeHelper scope);
/**
* Create a new XMLStreamHelper, with visibility to types in the specified
HelperContext scope.
@@ -254,15 +226,6 @@
* @return the new ObjectOutputStream.
*/
public ObjectOutputStream createObjectOutputStream(OutputStream
outputStream, HelperContext helperContext) throws IOException;
-
- /**
- * Gets all of the types associated with a uri.
- * @param scope the TypeHelper to use for locating types.
- * @param uri the URI of the Types
- * @return a List containing instances of Type, null if uri is not found.
- * @deprecated
- */
- public List getTypes(TypeHelper scope, String uri);
/**
* Gets all of the types associated with a uri.
@@ -305,12 +268,6 @@
*/
public interface MetaDataBuilder
{
- /**
- * Create a Type in the specified TypeHelper scope.
- * @return the new Type.
- * @deprecated
- */
- public Type createType(TypeHelper scope, String uri, String name, boolean
isDataType);
/**
* Create a Type in the specified TypeHelper scope.
@@ -358,12 +315,6 @@
*/
public void setPropertyXMLKind(Property property, boolean isXmlElement);
- /**
- * Create a new open content property in the specified TypeHelper scope.
- * @deprecated
- */
- public Property createOpenContentProperty(TypeHelper scope, String uri,
String name, Type type);
-
/**
* Create a new open content property in the specified TypeHelper scope.
*/
Modified:
incubator/tuscany/java/sdo/lib/src/main/java/org/apache/tuscany/sdo/api/SDOUtil.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sdo/lib/src/main/java/org/apache/tuscany/sdo/api/SDOUtil.java?view=diff&rev=560291&r1=560290&r2=560291
==============================================================================
---
incubator/tuscany/java/sdo/lib/src/main/java/org/apache/tuscany/sdo/api/SDOUtil.java
(original)
+++
incubator/tuscany/java/sdo/lib/src/main/java/org/apache/tuscany/sdo/api/SDOUtil.java
Fri Jul 27 08:58:17 2007
@@ -144,15 +144,6 @@
/**
* @see [EMAIL PROTECTED]
org.apache.tuscany.sdo.api.SDOHelper#loadDataGraph(InputStream, Map,
HelperContext)}.
- * @deprecated
- */
- public static DataGraph loadDataGraph(InputStream inputStream, Map options,
TypeHelper scope) throws IOException
- {
- return defaultSDOHelper.loadDataGraph(inputStream, options, scope);
- }
-
- /**
- * @see [EMAIL PROTECTED]
org.apache.tuscany.sdo.api.SDOHelper#loadDataGraph(InputStream, Map,
HelperContext)}.
*/
public static DataGraph loadDataGraph(InputStream inputStream, Map options,
HelperContext hc) throws IOException
{
@@ -205,14 +196,6 @@
return defaultSDOHelper.createHelperContext();
}
- /**
- * @see [EMAIL PROTECTED]
org.apache.tuscany.sdo.api.SDOHelper#createCrossScopeCopyHelper(TypeHelper)}.
- * @deprecated replaced by createCrossScopeCopyHelper(HelperContext)
- */
- public static CopyHelper createCrossScopeCopyHelper(TypeHelper targetScope)
- {
- return defaultSDOHelper.createCrossScopeCopyHelper(targetScope);
- }
/**
* @see [EMAIL PROTECTED]
org.apache.tuscany.sdo.api.SDOHelper#createCrossScopeCopyHelper(HelperContext)}.
@@ -222,14 +205,6 @@
return defaultSDOHelper.createCrossScopeCopyHelper(hc);
}
- /**
- * @see [EMAIL PROTECTED]
org.apache.tuscany.sdo.api.SDOHelper#createXMLStreamHelper(TypeHelper)}.
- * @deprecated Replaced by createXMLStreamHelper(HelperContext)
- */
- public static XMLStreamHelper createXMLStreamHelper(TypeHelper scope)
- {
- return defaultSDOHelper.createXMLStreamHelper(scope);
- }
/**
* @see [EMAIL PROTECTED]
org.apache.tuscany.sdo.api.SDOHelper#createXMLStreamHelper(HelperContext)}.
@@ -256,15 +231,6 @@
}
/**
- * @see [EMAIL PROTECTED]
org.apache.tuscany.sdo.api.SDOHelper#getTypes(TypeHelper, String)}.
- * @deprecated replaced by getTypes(HelperContext, String)
- */
- public static List getTypes(TypeHelper scope, String uri) {
-
- return defaultSDOHelper.getTypes(scope, uri);
- }
-
- /**
* @see [EMAIL PROTECTED]
org.apache.tuscany.sdo.api.SDOHelper#getTypes(HelperContext, String)}.
*/
public static List getTypes(HelperContext hc, String uri) {
@@ -297,15 +263,6 @@
}
/**
- * @see [EMAIL PROTECTED]
org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#createType(TypeHelper,
String, String, boolean)}.
- * @deprecated replaced by createType(HelperContext, String, String, boolean)
- */
- public static Type createType(TypeHelper scope, String uri, String name,
boolean isDataType)
- {
- return defaultSDOHelper.getMetaDataBuilder().createType(scope, uri, name,
isDataType);
- }
-
- /**
* @see [EMAIL PROTECTED]
org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#createType(HelperContext,
String, String, boolean)}.
*/
public static Type createType(HelperContext hc, String uri, String name,
boolean isDataType)
@@ -374,15 +331,6 @@
*/
public static void setPropertyXMLKind(Property property, boolean
isXmlElement) {
defaultSDOHelper.getMetaDataBuilder().setPropertyXMLKind(property,
isXmlElement);
- }
-
- /**
- * @see [EMAIL PROTECTED]
org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#createOpenContentProperty(TypeHelper,
String, String, Type)}.
- * @deprecated replaced by createOpenContentProperty(HelperContext, String,
String, Type)
- */
- public static Property createOpenContentProperty(TypeHelper scope, String
uri, String name, Type type)
- {
- return
defaultSDOHelper.getMetaDataBuilder().createOpenContentProperty(scope, uri,
name, type);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
