*** empty log message ***
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2Handler.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2Handler.java
index 2ef0a30..e6960c0 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2Handler.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2Handler.java
@@ -8,30 +8,39 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2Handler.java,v 1.3 2004/06/10 13:06:34 khussey Exp $
+ * $Id: UML2Handler.java,v 1.4 2004/06/15 14:26:03 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
-import java.io.IOException;
-import java.io.InputStream;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.xmi.PackageNotFoundException;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
import org.eclipse.emf.ecore.xmi.XMLHelper;
import org.eclipse.emf.ecore.xmi.XMLResource;
import org.eclipse.emf.ecore.xmi.impl.SAXXMIHandler;
/**
- *
+ * The SAX handler for UML2 resources.
*/
public class UML2Handler
extends SAXXMIHandler {
+ /**
+ * Constructs a new UML2 handler for the specified resource with the
+ * specified helper and options.
+ *
+ * @param xmiResource
+ * The resource for the new handler.
+ * @param helper
+ * The helper for the new handler.
+ * @param options
+ * The load options for the new handler.
+ */
public UML2Handler(XMLResource xmiResource, XMLHelper helper, Map options) {
super(xmiResource, helper, options);
}
@@ -39,107 +48,51 @@
/*
* (non-Javadoc)
*
- * @see org.eclipse.emf.ecore.xmi.impl.XMLHandler#getPackageForURI(java.lang.String)
+ * @see org.eclipse.emf.ecore.xmi.impl.XMLHandler#getURIConverter()
*/
- protected EPackage getPackageForURI(String uriString) {
-
- if (null == uriString) {
- return null;
- }
-
- EPackage ePackage = null == extendedMetaData
- ? packageRegistry.getEPackage(uriString)
- : extendedMetaData.getPackage(uriString);
-
- if (null == ePackage) {
- URI uri = URI.createURI(uriString);
-
- if (null == uri.scheme()) {
-
- for (Iterator entries = packageRegistry.entrySet().iterator(); entries
- .hasNext();) {
-
- Map.Entry entry = (Map.Entry) entries.next();
- String nsURI = (String) entry.getKey();
-
- if (null != nsURI
- && nsURI.endsWith(uriString)
- && nsURI
- .charAt(nsURI.length() - uriString.length() - 1) == '/') {
-
- oldStyleProxyURIs = true;
- return (EPackage) entry.getValue();
- }
- }
- }
-
- if (null != urisToLocations) {
- URI locationURI = (URI) urisToLocations.get(uriString);
-
- if (null != locationURI) {
- uri = locationURI;
- }
- }
-
- Resource resource = null;
-
- if (null != resourceSet) {
- URI trimmedURI = uri.trimFragment();
- resource = resourceSet.getResource(trimmedURI, false);
-
- if (null == resource) {
-
- try {
- InputStream inputStream = new UML2URIConverterImpl(
- resourceSet.getURIConverter())
- .createInputStream(trimmedURI);
- resource = resourceSet.createResource(trimmedURI);
-
- if (null == resource) {
- inputStream.close();
- } else {
- resource.load(inputStream, resourceSet
- .getLoadOptions());
- }
- } catch (IOException ioe) {
- // ignore
- }
- }
- }
-
- if (null != resource) {
- Object content = null;
-
- if (null != uri.fragment()) {
- content = resource.getEObject(uri.fragment());
- } else {
- List contents = resource.getContents();
-
- if (!contents.isEmpty()) {
- content = contents.get(0);
- }
- }
-
- if (content instanceof EPackage) {
- ePackage = (EPackage) content;
-
- if (null != extendedMetaData) {
- extendedMetaData.putPackage(extendedMetaData
- .getNamespace(ePackage), ePackage);
- } else {
- resourceSet.getPackageRegistry().put(
- ePackage.getNsURI(), ePackage);
- }
- }
- }
- }
-
- if (null == ePackage) {
- error(new PackageNotFoundException(uriString, getLocation(),
- getLineNumber(), getColumnNumber()));
- }
-
- return ePackage;
+ protected URIConverter getURIConverter() {
+ return new UML2URIConverterImpl(super.getURIConverter());
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.xmi.impl.XMLHandler#endDocument()
+ */
+ public void endDocument() {
+ super.endDocument();
+
+ if (null != extendedMetaData) {
+
+ for (Iterator demandedPackages = extendedMetaData
+ .demandedPackages().iterator(); demandedPackages.hasNext();) {
+
+ EPackage ePackage = (EPackage) demandedPackages.next();
+ String nsURI = ePackage.getNsURI();
+
+ if (null != nsURI) {
+
+ if (null != urisToLocations) {
+ URI locationURI = (URI) urisToLocations.get(nsURI);
+
+ if (null != locationURI) {
+ Resource resource = new ResourceImpl();
+ resource.setURI(locationURI);
+ resource.getContents().add(ePackage);
+ }
+ }
+
+ for (Iterator entries = helper.getPrefixToNamespaceMap()
+ .iterator(); entries.hasNext();) {
+
+ Map.Entry entry = (Map.Entry) entries.next();
+
+ if (nsURI.equals(entry.getValue())) {
+ ePackage.setNsPrefix((String) entry.getKey());
+ }
+ }
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ExtendedMetaData.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ExtendedMetaData.java
new file mode 100644
index 0000000..34f1ba2
--- /dev/null
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/util/UML2ExtendedMetaData.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ *
+ * $Id: UML2ExtendedMetaData.java,v 1.1 2004/06/15 14:26:03 khussey Exp $
+ */
+package org.eclipse.uml2.util;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
+import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
+import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.ecore.xmi.impl.XMLInfoImpl;
+import org.eclipse.emf.ecore.xmi.impl.XMLMapImpl;
+
+/**
+ * Extended metadata for UML2 resources. Provides forward compatibility support
+ * by matching namespace URIs.
+ */
+public class UML2ExtendedMetaData
+ extends BasicExtendedMetaData {
+
+ /**
+ * The registry of 'compatible' packages.
+ */
+ private final EPackage.Registry compatibilityRegistry = new EPackageRegistryImpl();
+
+ /**
+ * The map used to map compatible packages to their original namespaces.
+ */
+ private final XMLResource.XMLMap xmlMap = new XMLMapImpl();
+
+ /**
+ * Constructs a new UML2 extended metadata with the specified package
+ * registry.
+ *
+ * @param registry
+ * The resource set's package registry.
+ */
+ public UML2ExtendedMetaData(EPackage.Registry registry) {
+ super(registry);
+ }
+
+ /**
+ * Retrieves a pattern for the specified namespace URI by replacing version
+ * information (i.e. digits) with wildcards.
+ *
+ * @param nsURI
+ * The namespace URI for which to retrieve a pattern.
+ * @return The namespace URI pattern.
+ */
+ protected String getNsURIPattern(String nsURI) {
+ StringBuffer nsURIPattern = new StringBuffer();
+
+ for (int i = 0; i < nsURI.length(); i++) {
+
+ if (Character.isDigit(nsURI.charAt(i))) {
+ nsURIPattern.append("\\d");//$NON-NLS-1$
+ } else {
+ nsURIPattern.append(nsURI.charAt(i));
+ }
+ }
+
+ return nsURIPattern.toString();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.ExtendedMetaData#getPackage(java.lang.String)
+ */
+ public EPackage getPackage(String namespace) {
+ EPackage ePackage = super.getPackage(namespace);
+
+ if (null == ePackage && null != namespace) {
+ ePackage = compatibilityRegistry.getEPackage(namespace);
+
+ if (null != ePackage) {
+ return ePackage;
+ }
+
+ String nsURIPattern = getNsURIPattern(namespace);
+
+ for (Iterator nsURIs = registry.keySet().iterator(); nsURIs
+ .hasNext();) {
+
+ String nsURI = (String) nsURIs.next();
+
+ if (nsURI.matches(nsURIPattern)) {
+ ePackage = registry.getEPackage(nsURI);
+
+ compatibilityRegistry.put(namespace, ePackage);
+
+ XMLResource.XMLInfo xmlInfo = new XMLInfoImpl();
+ xmlInfo.setTargetNamespace(namespace);
+ xmlMap.add(ePackage, xmlInfo);
+
+ break;
+ }
+ }
+ }
+
+ return ePackage;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.emf.ecore.util.ExtendedMetaData#getNamespace(org.eclipse.emf.ecore.EPackage)
+ */
+ public String getNamespace(EPackage ePackage) {
+ XMLResource.XMLInfo xmlInfo = xmlMap.getInfo(ePackage);
+
+ if (null != xmlInfo) {
+ String namespace = xmlInfo.getTargetNamespace();
+
+ if (null != namespace) {
+ return namespace;
+ }
+ }
+
+ return super.getNamespace(ePackage);
+ }
+
+}
\ No newline at end of file
