Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2006-02-03 18:43:37 +0000
committerPascal Rapicault2006-02-03 18:43:37 +0000
commit62670144db68b8d4e23f14b4a1661b306c0c07ea (patch)
tree46994eff6225bbeca45437ab90b95f757bd028b9
parentee6c7b2fec928d66b3ffe1bca716881fd05adf1d (diff)
downloadrt.equinox.bundles-62670144db68b8d4e23f14b4a1661b306c0c07ea.tar.gz
rt.equinox.bundles-62670144db68b8d4e23f14b4a1661b306c0c07ea.tar.xz
rt.equinox.bundles-62670144db68b8d4e23f14b4a1661b306c0c07ea.zip
Bug 126344 - Simplify the new registry migration processpos_126344
-rw-r--r--bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF4
-rw-r--r--bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java2
-rw-r--r--bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java2
-rw-r--r--bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java1
-rw-r--r--bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF10
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/BaseExtensionHandle.java74
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/BaseExtensionPointHandle.java101
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElement.java12
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElementHandle.java1
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Contribution.java2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionDelta.java2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionHandle.java56
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPointHandle.java83
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionRegistry.java40
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Handle.java2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ICompatibilityStrategy.java59
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryChangeEvent.java4
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryDelta.java4
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectManager.java2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TableWriter.java5
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TemporaryObjectManager.java2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ThirdLevelConfigurationElementHandle.java2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java3
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java4
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryProviderOSGI.java5
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryStrategyOSGI.java35
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/spi/ConfigurationElementAttribute.java2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/spi/ConfigurationElementDescription.java2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IConfigurationElement.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IConfigurationElement.java)2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtension.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExecutableExtension.java)2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtensionFactory.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExecutableExtensionFactory.java)4
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtension.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtension.java)2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionDelta.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionDelta.java)2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionPoint.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionPoint.java)2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionRegistry.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionRegistry.java)28
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeEvent.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IRegistryChangeEvent.java)2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeListener.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IRegistryChangeListener.java)2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryProvider.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IRegistryProvider.java)2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryFactory.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/RegistryFactory.java)9
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryUtils.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/RegistryUtils.java)7
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/ExtensionTracker.java)18
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionChangeHandler.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/IExtensionChangeHandler.java)4
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionTracker.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/IExtensionTracker.java)4
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IFilter.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/IFilter.java)4
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/package.html (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/package.html)2
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/package.html (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/package.html)0
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/spi/RegistryStrategy.java)5
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/package.html (renamed from bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/spi/package.html)0
-rw-r--r--bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/InvalidRegistryObjectException.java36
49 files changed, 282 insertions, 376 deletions
diff --git a/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
index 75a7372a1..d76c44640 100644
--- a/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Bundle-Activator: org.eclipse.core.internal.preferences.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.equinox.common,
- system.bundle
+ system.bundle,
+ org.eclipse.equinox.registry
Export-Package: org.eclipse.core.internal.preferences;x-friends:="org.eclipse.core.resources,org.eclipse.core.runtime",
org.eclipse.core.runtime.preferences,
org.osgi.service.prefs;version="1.1"
Eclipse-LazyStart: true
-Import-Package: org.eclipse.equinox.registry
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java
index 2b897e6ac..17554e7a5 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java
@@ -52,7 +52,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
public void start(BundleContext context) throws Exception {
bundleContext = context;
processCommandLine();
- registryServiceTracker = new ServiceTracker(context,"org.eclipse.equinox.registry.IExtensionRegistry",this);
+ registryServiceTracker = new ServiceTracker(context,"org.eclipse.core.runtime.IExtensionRegistry",this);
registryServiceTracker.open();
}
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java
index 2fb36d0e7..bb7bffec7 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java
@@ -17,8 +17,6 @@ import java.util.*;
import org.eclipse.core.internal.runtime.RuntimeLog;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.preferences.*;
-import org.eclipse.equinox.registry.IConfigurationElement;
-import org.eclipse.equinox.registry.IExtension;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java
index d2a76ab19..544871ce8 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java
@@ -15,7 +15,6 @@ import java.util.*;
import org.eclipse.core.internal.runtime.RuntimeLog;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.preferences.*;
-import org.eclipse.equinox.registry.*;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
diff --git a/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF
index f604df508..25ffa30bf 100644
--- a/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.registry; singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 3.2.0.qualifier
Bundle-Localization: plugin
Export-Package: org.eclipse.core.internal.registry;x-friends:="org.eclipse.core.runtime",
org.eclipse.core.internal.registry.osgi;x-friends:="org.eclipse.core.runtime",
org.eclipse.core.internal.registry.spi;x-internal:=true,
- org.eclipse.equinox.registry.spi,
- org.eclipse.equinox.registry,
- org.eclipse.equinox.registry.tracker
+ org.eclipse.core.runtime,
+ org.eclipse.core.runtime.dynamichelpers,
+ org.eclipse.core.runtime.spi
Require-Bundle: org.eclipse.equinox.common
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.core.internal.registry.osgi.Activator
@@ -25,3 +25,5 @@ Import-Package: org.eclipse.core.runtime.jobs;resolution:=optional,
org.osgi.util.tracker,
org.xml.sax,
javax.xml.parsers
+Eclipse-ExtensibleAPI: true
+Bundle-ClassPath: runtime_registry_compatibility.jar, .
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/BaseExtensionHandle.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/BaseExtensionHandle.java
new file mode 100644
index 000000000..f5eb08378
--- /dev/null
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/BaseExtensionHandle.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.core.internal.registry;
+
+import org.eclipse.core.runtime.*;
+
+/**
+ * This is the copy of the ExtensionHandle minus the getDeclaringPluginDescriptor()
+ * method that was moved into compatibility plugin.
+ *
+ * This class should not be used directly. Use ExtensionHandle instead.
+ *
+ * @since org.eclipse.equinox.registry 3.2
+ */
+public class BaseExtensionHandle extends Handle implements IExtension {
+ static final BaseExtensionHandle[] EMPTY_ARRAY = new BaseExtensionHandle[0];
+
+ public BaseExtensionHandle(IObjectManager objectManager, int id) {
+ super(objectManager, id);
+ }
+
+ protected Extension getExtension() {
+ return (Extension) objectManager.getObject(getId(), RegistryObjectManager.EXTENSION);
+ }
+
+ protected boolean shouldPersist() {
+ return getExtension().shouldPersist();
+ }
+
+ public String getNamespace() {
+ return getExtension().getNamespaceName();
+ }
+
+ public String getExtensionPointUniqueIdentifier() {
+ return getExtension().getExtensionPointIdentifier();
+ }
+
+ public String getLabel() {
+ return getExtension().getLabel();
+ }
+
+ public String getSimpleIdentifier() {
+ return getExtension().getSimpleIdentifier();
+ }
+
+ public String getUniqueIdentifier() {
+ return getExtension().getUniqueIdentifier();
+ }
+
+ public IConfigurationElement[] getConfigurationElements() {
+ return (IConfigurationElement[]) objectManager.getHandles(getExtension().getRawChildren(), RegistryObjectManager.CONFIGURATION_ELEMENT);
+ }
+
+ RegistryObject getObject() {
+ return getExtension();
+ }
+
+ public boolean isValid() {
+ try {
+ getExtension();
+ } catch (InvalidRegistryObjectException e) {
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/BaseExtensionPointHandle.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/BaseExtensionPointHandle.java
new file mode 100644
index 000000000..946d48680
--- /dev/null
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/BaseExtensionPointHandle.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.core.internal.registry;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import org.eclipse.core.runtime.*;
+
+/**
+ * This is the copy of the ExtensionPointHandle minus the getDeclaringPluginDescriptor()
+ * method that was moved into compatibility plugin.
+ *
+ * This class should not be used directly. Use ExtensionPointHandle instead.
+ *
+ * @since org.eclipse.equinox.registry 3.2
+ */
+public class BaseExtensionPointHandle extends Handle implements IExtensionPoint {
+ static final BaseExtensionPointHandle[] EMPTY_ARRAY = new BaseExtensionPointHandle[0];
+
+ public BaseExtensionPointHandle(IObjectManager objectManager, int id) {
+ super(objectManager, id);
+ }
+
+ public IExtension[] getExtensions() {
+ return (IExtension[]) objectManager.getHandles(getExtensionPoint().getRawChildren(), RegistryObjectManager.EXTENSION);
+ }
+
+ public String getNamespace() {
+ return getExtensionPoint().getNamespace();
+ }
+
+ protected boolean shouldPersist() {
+ return getExtensionPoint().shouldPersist();
+ }
+
+ public IExtension getExtension(String extensionId) {
+ if (extensionId == null)
+ return null;
+ int[] children = getExtensionPoint().getRawChildren();
+ for (int i = 0; i < children.length; i++) {
+ // Here we directly get the object because it avoids the creation of garbage and because we'll need the object anyway to compare the value
+ if (extensionId.equals(((Extension) objectManager.getObject(children[i], RegistryObjectManager.EXTENSION)).getUniqueIdentifier()))
+ return (ExtensionHandle) objectManager.getHandle(children[i], RegistryObjectManager.EXTENSION);
+ }
+ return null;
+ }
+
+ public IConfigurationElement[] getConfigurationElements() {
+ //get the actual extension objects since we'll need to get the configuration elements information.
+ Extension[] tmpExtensions = (Extension[]) objectManager.getObjects(getExtensionPoint().getRawChildren(), RegistryObjectManager.EXTENSION);
+ if (tmpExtensions.length == 0)
+ return ConfigurationElementHandle.EMPTY_ARRAY;
+
+ ArrayList result = new ArrayList();
+ for (int i = 0; i < tmpExtensions.length; i++) {
+ result.addAll(Arrays.asList(objectManager.getHandles(tmpExtensions[i].getRawChildren(), RegistryObjectManager.CONFIGURATION_ELEMENT)));
+ }
+ return (IConfigurationElement[]) result.toArray(new IConfigurationElement[result.size()]);
+ }
+
+ public String getLabel() {
+ return getExtensionPoint().getLabel();
+ }
+
+ public String getSchemaReference() {
+ return getExtensionPoint().getSchemaReference();
+ }
+
+ public String getSimpleIdentifier() {
+ return getExtensionPoint().getSimpleIdentifier();
+ }
+
+ public String getUniqueIdentifier() {
+ return getExtensionPoint().getUniqueIdentifier();
+ }
+
+ RegistryObject getObject() {
+ return getExtensionPoint();
+ }
+
+ protected ExtensionPoint getExtensionPoint() {
+ return (ExtensionPoint) objectManager.getObject(getId(), RegistryObjectManager.EXTENSION_POINT);
+ }
+
+ public boolean isValid() {
+ try {
+ getExtensionPoint();
+ } catch (InvalidRegistryObjectException e) {
+ return false;
+ }
+ return true;
+ }
+}
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElement.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElement.java
index 2da3d0a45..0ddd83478 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElement.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElement.java
@@ -12,8 +12,6 @@ package org.eclipse.core.internal.registry;
import java.util.Hashtable;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.registry.IExecutableExtension;
-import org.eclipse.equinox.registry.IExecutableExtensionFactory;
import org.eclipse.osgi.util.NLS;
/**
@@ -250,11 +248,8 @@ public class ConfigurationElement extends RegistryObject {
try {
// We need to take into account both "old" and "new" style executable extensions
ConfigurationElementHandle confElementHandle = new ConfigurationElementHandle(registry.getObjectManager(), getObjectId());
- if (result instanceof IExecutableExtension) {
+ if (result instanceof IExecutableExtension)
((IExecutableExtension) result).setInitializationData(confElementHandle, attributeName, initData);
- }
- if (registry.compatibilityStrategy != null)
- registry.compatibilityStrategy.setInitializationData(result, confElementHandle, attributeName, initData);
} catch (CoreException ce) {
// user code threw exception
throw ce;
@@ -264,11 +259,8 @@ public class ConfigurationElement extends RegistryObject {
}
// Deal with executable extension factories.
- if (result instanceof IExecutableExtensionFactory) {
+ if (result instanceof IExecutableExtensionFactory)
result = ((IExecutableExtensionFactory) result).create();
- }
- if (registry.compatibilityStrategy != null)
- result = registry.compatibilityStrategy.create(result);
return result;
}
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElementHandle.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElementHandle.java
index aec8fbc4a..3f9645b85 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElementHandle.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElementHandle.java
@@ -11,7 +11,6 @@
package org.eclipse.core.internal.registry;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.registry.*;
/**
* @since 3.1
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Contribution.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Contribution.java
index 107965ec5..7dfdf3210 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Contribution.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Contribution.java
@@ -11,7 +11,7 @@
package org.eclipse.core.internal.registry;
import org.eclipse.core.runtime.Assert;
-import org.eclipse.equinox.registry.InvalidRegistryObjectException;
+import org.eclipse.core.runtime.InvalidRegistryObjectException;
// This object is used to keep track on a contributor basis of the extension and extension points being contributed.
// It is mainly used on removal so we can quickly find objects to remove.
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionDelta.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionDelta.java
index 5d15126b3..a66602512 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionDelta.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionDelta.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.core.internal.registry;
-import org.eclipse.equinox.registry.*;
+import org.eclipse.core.runtime.*;
public class ExtensionDelta implements IExtensionDelta {
private int kind;
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionHandle.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionHandle.java
index 77bc6c55b..c1046a7db 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionHandle.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionHandle.java
@@ -10,60 +10,18 @@
*******************************************************************************/
package org.eclipse.core.internal.registry;
-import org.eclipse.equinox.registry.*;
-
/**
+ * The code (minus the getDeclaringPluginDescriptor() was moved into
+ * the BaseExtensionPointHandle to avoid duplicating code in the
+ * compatibility fragment.
+ *
+ * Modifications to the code should be done in the BaseExtensionHandle.
+ *
* @since 3.1
*/
-public class ExtensionHandle extends Handle implements IExtension {
- static final ExtensionHandle[] EMPTY_ARRAY = new ExtensionHandle[0];
+public class ExtensionHandle extends BaseExtensionHandle {
public ExtensionHandle(IObjectManager objectManager, int id) {
super(objectManager, id);
}
-
- protected Extension getExtension() {
- return (Extension) objectManager.getObject(getId(), RegistryObjectManager.EXTENSION);
- }
-
- protected boolean shouldPersist() {
- return getExtension().shouldPersist();
- }
-
- public String getNamespace() {
- return getExtension().getNamespaceName();
- }
-
- public String getExtensionPointUniqueIdentifier() {
- return getExtension().getExtensionPointIdentifier();
- }
-
- public String getLabel() {
- return getExtension().getLabel();
- }
-
- public String getSimpleIdentifier() {
- return getExtension().getSimpleIdentifier();
- }
-
- public String getUniqueIdentifier() {
- return getExtension().getUniqueIdentifier();
- }
-
- public IConfigurationElement[] getConfigurationElements() {
- return (IConfigurationElement[]) objectManager.getHandles(getExtension().getRawChildren(), RegistryObjectManager.CONFIGURATION_ELEMENT);
- }
-
- RegistryObject getObject() {
- return getExtension();
- }
-
- public boolean isValid() {
- try {
- getExtension();
- } catch (InvalidRegistryObjectException e) {
- return false;
- }
- return true;
- }
}
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPointHandle.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPointHandle.java
index 98822d549..b338eafda 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPointHandle.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPointHandle.java
@@ -10,87 +10,18 @@
*******************************************************************************/
package org.eclipse.core.internal.registry;
-import java.util.ArrayList;
-import java.util.Arrays;
-import org.eclipse.equinox.registry.*;
-
/**
+ * The code (minus the getDeclaringPluginDescriptor() was moved into
+ * the BaseExtensionPointHandle to avoid duplicating code in the
+ * compatibility fragment.
+ *
+ * Modifications to the code should be done in the BaseExtensionPointHandle.
+ *
* @since 3.1
*/
-public class ExtensionPointHandle extends Handle implements IExtensionPoint {
- static final ExtensionPointHandle[] EMPTY_ARRAY = new ExtensionPointHandle[0];
+public class ExtensionPointHandle extends BaseExtensionPointHandle {
public ExtensionPointHandle(IObjectManager objectManager, int id) {
super(objectManager, id);
}
-
- public IExtension[] getExtensions() {
- return (IExtension[]) objectManager.getHandles(getExtensionPoint().getRawChildren(), RegistryObjectManager.EXTENSION);
- }
-
- public String getNamespace() {
- return getExtensionPoint().getNamespace();
- }
-
- protected boolean shouldPersist() {
- return getExtensionPoint().shouldPersist();
- }
-
- public IExtension getExtension(String extensionId) {
- if (extensionId == null)
- return null;
- int[] children = getExtensionPoint().getRawChildren();
- for (int i = 0; i < children.length; i++) {
- // Here we directly get the object because it avoids the creation of garbage and because we'll need the object anyway to compare the value
- if (extensionId.equals(((Extension) objectManager.getObject(children[i], RegistryObjectManager.EXTENSION)).getUniqueIdentifier()))
- return (ExtensionHandle) objectManager.getHandle(children[i], RegistryObjectManager.EXTENSION);
- }
- return null;
- }
-
- public IConfigurationElement[] getConfigurationElements() {
- //get the actual extension objects since we'll need to get the configuration elements information.
- Extension[] tmpExtensions = (Extension[]) objectManager.getObjects(getExtensionPoint().getRawChildren(), RegistryObjectManager.EXTENSION);
- if (tmpExtensions.length == 0)
- return ConfigurationElementHandle.EMPTY_ARRAY;
-
- ArrayList result = new ArrayList();
- for (int i = 0; i < tmpExtensions.length; i++) {
- result.addAll(Arrays.asList(objectManager.getHandles(tmpExtensions[i].getRawChildren(), RegistryObjectManager.CONFIGURATION_ELEMENT)));
- }
- return (IConfigurationElement[]) result.toArray(new IConfigurationElement[result.size()]);
- }
-
- public String getLabel() {
- return getExtensionPoint().getLabel();
- }
-
- public String getSchemaReference() {
- return getExtensionPoint().getSchemaReference();
- }
-
- public String getSimpleIdentifier() {
- return getExtensionPoint().getSimpleIdentifier();
- }
-
- public String getUniqueIdentifier() {
- return getExtensionPoint().getUniqueIdentifier();
- }
-
- RegistryObject getObject() {
- return getExtensionPoint();
- }
-
- protected ExtensionPoint getExtensionPoint() {
- return (ExtensionPoint) objectManager.getObject(getId(), RegistryObjectManager.EXTENSION_POINT);
- }
-
- public boolean isValid() {
- try {
- getExtensionPoint();
- } catch (InvalidRegistryObjectException e) {
- return false;
- }
- return true;
- }
}
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionRegistry.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionRegistry.java
index da025eb62..5b7efadab 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionRegistry.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionRegistry.java
@@ -17,8 +17,7 @@ import javax.xml.parsers.ParserConfigurationException;
import org.eclipse.core.internal.registry.spi.ConfigurationElementDescription;
import org.eclipse.core.internal.registry.spi.ConfigurationElementAttribute;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.registry.*;
-import org.eclipse.equinox.registry.spi.RegistryStrategy;
+import org.eclipse.core.runtime.spi.RegistryStrategy;
import org.eclipse.osgi.storagemanager.StorageManager;
import org.eclipse.osgi.util.NLS;
import org.xml.sax.InputSource;
@@ -31,9 +30,9 @@ public class ExtensionRegistry implements IExtensionRegistry {
protected class ListenerInfo {
public String filter;
- public EventListener listener;
+ public IRegistryChangeListener listener;
- public ListenerInfo(EventListener listener, String filter) {
+ public ListenerInfo(IRegistryChangeListener listener, String filter) {
this.listener = listener;
this.filter = filter;
}
@@ -70,10 +69,7 @@ public class ExtensionRegistry implements IExtensionRegistry {
private Object masterToken; // use to get full control of the registry; objects created as "static"
private Object userToken; // use to modify non-persisted registry elements
- /////////////////////////////////////////////////////////////////////////////////////////
- // Registry strategies
- protected RegistryStrategy strategy;
- protected ICompatibilityStrategy compatibilityStrategy = null;
+ protected RegistryStrategy strategy; // overridable portions of the registry functionality
public RegistryObjectManager getObjectManager() {
return registryObjects;
@@ -176,12 +172,12 @@ public class ExtensionRegistry implements IExtensionRegistry {
return affectedNamespaces;
}
- public void addRegistryChangeListener(EventListener listener) {
+ public void addRegistryChangeListener(IRegistryChangeListener listener) {
// this is just a convenience API - no need to do any sync'ing here
addRegistryChangeListener(listener, null);
}
- public void addRegistryChangeListener(EventListener listener, String filter) {
+ public void addRegistryChangeListener(IRegistryChangeListener listener, String filter) {
synchronized (listeners) {
listeners.add(new ListenerInfo(listener, filter));
}
@@ -555,7 +551,7 @@ public class ExtensionRegistry implements IExtensionRegistry {
return affectedNamespaces;
}
- public void removeRegistryChangeListener(EventListener listener) {
+ public void removeRegistryChangeListener(IRegistryChangeListener listener) {
synchronized (listeners) {
listeners.remove(new ListenerInfo(listener, null));
}
@@ -566,9 +562,7 @@ public class ExtensionRegistry implements IExtensionRegistry {
strategy = registryStrategy;
else
strategy = new RegistryStrategy(null, true);
- // split strategies - reduce number of "instanceof" calls
- if (registryStrategy instanceof ICompatibilityStrategy)
- compatibilityStrategy = (ICompatibilityStrategy) strategy;
+
// create the file manager right away
setFileManager(strategy.getStorage(), strategy.isCacheReadOnly());
@@ -681,8 +675,8 @@ public class ExtensionRegistry implements IExtensionRegistry {
} catch (IOException e) {
//Ignore the exception since we can recompute the cache
}
- cacheStorageManager.close();
theTableReader.close();
+ cacheStorageManager.close();
}
/*
@@ -814,8 +808,6 @@ public class ExtensionRegistry implements IExtensionRegistry {
continue;
if (listenerInfo.listener instanceof IRegistryChangeListener)
((IRegistryChangeListener) listenerInfo.listener).registryChanged(new RegistryChangeEvent(deltas, listenerInfo.filter));
- if (compatibilityStrategy != null)
- compatibilityStrategy.invokeListener(listenerInfo.listener, deltas, listenerInfo.filter);
}
for (Iterator iter = deltas.values().iterator(); iter.hasNext();) {
((RegistryDelta) iter.next()).getObjectManager().close();
@@ -954,7 +946,7 @@ public class ExtensionRegistry implements IExtensionRegistry {
* If the registry is not modifiable, this method is an access controlled method.
* Proper token should be passed as an argument for non-modifiable registries.
* </p>
- * @see org.eclipse.equinox.registry.spi.RegistryStrategy#isModifiable()
+ * @see org.eclipse.core.runtime.spi.RegistryStrategy#isModifiable()
*
* @param identifier Id of the extension point. If non-qualified names is supplied,
* it will be converted internally into a fully qualified name
@@ -965,7 +957,7 @@ public class ExtensionRegistry implements IExtensionRegistry {
* @param schemaReference reference to the extension point schema. The schema reference
* is a URL path relative to the plug-in installation URL. May be null
* @param token the key used to check permissions. Two registry keys are set in the registry
- * constructor {@link RegistryFactory#createRegistry(org.eclipse.equinox.registry.spi.RegistryStrategy, Object, Object)}:
+ * constructor {@link RegistryFactory#createRegistry(org.eclipse.core.runtime.spi.RegistryStrategy, Object, Object)}:
* master token and a user token. Master token allows all operations; user token
* allows non-persisted registry elements to be modified.
* @throws IllegalArgumentException if incorrect token is passed in
@@ -1018,7 +1010,7 @@ public class ExtensionRegistry implements IExtensionRegistry {
* If the registry is not modifiable, this method is an access controlled method.
* Proper token should be passed as an argument for non-modifiable registries.
* </p>
- * @see org.eclipse.equinox.registry.spi.RegistryStrategy#isModifiable()
+ * @see org.eclipse.core.runtime.spi.RegistryStrategy#isModifiable()
* @see org.eclipse.core.internal.registry.spi.ConfigurationElementDescription
*
* @param identifier Id of the extension. If non-qualified name is supplied,
@@ -1031,7 +1023,7 @@ public class ExtensionRegistry implements IExtensionRegistry {
* name is supplied, it is assumed to have the same contributorId as this extension
* @param configurationElements contents of the extension
* @param token the key used to check permissions. Two registry keys are set in the registry
- * constructor {@link RegistryFactory#createRegistry(org.eclipse.equinox.registry.spi.RegistryStrategy, Object, Object)}:
+ * constructor {@link RegistryFactory#createRegistry(org.eclipse.core.runtime.spi.RegistryStrategy, Object, Object)}:
* master token and a user token. Master token allows all operations; user token
* allows non-persisted registry elements to be modified.
* @throws IllegalArgumentException if incorrect token is passed in
@@ -1168,12 +1160,8 @@ public class ExtensionRegistry implements IExtensionRegistry {
return true;
}
- public void setCompatibilityStrategy(ICompatibilityStrategy strategy) {
- compatibilityStrategy = strategy;
- }
-
/**
- * This is an experimental funciton. It <b>will</b> be modified in future.
+ * This is an experimental function. It <b>will</b> be modified in future.
*/
public Object getTemporaryUserToken() {
return userToken;
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Handle.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Handle.java
index ca1ef6240..35c1f725f 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Handle.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Handle.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.core.internal.registry;
-import org.eclipse.equinox.registry.InvalidRegistryObjectException;
+import org.eclipse.core.runtime.InvalidRegistryObjectException;
/**
* A handle is the super class to all registry objects that are now served to users.
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ICompatibilityStrategy.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ICompatibilityStrategy.java
deleted file mode 100644
index 2f8e868c8..000000000
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ICompatibilityStrategy.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.internal.registry;
-
-import java.util.EventListener;
-import java.util.Map;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.equinox.registry.IConfigurationElement;
-
-/**
- * This interfaces provides a bridge between the "old" org.eclipse.core.runitime elements
- * and "new" org.eclipse.equinox.registry elements. While registry internally operates
- * with "new" elements, listeners might expect "old" element types.
- *
- * The interface provides backward compatibility. It is not expected to be implemented
- * or extended by clients.
- *
- * @since org.eclipse.equinox.registry 1.0
- */
-public interface ICompatibilityStrategy {
- /**
- * Implement to ADD an additional listener invocation mechanism.
- * (Default meachnism is executed first, this implementation is executed second.)
- *
- * @param listener - the listener to be invoked
- * @param deltas - event deltas
- * @param filter - the listener filter string
- */
- public void invokeListener(EventListener listener, Map deltas, String filter);
-
- /**
- * Implement to ADD an additional initialization path for the CreateExecutableExtensions.
- * (Default meachnism is executed first, this implementation is executed second.)
- * @param newClassInstance - class just created for an executable extension
- * @param confElement - ConfigurationElement that triggered creation of this element
- * @param propertyName - name of the attribute describing class to be created
- * @param initData - initialization data
- * @throws CoreException
- */
- public void setInitializationData(Object newClassInstance, IConfigurationElement confElement, String propertyName, Object initData) throws CoreException;
-
-
- /**
- * Implement to ADD an additional creation path for the CreateExecutableExtensions.
- * (Default meachnism is executed first, this implementation is executed second.)
- *
- * @param result - object being created
- * @return object returned by the IExecutableExtensionFactory.create() method
- */
- public Object create(Object result) throws CoreException ;
-}
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryChangeEvent.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryChangeEvent.java
index e35df396b..92c2c705e 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryChangeEvent.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryChangeEvent.java
@@ -12,8 +12,8 @@ package org.eclipse.core.internal.registry;
import java.util.Arrays;
import java.util.Map;
-import org.eclipse.equinox.registry.IExtensionDelta;
-import org.eclipse.equinox.registry.IRegistryChangeEvent;
+import org.eclipse.core.runtime.IExtensionDelta;
+import org.eclipse.core.runtime.IRegistryChangeEvent;
/**
* A registry change event implementation. A filter can be specified. In that case, only
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryDelta.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryDelta.java
index d25cb73fd..12b66dbda 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryDelta.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryDelta.java
@@ -11,8 +11,8 @@
package org.eclipse.core.internal.registry;
import java.util.*;
-import org.eclipse.equinox.registry.IExtension;
-import org.eclipse.equinox.registry.IExtensionDelta;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionDelta;
/**
* The extension deltas are grouped by namespace. There is one registry delta by namespace.
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectManager.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectManager.java
index 5ccc3dfe4..d92943196 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectManager.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectManager.java
@@ -12,7 +12,7 @@ package org.eclipse.core.internal.registry;
import java.lang.ref.SoftReference;
import java.util.*;
-import org.eclipse.equinox.registry.InvalidRegistryObjectException;
+import org.eclipse.core.runtime.InvalidRegistryObjectException;
/**
* This class manage all the object from the registry but does not deal with their dependencies.
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TableWriter.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TableWriter.java
index 9f8b71c87..2b929d67e 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TableWriter.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TableWriter.java
@@ -12,10 +12,7 @@ package org.eclipse.core.internal.registry;
import java.io.*;
import java.util.*;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.registry.IConfigurationElement;
-import org.eclipse.equinox.registry.IExtension;
+import org.eclipse.core.runtime.*;
public class TableWriter {
private static final byte fileError = 0;
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TemporaryObjectManager.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TemporaryObjectManager.java
index 7c5d160b1..8af033054 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TemporaryObjectManager.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TemporaryObjectManager.java
@@ -11,7 +11,7 @@
package org.eclipse.core.internal.registry;
import java.util.Map;
-import org.eclipse.equinox.registry.InvalidRegistryObjectException;
+import org.eclipse.core.runtime.InvalidRegistryObjectException;
/**
* @since 3.1
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ThirdLevelConfigurationElementHandle.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ThirdLevelConfigurationElementHandle.java
index 1931b8c88..7cf9d0d61 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ThirdLevelConfigurationElementHandle.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ThirdLevelConfigurationElementHandle.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.core.internal.registry;
-import org.eclipse.equinox.registry.IConfigurationElement;
+import org.eclipse.core.runtime.IConfigurationElement;
/**
* @since 3.1
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java
index db74720be..200b4504b 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/Activator.java
@@ -13,8 +13,7 @@ package org.eclipse.core.internal.registry.osgi;
import java.io.File;
import java.util.Hashtable;
import org.eclipse.core.internal.registry.IRegistryConstants;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.equinox.registry.*;
+import org.eclipse.core.runtime.*;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
import org.osgi.framework.*;
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java
index 12a70d357..3eb79df05 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EclipseBundleListener.java
@@ -18,9 +18,7 @@ import org.eclipse.core.internal.registry.ExtensionRegistry;
import org.eclipse.core.internal.registry.RegistryMessages;
import org.eclipse.core.internal.runtime.ResourceTranslator;
import org.eclipse.core.internal.runtime.RuntimeLog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.registry.RegistryUtils;
+import org.eclipse.core.runtime.*;
import org.eclipse.osgi.util.ManifestElement;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.*;
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryProviderOSGI.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryProviderOSGI.java
index a5b728827..3b46dfe7f 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryProviderOSGI.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryProviderOSGI.java
@@ -12,10 +12,7 @@ package org.eclipse.core.internal.registry.osgi;
import org.eclipse.core.internal.registry.RegistryMessages;
import org.eclipse.core.internal.runtime.RuntimeLog;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.registry.IExtensionRegistry;
-import org.eclipse.equinox.registry.IRegistryProvider;
+import org.eclipse.core.runtime.*;
import org.osgi.framework.BundleContext;
import org.osgi.util.tracker.ServiceTracker;
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryStrategyOSGI.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryStrategyOSGI.java
index 1353e80a1..eceb76422 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryStrategyOSGI.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryStrategyOSGI.java
@@ -22,9 +22,7 @@ import org.eclipse.core.internal.runtime.ResourceTranslator;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.equinox.registry.IRegistryProvider;
-import org.eclipse.equinox.registry.RegistryFactory;
-import org.eclipse.equinox.registry.spi.RegistryStrategy;
+import org.eclipse.core.runtime.spi.RegistryStrategy;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -78,16 +76,10 @@ public class RegistryStrategyOSGI extends RegistryStrategy {
token = key;
}
- /* (non-Javadoc)
- * @see org.eclipse.equinox.registry.spi.RegistryStrategy#isModifiable()
- */
public boolean isModifiable() {
return false; // Clients are not allowed to add information into this registry
}
- /* (non-Javadoc)
- * @see org.eclipse.equinox.registry.spi.RegistryStrategy#translate(java.lang.String, java.util.ResourceBundle)
- */
public final String translate(String key, ResourceBundle resources) {
return ResourceTranslator.getResourceString(null, key, resources);
}
@@ -126,9 +118,6 @@ public class RegistryStrategyOSGI extends RegistryStrategy {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.equinox.registry.spi.RegistryStrategy#scheduleChangeEvent(java.lang.Object[], java.util.Map, java.lang.Object)
- */
public final void scheduleChangeEvent(Object[] listeners, Map deltas, Object registry) {
new ExtensionEventDispatcherJob(listeners, deltas, registry).schedule();
}
@@ -232,7 +221,7 @@ public class RegistryStrategyOSGI extends RegistryStrategy {
/////////////////////////////////////////////////////////////////////////////////////
// Executable extensions: bundle-based class loading
- public Object createExecutableExtension(String pluginName, String namespaceOwnerId, String namespaceName, String className, Object initData, String propertyName, org.eclipse.equinox.registry.IConfigurationElement confElement) throws CoreException {
+ public Object createExecutableExtension(String pluginName, String namespaceOwnerId, String namespaceName, String className, Object initData, String propertyName, org.eclipse.core.runtime.IConfigurationElement confElement) throws CoreException {
if (pluginName != null && !pluginName.equals("") && !pluginName.equals(namespaceName)) { //$NON-NLS-1$
Bundle otherBundle = null;
@@ -244,7 +233,7 @@ public class RegistryStrategyOSGI extends RegistryStrategy {
return createExecutableExtension(contributingBundle, className, initData, propertyName, confElement);
}
- private Object createExecutableExtension(Bundle bundle, String className, Object initData, String propertyName, org.eclipse.equinox.registry.IConfigurationElement confElement) throws CoreException {
+ private Object createExecutableExtension(Bundle bundle, String className, Object initData, String propertyName, org.eclipse.core.runtime.IConfigurationElement confElement) throws CoreException {
// load the requested class from this plugin
Class classInstance = null;
try {
@@ -278,9 +267,6 @@ public class RegistryStrategyOSGI extends RegistryStrategy {
*/
private EclipseBundleListener pluginBundleListener = null;
- /* (non-Javadoc)
- * @see org.eclipse.equinox.registry.spi.RegistryStrategy#start(java.lang.Object)
- */
public void onStart(Object registry) {
super.onStart(registry);
if (!(registry instanceof ExtensionRegistry))
@@ -301,9 +287,6 @@ public class RegistryStrategyOSGI extends RegistryStrategy {
pluginBundleListener.processBundles(Activator.getContext().getBundles());
}
- /* (non-Javadoc)
- * @see org.eclipse.equinox.registry.spi.RegistryStrategy#stop(java.lang.Object)
- */
public void onStop(Object registry) {
if (pluginBundleListener != null)
Activator.getContext().removeBundleListener(pluginBundleListener);
@@ -317,23 +300,14 @@ public class RegistryStrategyOSGI extends RegistryStrategy {
//////////////////////////////////////////////////////////////////////////////////////
// Cache strategy
- /* (non-Javadoc)
- * @see org.eclipse.equinox.registry.spi.RegistryStrategy#useCache()
- */
public boolean cacheUse() {
return !"true".equals(System.getProperty(IRegistryConstants.PROP_NO_REGISTRY_CACHE)); //$NON-NLS-1$
}
- /* (non-Javadoc)
- * @see org.eclipse.equinox.registry.spi.RegistryStrategy#lazyCacheLoading()
- */
public boolean cacheLazyLoading() {
return !("true".equalsIgnoreCase(System.getProperty(IRegistryConstants.PROP_NO_LAZY_CACHE_LOADING))); //$NON-NLS-1$
}
- /* (non-Javadoc)
- * @see org.eclipse.equinox.registry.spi.RegistryStrategy#computeTimeStamp()
- */
public long cacheComputeTimeStamp() {
// If the check config prop is false or not set then exit
if (!"true".equalsIgnoreCase(System.getProperty(IRegistryConstants.PROP_CHECK_CONFIG))) //$NON-NLS-1$
@@ -359,9 +333,6 @@ public class RegistryStrategyOSGI extends RegistryStrategy {
return result;
}
- /* (non-Javadoc)
- * @see org.eclipse.equinox.registry.spi.RegistryStrategy#getXMLParser()
- */
public SAXParserFactory getXMLParser() {
if (xmlTracker == null) {
xmlTracker = new ServiceTracker(Activator.getContext(), SAXParserFactory.class.getName(), null);
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/spi/ConfigurationElementAttribute.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/spi/ConfigurationElementAttribute.java
index 03ddd53c5..fd9b2a152 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/spi/ConfigurationElementAttribute.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/spi/ConfigurationElementAttribute.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.core.internal.registry.spi;
-import org.eclipse.equinox.registry.IConfigurationElement;
+import org.eclipse.core.runtime.IConfigurationElement;
/**
* Describes properties of configuration elements to be added to the registry.
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/spi/ConfigurationElementDescription.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/spi/ConfigurationElementDescription.java
index c5118cee4..d7545475f 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/spi/ConfigurationElementDescription.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/spi/ConfigurationElementDescription.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.core.internal.registry.spi;
-import org.eclipse.equinox.registry.IConfigurationElement;
+import org.eclipse.core.runtime.IConfigurationElement;
/**
* Describes configuration elements (content of an extension) to be added to
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IConfigurationElement.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IConfigurationElement.java
index e90697edf..648a0be7a 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IConfigurationElement.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IConfigurationElement.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry;
+package org.eclipse.core.runtime;
import org.eclipse.core.runtime.CoreException;
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExecutableExtension.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtension.java
index 420e757a1..8ce094be0 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExecutableExtension.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtension.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry;
+package org.eclipse.core.runtime;
import org.eclipse.core.runtime.CoreException;
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExecutableExtensionFactory.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtensionFactory.java
index 3c9c47cf4..f8f858033 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExecutableExtensionFactory.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtensionFactory.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry;
+package org.eclipse.core.runtime;
import org.eclipse.core.runtime.CoreException;
@@ -33,7 +33,7 @@ import org.eclipse.core.runtime.CoreException;
* Like any other executable extension, they can configured by implementing {@link org.eclipse.core.runtime.IExecutableExtension} interface.
* </p>
*
- * @see org.eclipse.equinox.registry.IConfigurationElement
+ * @see org.eclipse.core.runtime.IConfigurationElement
* @since org.eclipse.equinox.registry 1.0
*/
public interface IExecutableExtensionFactory {
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtension.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtension.java
index 82e86dcee..9a12b3bf1 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtension.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtension.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry;
+package org.eclipse.core.runtime;
/**
* An extension declared in a plug-in.
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionDelta.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionDelta.java
index adcec1ef0..cb83847d3 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionDelta.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionDelta.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry;
+package org.eclipse.core.runtime;
/**
* An extension delta represents changes to the extension registry.
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionPoint.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionPoint.java
index ddbe7bc0e..e83449709 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionPoint.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionPoint.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry;
+package org.eclipse.core.runtime;
/**
* An extension point declared in a plug-in.
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionRegistry.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionRegistry.java
index bb6705de1..d79d9c844 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionRegistry.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionRegistry.java
@@ -8,10 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry;
+package org.eclipse.core.runtime;
import java.io.InputStream;
-import java.util.EventListener;
import java.util.ResourceBundle;
/**
@@ -51,6 +50,7 @@ import java.util.ResourceBundle;
* <p>
* This interface is not intended to be implemented by clients.
* </p>
+ * @since 3.0
*/
public interface IExtensionRegistry {
/**
@@ -70,9 +70,9 @@ public interface IExtensionRegistry {
* @param namespace the namespace in which to listen for changes
* @see IRegistryChangeListener
* @see IRegistryChangeEvent
- * @see #removeRegistryChangeListener(EventListener)
+ * @see #removeRegistryChangeListener(IRegistryChangeListener)
*/
- public void addRegistryChangeListener(EventListener listener, String namespace);
+ public void addRegistryChangeListener(IRegistryChangeListener listener, String namespace);
/**
* Adds the given listener for registry change events.
@@ -88,10 +88,10 @@ public interface IExtensionRegistry {
* @param listener the listener
* @see IRegistryChangeListener
* @see IRegistryChangeEvent
- * @see #addRegistryChangeListener(EventListener, String)
- * @see #removeRegistryChangeListener(EventListener)
+ * @see #addRegistryChangeListener(IRegistryChangeListener, String)
+ * @see #removeRegistryChangeListener(IRegistryChangeListener)
*/
- public void addRegistryChangeListener(EventListener listener);
+ public void addRegistryChangeListener(IRegistryChangeListener listener);
/**
* Returns all configuration elements from all extensions configured
@@ -241,10 +241,10 @@ public interface IExtensionRegistry {
*
* @param listener the listener
* @see IRegistryChangeListener
- * @see #addRegistryChangeListener(EventListener)
- * @see #addRegistryChangeListener(EventListener, String)
+ * @see #addRegistryChangeListener(IRegistryChangeListener)
+ * @see #addRegistryChangeListener(IRegistryChangeListener, String)
*/
- public void removeRegistryChangeListener(EventListener listener);
+ public void removeRegistryChangeListener(IRegistryChangeListener listener);
/**
* Adds to this extension registry an extension point(s), extension(s), or
@@ -265,7 +265,7 @@ public interface IExtensionRegistry {
* @param name optional name of the contribution. Used for error reporting; might be null
* @param translationBundle optional resource bundle used for translations; might be null
* @param token the key used to check permissions. Two registry keys are set in the registry
- * constructor {@link RegistryFactory#createRegistry(org.eclipse.equinox.registry.spi.RegistryStrategy, Object, Object)}:
+ * constructor {@link RegistryFactory#createRegistry(org.eclipse.core.runtime.spi.RegistryStrategy, Object, Object)}:
* master token and a user token. Master token allows all operations; user token
* allows non-persisted registry elements to be modified.
* @return - true: the contribution was successfully processed; false - error in
@@ -279,7 +279,7 @@ public interface IExtensionRegistry {
*
* @param extension extension to be removed
* @param token the key used to check permissions. Two registry keys are set in the registry
- * constructor {@link RegistryFactory#createRegistry(org.eclipse.equinox.registry.spi.RegistryStrategy, Object, Object)}:
+ * constructor {@link RegistryFactory#createRegistry(org.eclipse.core.runtime.spi.RegistryStrategy, Object, Object)}:
* master token and a user token. Master token allows all operations; user token only
* allows non-persisted registry elements to be modified.
* <p>
@@ -296,7 +296,7 @@ public interface IExtensionRegistry {
*
* @param extensionPoint extension point to be removed
* @param token the key used to check permissions. Two registry keys are set in the registry
- * constructor {@link RegistryFactory#createRegistry(org.eclipse.equinox.registry.spi.RegistryStrategy, Object, Object)}:
+ * constructor {@link RegistryFactory#createRegistry(org.eclipse.core.runtime.spi.RegistryStrategy, Object, Object)}:
* master token and a user token. Master token allows all operations; user token only
* allows non-persisted registry elements to be modified.
* <p>
@@ -315,7 +315,7 @@ public interface IExtensionRegistry {
* <p>
* This method is an access controlled method. Master token should be passed as an argument.
* </p>
- * @see RegistryFactory#createRegistry(org.eclipse.equinox.registry.spi.RegistryStrategy, Object, Object)
+ * @see RegistryFactory#createRegistry(org.eclipse.core.runtime.spi.RegistryStrategy, Object, Object)
* @param token master token for the registry
* @throws IllegalArgumentException if incorrect token is passed
*/
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IRegistryChangeEvent.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeEvent.java
index 6a5364d8d..f7af951c6 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IRegistryChangeEvent.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeEvent.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry;
+package org.eclipse.core.runtime;
/**
* Registry change events describe changes to the extension registry.
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IRegistryChangeListener.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeListener.java
index 7d627737b..8c908af44 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IRegistryChangeListener.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeListener.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry;
+package org.eclipse.core.runtime;
import java.util.EventListener;
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IRegistryProvider.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryProvider.java
index 0e0c47278..de462fb3f 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IRegistryProvider.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry;
+package org.eclipse.core.runtime;
/**
* Implement this interface to specify the default extension registry.
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/RegistryFactory.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryFactory.java
index a1a57910f..bf877a83a 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/RegistryFactory.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,11 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry;
+package org.eclipse.core.runtime;
-import org.eclipse.core.internal.registry.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.registry.spi.RegistryStrategy;
+import org.eclipse.core.internal.registry.ExtensionRegistry;
+import org.eclipse.core.runtime.spi.RegistryStrategy;
/**
* Use this class to create or obtain an extension registry.
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/RegistryUtils.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryUtils.java
index 8c2713eb5..5731912d9 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/RegistryUtils.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryUtils.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,14 +8,13 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry;
+package org.eclipse.core.runtime;
import java.io.File;
import org.eclipse.core.internal.registry.IRegistryConstants;
import org.eclipse.core.internal.registry.RegistryMessages;
import org.eclipse.core.internal.registry.osgi.RegistryStrategyOSGI;
-import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.registry.spi.RegistryStrategy;
+import org.eclipse.core.runtime.spi.RegistryStrategy;
import org.osgi.framework.Bundle;
/**
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/ExtensionTracker.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.java
index 6512c4e39..486fc2a64 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/ExtensionTracker.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.java
@@ -8,27 +8,27 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry.tracker;
+package org.eclipse.core.runtime.dynamichelpers;
import java.util.HashMap;
import java.util.Map;
import org.eclipse.core.internal.registry.RegistryMessages;
import org.eclipse.core.internal.runtime.ReferenceHashSet;
import org.eclipse.core.internal.runtime.RuntimeLog;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionDelta;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IRegistryChangeEvent;
+import org.eclipse.core.runtime.IRegistryChangeListener;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.core.runtime.RegistryFactory;
import org.eclipse.core.runtime.Status;
-import org.eclipse.equinox.registry.IExtension;
-import org.eclipse.equinox.registry.IExtensionDelta;
-import org.eclipse.equinox.registry.IExtensionPoint;
-import org.eclipse.equinox.registry.IExtensionRegistry;
-import org.eclipse.equinox.registry.IRegistryChangeEvent;
-import org.eclipse.equinox.registry.IRegistryChangeListener;
-import org.eclipse.equinox.registry.RegistryFactory;
/**
* Implementation of the IExtensionTracker.
- * @see org.eclipse.equinox.registry.tracker.IExtensionTracker
+ * @see org.eclipse.core.runtime.dynamichelpers.IExtensionTracker
* @since 3.1
*/
public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListener {
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/IExtensionChangeHandler.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionChangeHandler.java
index 20d8a365a..16378763c 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/IExtensionChangeHandler.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionChangeHandler.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry.tracker;
+package org.eclipse.core.runtime.dynamichelpers;
-import org.eclipse.equinox.registry.IExtension;
+import org.eclipse.core.runtime.IExtension;
/**
* Extension change handlers are notified of changes for a given extension
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/IExtensionTracker.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionTracker.java
index 3f543776f..dadf4996b 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/IExtensionTracker.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionTracker.java
@@ -8,10 +8,10 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry.tracker;
+package org.eclipse.core.runtime.dynamichelpers;
import org.eclipse.core.internal.runtime.ReferenceHashSet;
-import org.eclipse.equinox.registry.IExtension;
+import org.eclipse.core.runtime.IExtension;
/**
* An extension tracker keeps associations between extensions and their derived objects on an extension basis.
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/IFilter.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IFilter.java
index fcaefd8f6..1dc0203db 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/IFilter.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IFilter.java
@@ -8,9 +8,9 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry.tracker;
+package org.eclipse.core.runtime.dynamichelpers;
-import org.eclipse.equinox.registry.IExtensionPoint;
+import org.eclipse.core.runtime.IExtensionPoint;
/**
* A filter compares the given object to some pattern and returns true
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/package.html b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/package.html
index 2ad57b474..154a80aa2 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/tracker/package.html
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/package.html
@@ -11,4 +11,4 @@ Package Specification</h2>
This package specifies the API for tracking extensions life-cycle.
</p>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/package.html b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/package.html
index d413b3c9a..d413b3c9a 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/package.html
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/package.html
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/spi/RegistryStrategy.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java
index 248217be1..7229eb177 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/spi/RegistryStrategy.java
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.registry.spi;
+package org.eclipse.core.runtime.spi;
import java.io.File;
import java.util.Map;
@@ -16,7 +16,6 @@ import java.util.ResourceBundle;
import javax.xml.parsers.SAXParserFactory;
import org.eclipse.core.internal.registry.*;
import org.eclipse.core.runtime.*;
-import org.eclipse.equinox.registry.IConfigurationElement;
import org.eclipse.osgi.util.NLS;
/**
@@ -344,7 +343,7 @@ public class RegistryStrategy {
* The parser used by the registry to parse descriptions of extension points
* and extensions from the XML input streams.
*
- * @see org.eclipse.equinox.registry.IExtensionRegistry#addContribution(java.io.InputStream, String, boolean, String, ResourceBundle, Object)
+ * @see org.eclipse.core.runtime.IExtensionRegistry#addContribution(java.io.InputStream, String, boolean, String, ResourceBundle, Object)
*
* @return XML parser
*/
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/spi/package.html b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/package.html
index 7812724a6..7812724a6 100644
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/spi/package.html
+++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/package.html
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/InvalidRegistryObjectException.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/InvalidRegistryObjectException.java
deleted file mode 100644
index 8064860bc..000000000
--- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/InvalidRegistryObjectException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.equinox.registry;
-
-/**
- * An unchecked exception indicating that an attempt to access
- * an extension registry object that is no longer valid.
- * <p>
- * This exception is thrown by methods on extension registry
- * objects. It is not intended to be instantiated or
- * subclassed by clients.
- * </p>
- */
-public class InvalidRegistryObjectException extends RuntimeException {
- /*
- * Declare a stable serialVersionUID.
- */
- private static final long serialVersionUID = 1L;
-
- private static final String MESSAGE = "Invalid registry object"; //$NON-NLS-1$
-
- /**
- * Creates a new exception instance with null as its detail message.
- */
- public InvalidRegistryObjectException() {
- super(MESSAGE);
- }
-}

Back to the top