diff options
12 files changed, 13 insertions, 27 deletions
diff --git a/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF index bdd809dbf..f604df508 100644 --- a/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Export-Package: org.eclipse.core.internal.registry;x-friends:="org.eclipse.core. 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.core.runtime, org.eclipse.equinox.registry, org.eclipse.equinox.registry.tracker Require-Bundle: org.eclipse.equinox.common 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 38320f1c6..aec8fbc4a 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,8 +11,7 @@ package org.eclipse.core.internal.registry; import org.eclipse.core.runtime.*; -import org.eclipse.equinox.registry.IConfigurationElement; -import org.eclipse.equinox.registry.IExtension; +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 7dfdf3210..107965ec5 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.core.runtime.InvalidRegistryObjectException; +import org.eclipse.equinox.registry.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/ExtensionHandle.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionHandle.java index 403a8842d..77bc6c55b 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,9 +10,7 @@ *******************************************************************************/ package org.eclipse.core.internal.registry; -import org.eclipse.core.runtime.InvalidRegistryObjectException; -import org.eclipse.equinox.registry.IConfigurationElement; -import org.eclipse.equinox.registry.IExtension; +import org.eclipse.equinox.registry.*; /** * @since 3.1 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 d3b8496d4..98822d549 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 @@ -12,7 +12,6 @@ package org.eclipse.core.internal.registry; import java.util.ArrayList; import java.util.Arrays; -import org.eclipse.core.runtime.InvalidRegistryObjectException; import org.eclipse.equinox.registry.*; /** 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 7f8b142bb..ca1ef6240 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * 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 @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.core.internal.registry; -import org.eclipse.core.runtime.InvalidRegistryObjectException; +import org.eclipse.equinox.registry.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/RegistryObjectManager.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectManager.java index d92943196..5ccc3dfe4 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.core.runtime.InvalidRegistryObjectException; +import org.eclipse.equinox.registry.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/TemporaryObjectManager.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TemporaryObjectManager.java index bffa67818..7c5d160b1 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. + * 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 @@ -11,7 +11,7 @@ package org.eclipse.core.internal.registry; import java.util.Map; -import org.eclipse.core.runtime.InvalidRegistryObjectException; +import org.eclipse.equinox.registry.InvalidRegistryObjectException; /** * @since 3.1 diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IConfigurationElement.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IConfigurationElement.java index c6f5ac169..e90697edf 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IConfigurationElement.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IConfigurationElement.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 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 @@ -11,7 +11,6 @@ package org.eclipse.equinox.registry; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.InvalidRegistryObjectException; /** * A configuration element, with its attributes and children, diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtension.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtension.java index 9001c986c..82e86dcee 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtension.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtension.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. + * Copyright (c) 2000, 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 @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.equinox.registry; -import org.eclipse.core.runtime.InvalidRegistryObjectException; - /** * An extension declared in a plug-in. * All information is obtained from the declaring plug-in's diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionPoint.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionPoint.java index b07ff361d..ddbe7bc0e 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionPoint.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/IExtensionPoint.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. + * Copyright (c) 2000, 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 @@ -10,8 +10,6 @@ *******************************************************************************/ package org.eclipse.equinox.registry; -import org.eclipse.core.runtime.InvalidRegistryObjectException; - /** * An extension point declared in a plug-in. * Except for the list of extensions plugged in to it, the information diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/InvalidRegistryObjectException.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/InvalidRegistryObjectException.java index ede5e3ac8..8064860bc 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/InvalidRegistryObjectException.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/equinox/registry/InvalidRegistryObjectException.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * 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 @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.core.runtime; +package org.eclipse.equinox.registry; /** * An unchecked exception indicating that an attempt to access @@ -18,11 +18,7 @@ package org.eclipse.core.runtime; * objects. It is not intended to be instantiated or * subclassed by clients. * </p> - * - * @since 3.1 */ -// XXX should this class be repackaged? IExecutableExtension is in an Eqinox package. -// But: it is a pre-existing class. It has to remain in the same package for backward compatibility. public class InvalidRegistryObjectException extends RuntimeException { /* * Declare a stable serialVersionUID. |