*** empty log message ***
diff --git a/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml b/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
index cff7c6d..d845f66 100644
--- a/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
+++ b/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.6 2004/05/21 20:20:18 khussey Exp $
+ * $Id: plugin.xml,v 1.7 2004/05/25 21:58:17 khussey Exp $
*/
-->
@@ -27,7 +27,7 @@
<import plugin="org.eclipse.uml2.examples" export="true"/>
<import plugin="org.eclipse.uml2.editor" export="true"/>
<import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
+ <import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.core.resources"/>
</requires>
diff --git a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/ExamplesUIPlugin.java b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/ExamplesUIPlugin.java
index 2d01ac7..a48e9f4 100644
--- a/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/ExamplesUIPlugin.java
+++ b/deprecated/examples/org.eclipse.uml2.examples.ui/src/org/eclipse/uml2/examples/ui/ExamplesUIPlugin.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ExamplesUIPlugin.java,v 1.1 2004/04/29 15:31:14 khussey Exp $
+ * $Id: ExamplesUIPlugin.java,v 1.2 2004/05/25 21:58:17 khussey Exp $
*/
package org.eclipse.uml2.examples.ui;
@@ -17,7 +17,7 @@
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPluginDescriptor;
+
import org.eclipse.emf.common.EMFPlugin;
/**
@@ -35,8 +35,9 @@
/**
* The constructor.
*/
- public ExamplesUIPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
+ public ExamplesUIPlugin() {
+ super();
+
plugin = this;
try {
diff --git a/deprecated/examples/org.eclipse.uml2.examples/plugin.xml b/deprecated/examples/org.eclipse.uml2.examples/plugin.xml
index 2743e02..e639f9c 100644
--- a/deprecated/examples/org.eclipse.uml2.examples/plugin.xml
+++ b/deprecated/examples/org.eclipse.uml2.examples/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.4 2004/05/21 20:20:00 khussey Exp $
+ * $Id: plugin.xml,v 1.5 2004/05/25 21:58:16 khussey Exp $
*/
-->
@@ -25,7 +25,7 @@
<requires>
<import plugin="org.eclipse.uml2" export="true"/>
- <import plugin="org.eclipse.core.runtime.compatibility"/>
+ <import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.core.resources"/>
</requires>
diff --git a/deprecated/examples/org.eclipse.uml2.examples/src/org/eclipse/uml2/examples/ExamplesPlugin.java b/deprecated/examples/org.eclipse.uml2.examples/src/org/eclipse/uml2/examples/ExamplesPlugin.java
index 3bccac4..9340231 100644
--- a/deprecated/examples/org.eclipse.uml2.examples/src/org/eclipse/uml2/examples/ExamplesPlugin.java
+++ b/deprecated/examples/org.eclipse.uml2.examples/src/org/eclipse/uml2/examples/ExamplesPlugin.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: ExamplesPlugin.java,v 1.1 2004/04/29 15:14:39 khussey Exp $
+ * $Id: ExamplesPlugin.java,v 1.2 2004/05/25 21:58:16 khussey Exp $
*/
package org.eclipse.uml2.examples;
@@ -17,14 +17,14 @@
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Plugin;
+
+import org.eclipse.emf.common.EMFPlugin;
/**
*
*/
public class ExamplesPlugin
- extends Plugin {
+ extends EMFPlugin.EclipsePlugin {
//The shared instance.
private static ExamplesPlugin plugin;
@@ -35,8 +35,9 @@
/**
* The constructor.
*/
- public ExamplesPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
+ public ExamplesPlugin() {
+ super();
+
plugin = this;
try {
diff --git a/deprecated/plugins/org.eclipse.uml2.resources/plugin.xml b/deprecated/plugins/org.eclipse.uml2.resources/plugin.xml
index 38941e0..3a35475 100644
--- a/deprecated/plugins/org.eclipse.uml2.resources/plugin.xml
+++ b/deprecated/plugins/org.eclipse.uml2.resources/plugin.xml
@@ -12,7 +12,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: plugin.xml,v 1.2 2004/04/10 03:59:19 khussey Exp $
+ * $Id: plugin.xml,v 1.3 2004/05/25 21:58:18 khussey Exp $
*/
-->
@@ -29,7 +29,7 @@
point="org.eclipse.emf.ecore.uri_mapping">
<mapping
source="pathmap://UML2_LIBRARIES/"
- target="libraries/">
+ target="platform:/plugin/org.eclipse.uml2.resources/libraries/">
</mapping>
</extension>
@@ -37,7 +37,7 @@
point="org.eclipse.emf.ecore.uri_mapping">
<mapping
source="pathmap://UML2_METAMODELS/"
- target="metamodels/">
+ target="platform:/plugin/org.eclipse.uml2.resources/metamodels/">
</mapping>
</extension>
@@ -45,7 +45,7 @@
point="org.eclipse.emf.ecore.uri_mapping">
<mapping
source="pathmap://UML2_PROFILES/"
- target="profiles/">
+ target="platform:/plugin/org.eclipse.uml2.resources/profiles/">
</mapping>
</extension>
diff --git a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2URIConverterImpl.java b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2URIConverterImpl.java
index 50aa539..7cf0f12 100644
--- a/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2URIConverterImpl.java
+++ b/deprecated/plugins/org.eclipse.uml2/src/org/eclipse/uml2/internal/util/UML2URIConverterImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*
- * $Id: UML2URIConverterImpl.java,v 1.3 2004/05/18 21:00:48 khussey Exp $
+ * $Id: UML2URIConverterImpl.java,v 1.4 2004/05/25 21:58:19 khussey Exp $
*/
package org.eclipse.uml2.internal.util;
@@ -18,13 +18,12 @@
import java.net.URL;
import java.util.Map;
-import org.eclipse.core.runtime.IPluginDescriptor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.PluginVersionIdentifier;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
import org.eclipse.emf.ecore.resource.URIConverter;
+import org.osgi.framework.Bundle;
/**
*
@@ -33,35 +32,37 @@
implements URIConverter {
// ECLIPSE-DEPEND-BEGIN
- public static class WorkbenchHelper {
+
+ public static class WorkbenchHelper {
public static InputStream createPlatformPluginInputStream(
String platformPluginPath)
throws IOException {
- int segmentIndex = platformPluginPath.indexOf('/', 1);
- int versionIndex = platformPluginPath.substring(0, segmentIndex)
- .lastIndexOf('_');
+ int segmentIndex = platformPluginPath.indexOf('/', 1);
+ int versionIndex = platformPluginPath.substring(0, segmentIndex)
+ .lastIndexOf('_');
- String pluginId = platformPluginPath.substring(1,
- -1 == versionIndex
- ? segmentIndex : versionIndex);
- IPluginDescriptor plugin = -1 == versionIndex
- ? Platform.getPluginRegistry().getPluginDescriptor(pluginId)
- : Platform.getPluginRegistry().getPluginDescriptor(
- pluginId,
- new PluginVersionIdentifier(platformPluginPath.substring(
- versionIndex + 1, segmentIndex)));
+ String pluginId = platformPluginPath.substring(1,
+ -1 == versionIndex ? segmentIndex : versionIndex);
- URL url = plugin.find(new Path(platformPluginPath
- .substring(segmentIndex + 1)));
+ Bundle[] bundles = Platform.getBundles(pluginId,
+ -1 == versionIndex ? null : platformPluginPath.substring(
+ versionIndex + 1, segmentIndex));
- if (null == url) {
- throw new IOException();
- }
+ URL url = null;
- return url.openConnection().getInputStream();
- }
+ if (null != bundles) {
+ url = Platform.find(bundles[0], new Path(platformPluginPath
+ .substring(segmentIndex + 1)));
+ }
+
+ if (null == url) {
+ throw new IOException();
+ }
+
+ return url.openConnection().getInputStream();
+ }
}
// ECLIPSE-DEPEND-END
