diff options
author | Andrey Loskutov | 2017-07-12 12:57:50 +0000 |
---|---|---|
committer | Andrey Loskutov | 2017-07-12 12:57:50 +0000 |
commit | 1cae455f025327f0fdca8adbd09a918d98b986bc (patch) | |
tree | f8647b8cbbdb69514d15e030e75aeae49ca00f34 | |
parent | 55836b9a5120fd36bc1021c36a5fdb361401ed55 (diff) | |
download | rt.equinox.bundles-1cae455f025327f0fdca8adbd09a918d98b986bc.tar.gz rt.equinox.bundles-1cae455f025327f0fdca8adbd09a918d98b986bc.tar.xz rt.equinox.bundles-1cae455f025327f0fdca8adbd09a918d98b986bc.zip |
Bug 519547 - cleanup trailing white space
Change-Id: I33c47d70d3d096ba21159df18d4f49882af578cc
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
75 files changed, 714 insertions, 714 deletions
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/adapter/AdapterFactoryProxy.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/adapter/AdapterFactoryProxy.java index f5c766313..4880e25a9 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/adapter/AdapterFactoryProxy.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/adapter/AdapterFactoryProxy.java @@ -3,8 +3,8 @@ * 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: + * + * Contributors: * IBM - Initial API and implementation * Oracle - Fix for bug 408506 ******************************************************************************/ @@ -32,7 +32,7 @@ class AdapterFactoryProxy implements IAdapterFactory, IAdapterFactoryExt { private IAdapterFactory factory; private boolean factoryLoaded = false; /** - * Store Id of the declaring extension. We might need it in case + * Store Id of the declaring extension. We might need it in case * the owner goes away (in this case element becomes invalid). */ private String ownerId; @@ -114,7 +114,7 @@ class AdapterFactoryProxy implements IAdapterFactory, IAdapterFactoryExt { /** * Loads the real adapter factory, but only if its associated plug-in is * already loaded. Returns the real factory if it was successfully loaded. - * @param force if <code>true</code> the plugin providing the + * @param force if <code>true</code> the plugin providing the * factory will be loaded if necessary, otherwise no plugin activations * will occur. */ @@ -125,13 +125,13 @@ class AdapterFactoryProxy implements IAdapterFactory, IAdapterFactoryExt { String contributorName = element.getContributor().getName(); boolean isActive; // Different VMs have different degrees of "laziness" for the class loading. - // To make sure that VM won't try to load EquinoxUtils before getting into - // this try-catch block, the fully qualified name is used (removing entry for + // To make sure that VM won't try to load EquinoxUtils before getting into + // this try-catch block, the fully qualified name is used (removing entry for // the EquinoxUtils from the import list). try { isActive = org.eclipse.core.internal.registry.osgi.EquinoxUtils.isActive(contributorName); } catch (NoClassDefFoundError noClass) { - // This block will only be triggered if VM loads classes in a very "eager" way. + // This block will only be triggered if VM loads classes in a very "eager" way. isActive = true; } if (!force && !isActive) 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 index 14b4e1941..77fba58ad 100644 --- 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -15,10 +15,10 @@ 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 + * + * @since org.eclipse.equinox.registry 3.2 */ public class BaseExtensionHandle extends Handle implements IExtension { 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 index 6080aba72..a9a4c2751 100644 --- 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -17,10 +17,10 @@ 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 + * + * @since org.eclipse.equinox.registry 3.2 */ public class BaseExtensionPointHandle extends Handle implements IExtensionPoint { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/BufferedRandomInputStream.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/BufferedRandomInputStream.java index c712a260e..c9b6894e0 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/BufferedRandomInputStream.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/BufferedRandomInputStream.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -19,7 +19,7 @@ public class BufferedRandomInputStream extends InputStream { private RandomAccessFile inputFile; private String filePath; // Canonical path to the underlying file used for logging - private int buffer_size; // Current size of the buffer + private int buffer_size; // Current size of the buffer private int buffer_pos; // Current read position in the buffer /** * The absolute position in the file where the buffered region starts. @@ -123,7 +123,7 @@ public class BufferedRandomInputStream extends InputStream { /** * Supplies functionality of the {@link java.io.RandomAccessFile#seek(long)} in * a buffer-friendly manner. - * + * * @param pos offset * @throws IOException */ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/CombinedEventDelta.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/CombinedEventDelta.java index 76ab805a3..a4ea4a3a4 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/CombinedEventDelta.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/CombinedEventDelta.java @@ -16,11 +16,11 @@ import org.eclipse.core.runtime.IExtensionPoint; /** * The class stores extensions and extensions points that have been actually - * modified by a registry operation. - * + * modified by a registry operation. + * * For performance, modified extensions and extension points are stored in two forms: * - organized in buckets by IDs of extension points (for listeners on specific ext.point) - * - aggregated in one list (for global listeners) + * - aggregated in one list (for global listeners) */ public class CombinedEventDelta { @@ -130,7 +130,7 @@ public class CombinedEventDelta { extensionPoints = (List) extPointsByID.get(id); else if (id == null) extensionPoints = allExtensionPoints; - if (extensionPoints == null) // no changes that fit the filter + if (extensionPoints == null) // no changes that fit the filter return null; int size = extensionPoints.size(); ArrayList result = new ArrayList(size); @@ -150,7 +150,7 @@ public class CombinedEventDelta { extensions = (List) extensionsByID.get(id); else if (id == null) extensions = allExtensions; - if (extensions == null) // no changes that fit the filter + if (extensions == null) // no changes that fit the filter return null; int size = extensions.size(); ArrayList result = new ArrayList(size); 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 a76a4b300..10ca0f528 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -27,16 +27,16 @@ public class ConfigurationElement extends RegistryObject { byte parentType; //This value is only interesting when running from cache. //Store the properties and the value of the configuration element. - //The format is the following: + //The format is the following: // [p1, v1, p2, v2, configurationElementValue] //If the array size is even, there is no "configurationElementValue (ie getValue returns null)". - //The properties and their values are alternated (v1 is the value of p1). + //The properties and their values are alternated (v1 is the value of p1). protected String[] propertiesAndValue; //The name of the configuration element private String name; - //ID of the actual contributor of this element + //ID of the actual contributor of this element //This value can be null when the element is loaded from disk and the owner has been uninstalled. //This happens when the configuration is obtained from a delta containing removed extension. private String contributorId; @@ -245,7 +245,7 @@ public class ConfigurationElement extends RegistryObject { // Check if we have extension adapter and initialize; // Make the call even if the initialization string is null try { - // We need to take into account both "old" and "new" style executable extensions + // We need to take into account both "old" and "new" style executable extensions ConfigurationElementHandle confElementHandle = new ConfigurationElementHandle(registry.getObjectManager(), getObjectId()); if (result instanceof IExecutableExtension) ((IExecutableExtension) result).setInitializationData(confElementHandle, attributeName, initData); 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 aa487b582..5e480add0 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -13,7 +13,7 @@ package org.eclipse.core.internal.registry; import org.eclipse.core.runtime.*; /** - * @since 3.1 + * @since 3.1 */ public class ConfigurationElementHandle extends Handle implements IConfigurationElement { static final ConfigurationElementHandle[] EMPTY_ARRAY = new ConfigurationElementHandle[0]; diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElementMulti.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElementMulti.java index 60fc219ad..c6fa8c5db 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElementMulti.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ConfigurationElementMulti.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ 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 10dda2e8c..e07392eff 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -15,7 +15,7 @@ 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. -// Each contribution is made in the context of a namespace. +// Each contribution is made in the context of a namespace. public class Contribution implements KeyedElement { static final int[] EMPTY_CHILDREN = new int[] {0, 0}; @@ -33,7 +33,7 @@ public class Contribution implements KeyedElement { // This array stores the identifiers of both the extension points and the extensions. // The array has always a minimum size of 2. - // The first element of the array is the number of extension points and the second the number of extensions. + // The first element of the array is the number of extension points and the second the number of extensions. // [numberOfExtensionPoints, numberOfExtensions, extensionPoint#1, extensionPoint#2, extensionPoint..., ext#1, ext#2, ext#3, ... ]. // The size of the array is 2 + (numberOfExtensionPoints + numberOfExtensions). private int[] children = EMPTY_CHILDREN; @@ -54,7 +54,7 @@ public class Contribution implements KeyedElement { // Old New Result // F F F // F T T => needs to be adjusted - // T F T + // T F T // T T T if (shouldPersist() != addContribution.shouldPersist()) persist = true; diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/DirectMap.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/DirectMap.java index d4976ca07..f27e8fbd1 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/DirectMap.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/DirectMap.java @@ -4,16 +4,16 @@ * 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; /** - * Essentially a map String -> String[] for small number of keys. - * - * For Maps containing a small number of objects hashing often reduces performance. + * Essentially a map String -> String[] for small number of keys. + * + * For Maps containing a small number of objects hashing often reduces performance. * This implementation uses two parallel arrays, one for keys, one for * values, and grows them as necessary. */ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Extension.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Extension.java index 1b34c6b17..58c12f524 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Extension.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Extension.java @@ -4,7 +4,7 @@ * 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 * Andrey Loskutov <loskutov@gmx.de> - bug 484014 @@ -15,14 +15,14 @@ import java.lang.ref.SoftReference; import org.eclipse.core.runtime.IContributor; /** - * An object which represents the user-defined extension in a plug-in manifest. + * An object which represents the user-defined extension in a plug-in manifest. */ public class Extension extends RegistryObject { public static final Extension[] EMPTY_ARRAY = new Extension[0]; //Extension simple identifier private String simpleId; - //The namespace for the extension. + //The namespace for the extension. private String namespaceIdentifier; // Place holder for the label and the extension point. It contains either a String[] or a SoftReference to a String[]. @@ -73,14 +73,14 @@ public class Extension extends RegistryObject { } private String[] getExtraData() { - //The extension has been created by parsing, or does not have any extra data + //The extension has been created by parsing, or does not have any extra data if (noExtraData()) { if (extraInformation != null) return (String[]) extraInformation; return null; } - //The extension has been loaded from the cache. + //The extension has been loaded from the cache. String[] result = null; if (extraInformation == null || (result = ((extraInformation instanceof SoftReference) ? (String[]) ((SoftReference) extraInformation).get() : (String[]) extraInformation)) == null) { result = registry.getTableReader().loadExtensionExtraData(getExtraDataOffset()); 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 ea8b43788..b72eda739 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 @@ -59,7 +59,7 @@ public class ExtensionDelta implements IExtensionDelta { @Override public String toString() { - return "\n\t\t" + getExtensionPoint().getUniqueIdentifier() + " - " + getExtension().getNamespaceIdentifier() + '.' + getExtension().getSimpleIdentifier() + " (" + getKindString(this.getKind()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + return "\n\t\t" + getExtensionPoint().getUniqueIdentifier() + " - " + getExtension().getNamespaceIdentifier() + '.' + getExtension().getSimpleIdentifier() + " (" + getKindString(this.getKind()) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } public static String getKindString(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 908e9fa86..6566f8b7a 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 @@ -4,20 +4,20 @@ * 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; /** - * The code (minus the getDeclaringPluginDescriptor() was moved into - * the BaseExtensionPointHandle to avoid duplicating code in the + * 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 + * + * @since 3.1 */ public class ExtensionHandle extends BaseExtensionHandle { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionMulti.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionMulti.java index 316d23bad..6cc833054 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionMulti.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionMulti.java @@ -4,14 +4,14 @@ * 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; /** - * A multi-language version of the ExtensionPoint + * A multi-language version of the ExtensionPoint */ public class ExtensionMulti extends Extension { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPoint.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPoint.java index 05adf5bda..fbff5aec4 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPoint.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPoint.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -15,8 +15,8 @@ import java.lang.ref.SoftReference; import org.eclipse.core.runtime.IContributor; /** - * An object which represents the user-defined extension point in a - * plug-in manifest. + * An object which represents the user-defined extension point in a + * plug-in manifest. */ public class ExtensionPoint extends RegistryObject { public static final ExtensionPoint[] EMPTY_ARRAY = new ExtensionPoint[0]; @@ -49,14 +49,14 @@ public class ExtensionPoint extends RegistryObject { } private String[] getExtraData() { - //The extension point has been created by parsing, or does not have any extra data - if (noExtraData()) { //When this is true, the extraInformation is always a String[]. This happens when the object is created by the parser. + //The extension point has been created by parsing, or does not have any extra data + if (noExtraData()) { //When this is true, the extraInformation is always a String[]. This happens when the object is created by the parser. if (extraInformation != null) return (String[]) extraInformation; return new String[EXTRA_SIZE]; } - //The extension point has been loaded from the cache. + //The extension point has been loaded from the cache. String[] result = null; if (extraInformation == null || (result = ((extraInformation instanceof SoftReference) ? (String[]) ((SoftReference) extraInformation).get() : (String[]) extraInformation)) == null) { result = registry.getTableReader().loadExtensionPointExtraData(getExtraDataOffset()); @@ -79,7 +79,7 @@ public class ExtensionPoint extends RegistryObject { protected String getSchemaReference() { String[] result = getExtraData(); - return result[1] == null ? "" : result[SCHEMA].replace(File.separatorChar, '/'); //$NON-NLS-1$ + return result[1] == null ? "" : result[SCHEMA].replace(File.separatorChar, '/'); //$NON-NLS-1$ } protected String getLabel() { 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 8f8ee9bc0..2555d8e9d 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 @@ -4,20 +4,20 @@ * 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; /** - * The code (minus the getDeclaringPluginDescriptor() was moved into - * the BaseExtensionPointHandle to avoid duplicating code in the + * 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 + * + * @since 3.1 */ public class ExtensionPointHandle extends BaseExtensionPointHandle { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPointMulti.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPointMulti.java index 75baeafa7..5d58f66c0 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPointMulti.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionPointMulti.java @@ -4,14 +4,14 @@ * 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; /** - * A multi-language version of the ExtensionPoint + * A multi-language version of the ExtensionPoint */ public class ExtensionPointMulti extends ExtensionPoint { 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 734bf19ef..317b60898 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 @@ -4,7 +4,7 @@ * 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 * Danail Nachev - exception handling for registry listeners (bug 188369) @@ -72,7 +72,7 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR // Table reader associated with this extension registry protected TableReader theTableReader = new TableReader(this); - private Object masterToken; // use to get full control of the registry; objects created as "static" + 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 protected RegistryStrategy strategy; // overridable portions of the registry functionality @@ -97,7 +97,7 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR /** * Sets new cache file manager. If existing file manager was owned by the registry, * closes it. - * + * * @param cacheBase the base location for the registry cache * @param isCacheReadOnly whether the file cache is read only */ @@ -217,7 +217,7 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR @Override public void addRegistryChangeListener(IRegistryChangeListener listener) { - // this is just a convenience API - no need to do any sync'ing here + // this is just a convenience API - no need to do any sync'ing here addListenerInternal(listener, null); } @@ -259,7 +259,7 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR access.enterRead(); } - // allow other objects in the registry to use the same lock + // allow other objects in the registry to use the same lock void exitRead() { access.exitRead(); } @@ -290,7 +290,7 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR */ @Override public IConfigurationElement[] getConfigurationElementsFor(String extensionPointId) { - // this is just a convenience API - no need to do any sync'ing here + // this is just a convenience API - no need to do any sync'ing here int lastdot = extensionPointId.lastIndexOf('.'); if (lastdot == -1) return new IConfigurationElement[0]; @@ -316,7 +316,7 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR */ @Override public IConfigurationElement[] getConfigurationElementsFor(String pluginId, String extensionPointName, String extensionId) { - // this is just a convenience API - no need to do any sync'ing here + // this is just a convenience API - no need to do any sync'ing here IExtension extension = this.getExtension(pluginId, extensionPointName, extensionId); if (extension == null) return new IConfigurationElement[0]; @@ -369,7 +369,7 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR */ @Override public IExtension getExtension(String extensionPointId, String extensionId) { - // this is just a convenience API - no need to do any sync'ing here + // this is just a convenience API - no need to do any sync'ing here int lastdot = extensionPointId.lastIndexOf('.'); if (lastdot == -1) return null; @@ -382,7 +382,7 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR */ @Override public IExtension getExtension(String pluginId, String extensionPointName, String extensionId) { - // this is just a convenience API - no need to do any sync'ing here + // this is just a convenience API - no need to do any sync'ing here IExtensionPoint extPoint = getExtensionPoint(pluginId, extensionPointName); if (extPoint != null) return extPoint.getExtension(extensionId); @@ -685,7 +685,7 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR this.userToken = userToken; registryObjects = new RegistryObjectManager(this); - boolean isRegistryFilledFromCache = false; // indicates if registry was able to use cache to populate it's content + boolean isRegistryFilledFromCache = false; // indicates if registry was able to use cache to populate it's content if (strategy.cacheUse()) { // Try to read the registry from the cache first. If that fails, create a new registry @@ -757,10 +757,10 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR */ @Override public void stop(Object key) { - // If the registry creator specified a key token, check that the key mathches it + // If the registry creator specified a key token, check that the key mathches it // (it is assumed that registry owner keeps the key to prevent unautorized accesss). if (masterToken != null && masterToken != key) { - throw new IllegalArgumentException("Unauthorized access to the ExtensionRegistry.stop() method. Check if proper access token is supplied."); //$NON-NLS-1$ + throw new IllegalArgumentException("Unauthorized access to the ExtensionRegistry.stop() method. Check if proper access token is supplied."); //$NON-NLS-1$ } // Do extra stop processing if specified in the registry strategy @@ -818,10 +818,10 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR // A bit of backward compatibility: if registry was modified, but timestamp was not, // it means that the new timestamp tracking mechanism was not used. In this case // explicitly obtain timestamps for all contributions. Note that this logic - // maintains a problem described in the bug 104267 for contributions that + // maintains a problem described in the bug 104267 for contributions that // don't use the timestamp tracking mechanism. if (aggregatedTimestamp.isModifed()) - timestamp = aggregatedTimestamp.getContentsTimestamp(); // use timestamp tracking + timestamp = aggregatedTimestamp.getContentsTimestamp(); // use timestamp tracking else timestamp = strategy.getContributionsTimestamp(); // use legacy approach @@ -850,7 +850,7 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR ///////////////////////////////////////////////////////////////////////////////////////////////// // Registry Object Factory - // The factory produces contributions, extension points, extensions, and configuration elements + // The factory produces contributions, extension points, extensions, and configuration elements // to be stored in the extension registry. protected RegistryObjectFactory theRegistryObjectFactory = null; @@ -1050,11 +1050,11 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR /** * Access check for add/remove operations: - * - Master key allows all operations + * - Master key allows all operations * - User key allows modifications of non-persisted elements - * + * * @param key key to the registry supplied by the user - * @param persist true if operation affects persisted elements + * @param persist true if operation affects persisted elements * @return true is the key grants read/write access to the registry */ private boolean checkReadWriteAccess(Object key, boolean persist) { @@ -1124,7 +1124,7 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR /** * Adds an extension point to the extension registry. * <p> - * If the registry is not modifiable, this method is an access controlled method. + * 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> * @param identifier Id of the extension point. If non-qualified names is supplied, @@ -1133,13 +1133,13 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR * @param persist indicates if contribution should be stored in the registry cache. If false, * contribution is not persisted in the registry cache and is lost on Eclipse restart * @param label display string for the extension point - * @param schemaReference reference to the extension point schema. The schema reference + * @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.core.runtime.spi.RegistryStrategy, Object, Object)}: - * master token and a user token. Master token allows all operations; user token + * 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 <code>true</code> if successful, <code>false</code> if a problem was encountered + * @return <code>true</code> if successful, <code>false</code> if a problem was encountered * @throws IllegalArgumentException if incorrect token is passed in */ public boolean addExtensionPoint(String identifier, IContributor contributor, boolean persist, String label, String schemaReference, Object token) throws IllegalArgumentException { @@ -1204,11 +1204,11 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR /** * Adds an extension to the extension registry. * <p> - * If the registry is not modifiable, this method is an access controlled method. + * 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.core.internal.registry.spi.ConfigurationElementDescription - * + * * @param identifier Id of the extension. If non-qualified name is supplied, * it will be converted internally into a fully qualified name * @param contributor the contributor of this extension @@ -1219,10 +1219,10 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR * 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.core.runtime.spi.RegistryStrategy, Object, Object)}: - * master token and a user token. Master token allows all operations; user token + * 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 <code>true</code> if successful, <code>false</code> if a problem was encountered + * @return <code>true</code> if successful, <code>false</code> if a problem was encountered * @throws IllegalArgumentException if incorrect token is passed in */ public boolean addExtension(String identifier, IContributor contributor, boolean persist, String label, String extensionPointId, ConfigurationElementDescription configurationElements, Object token) throws IllegalArgumentException { @@ -1365,7 +1365,7 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR namespace = removeExtension(id); Map removed = new HashMap(1); removed.put(new Integer(id), registryObject); - // There is some asymmetry between extension and extension point removal. Removing extension point makes + // There is some asymmetry between extension and extension point removal. Removing extension point makes // extensions "orphans" but does not remove them. As a result, only extensions needs to be processed. if (!isExtensionPoint) registryObjects.addAssociatedObjects(removed, registryObject); @@ -1395,8 +1395,8 @@ public class ExtensionRegistry implements IExtensionRegistry, IDynamicExtensionR } /** - * <strong>EXPERIMENTAL</strong>. This method has been added as part of a work in progress. - * There is a guarantee neither that this API will work nor that it will remain the same. + * <strong>EXPERIMENTAL</strong>. This method has been added as part of a work in progress. + * There is a guarantee neither that this API will work nor that it will remain the same. * Please do not use this method without consulting with the Equinox team. */ public Object getTemporaryUserToken() { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionsParser.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionsParser.java index 50ff4bb66..386250d3b 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionsParser.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ExtensionsParser.java @@ -84,10 +84,10 @@ public class ExtensionsParser extends DefaultHandler { private Contribution contribution; - //This keeps tracks of the value of the configuration element in case the value comes in several pieces (see characters()). See as well bug 75592. + //This keeps tracks of the value of the configuration element in case the value comes in several pieces (see characters()). See as well bug 75592. private String configurationElementValue; - /** + /** * Status code constant (value 1) indicating a problem in a bundle extensions * manifest (<code>extensions.xml</code>) file. */ @@ -96,7 +96,7 @@ public class ExtensionsParser extends DefaultHandler { public static final String PLUGIN = "plugin"; //$NON-NLS-1$ public static final String PLUGIN_ID = "id"; //$NON-NLS-1$ public static final String PLUGIN_NAME = "name"; //$NON-NLS-1$ - public static final String FRAGMENT = "fragment"; //$NON-NLS-1$ + public static final String FRAGMENT = "fragment"; //$NON-NLS-1$ public static final String BUNDLE_UID = "id"; //$NON-NLS-1$ public static final String EXTENSION_POINT = "extension-point"; //$NON-NLS-1$ @@ -141,7 +141,7 @@ public class ExtensionsParser extends DefaultHandler { private ArrayList processedExtensionIds = null; - // Keep track of elements added into the registry manager in case we encounter a error + // Keep track of elements added into the registry manager in case we encounter a error // and need to rollback private ArrayList addedRegistryObjects = new ArrayList(5); @@ -490,7 +490,7 @@ public class ExtensionsParser extends DefaultHandler { String existingSupplier = existingExtension.getContributor().getName(); String msg = NLS.bind(RegistryMessages.parse_duplicateExtension, new String[] {currentSupplier, existingSupplier, uniqueId}); registry.log(new Status(IStatus.WARNING, RegistryMessages.OWNER_NAME, 0, msg, null)); - } else if (processedExtensionIds != null) { // check elements in this contribution + } else if (processedExtensionIds != null) { // check elements in this contribution for (Iterator i = processedExtensionIds.iterator(); i.hasNext();) { if (uniqueId.equals(i.next())) { String currentSupplier = contribution.getDefaultNamespace(); @@ -570,8 +570,8 @@ public class ExtensionsParser extends DefaultHandler { return; } if (!objectManager.addExtensionPoint(currentExtPoint, true)) { - // avoid adding extension point second time as it might cause - // extensions associated with the existing extension point to + // avoid adding extension point second time as it might cause + // extensions associated with the existing extension point to // become inaccessible. if (registry.debug()) { String msg = NLS.bind(RegistryMessages.parse_duplicateExtensionPoint, currentExtPoint.getUniqueIdentifier(), contribution.getDefaultNamespace()); @@ -702,7 +702,7 @@ public class ExtensionsParser extends DefaultHandler { } /** - * To preserve backward compatibility, we will only attempt to extract namespace form the name + * To preserve backward compatibility, we will only attempt to extract namespace form the name * if Eclipse version specified in the plugin.xml (<?eclipse version="3.2"?>) is at least 3.2. */ private void initializeExtractNamespace() { 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 bb66e3a9c..80b115275 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.InvalidRegistryObjectException; * A handle is the super class to all registry objects that are now served to users. * The handles never hold on to any "real" content of the object being represented. * A handle can become stale if its referenced object has been removed from the registry. - * @since 3.1. + * @since 3.1. */ public abstract class Handle { protected IObjectManager objectManager; diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/HashtableOfStringAndInt.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/HashtableOfStringAndInt.java index 2422efdd5..2c3a9fd73 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/HashtableOfStringAndInt.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/HashtableOfStringAndInt.java @@ -164,7 +164,7 @@ public final class HashtableOfStringAndInt implements Cloneable { out.writeInt(valueTable[i]); } } - + /** * Filtered save: outputs only elements with values not in the excluded list. */ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IObjectManager.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IObjectManager.java index 9624b25d6..5bb60a7f3 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IObjectManager.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IObjectManager.java @@ -11,7 +11,7 @@ package org.eclipse.core.internal.registry; /** - * @since 3.1 + * @since 3.1 */ public interface IObjectManager { Handle getHandle(int id, byte type); diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java index c225a9e65..13883bf02 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/IRegistryConstants.java @@ -19,9 +19,9 @@ public interface IRegistryConstants { public static final String RUNTIME_NAME = "org.eclipse.core.runtime"; //$NON-NLS-1$ // command line options - public static final String NO_REGISTRY_CACHE = "-noregistrycache"; //$NON-NLS-1$ - public static final String NO_LAZY_REGISTRY_CACHE_LOADING = "-noLazyRegistryCacheLoading"; //$NON-NLS-1$ - public static final String MULTI_LANGUAGE = "-registryMultiLanguage"; //$NON-NLS-1$ + public static final String NO_REGISTRY_CACHE = "-noregistrycache"; //$NON-NLS-1$ + public static final String NO_LAZY_REGISTRY_CACHE_LOADING = "-noLazyRegistryCacheLoading"; //$NON-NLS-1$ + public static final String MULTI_LANGUAGE = "-registryMultiLanguage"; //$NON-NLS-1$ // System options public static final String PROP_NO_LAZY_CACHE_LOADING = "eclipse.noLazyRegistryCacheLoading"; //$NON-NLS-1$ @@ -37,7 +37,7 @@ public interface IRegistryConstants { public static final String PROP_WS = "osgi.ws"; //$NON-NLS-1$ /** - * Specific error code supplied to the Status objects + * Specific error code supplied to the Status objects */ static final int PLUGIN_ERROR = 1; } diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/KeyedHashSet.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/KeyedHashSet.java index e339984e6..ce5c0d113 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/KeyedHashSet.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/KeyedHashSet.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReadWriteMonitor.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReadWriteMonitor.java index 7bdcaf137..03431958f 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReadWriteMonitor.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReadWriteMonitor.java @@ -13,8 +13,8 @@ package org.eclipse.core.internal.registry; /** * Monitor ensuring no more than one writer working concurrently. * Multiple readers are allowed to perform simultaneously. - * - * This class was borrowed from org.eclipse.jdt.internal.core.search.indexing. + * + * This class was borrowed from org.eclipse.jdt.internal.core.search.indexing. */ public class ReadWriteMonitor { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReferenceMap.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReferenceMap.java index 9a9efa96e..3a9b9c670 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReferenceMap.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReferenceMap.java @@ -18,31 +18,31 @@ * Apache Software Foundation - Initial implementation * Pascal Rapicault, IBM - Pascal remove the entrySet() implementation because it relied on another class. * IBM - change to int keys, remove support for weak references, and remove unused methods - * Rafik Jaouani - fix for the timing problem in case an item with the same key is added (bug 205117) + * Rafik Jaouani - fix for the timing problem in case an item with the same key is added (bug 205117) */ package org.eclipse.core.internal.registry; import java.lang.ref.*; /** - * Hashtable-based map with integer keys that allows values to be removed + * Hashtable-based map with integer keys that allows values to be removed * by the garbage collector.<P> * - * When you construct a <Code>ReferenceMap</Code>, you can + * When you construct a <Code>ReferenceMap</Code>, you can * specify what kind of references are used to store the - * map's values. If non-hard references are + * map's values. If non-hard references are * used, then the garbage collector can remove mappings - * if a value becomes unreachable, or if the + * if a value becomes unreachable, or if the * JVM's memory is running low. For information on how * the different reference types behave, see * {@link Reference}.<P> * * The algorithms used are basically the same as those - * in {@link java.util.HashMap}. In particular, you + * in {@link java.util.HashMap}. In particular, you * can specify a load factor and capacity to suit your * needs. * - * This map does <I>not</I> allow null values. Attempting to add a null + * This map does <I>not</I> allow null values. Attempting to add a null * value to the map will raise a <Code>NullPointerException</Code>.<P> * * This data structure is not synchronized. @@ -125,7 +125,7 @@ public class ReferenceMap { /** * Sets the next entry in the linked list of map entries * with the same hash value. - * + * * @param next The next entry, or <code>null</code>. */ public void setNext(IEntry next); @@ -181,7 +181,7 @@ public class ReferenceMap { /** * The threshold variable is calculated by multiplying - * table.length and loadFactor. + * table.length and loadFactor. * Note: I originally marked this field as final, but then this class * didn't compile under JDK1.2.2. * @serial @@ -199,12 +199,12 @@ public class ReferenceMap { private transient int size; /** - * The hash table. Its length is always a power of two. + * The hash table. Its length is always a power of two. */ private transient IEntry[] table; /** - * When size reaches threshold, the map is resized. + * When size reaches threshold, the map is resized. * @see #resize() */ private transient int threshold; @@ -259,7 +259,7 @@ public class ReferenceMap { while (entry != null) { if (key == entry.getKey()) { // See bug 205117 - in case an item with the same key value was added - // items with NULL value always removed; + // items with NULL value always removed; // items with non-NULL values are removed only on user request if (!cleanup || (entry.getValue() == null)) { if (previous == null) @@ -311,7 +311,7 @@ public class ReferenceMap { /** * Constructs a new table entry for the given data - * + * * @param key The entry key * @param value The entry value * @param next The next value in the entry's collision chain @@ -332,7 +332,7 @@ public class ReferenceMap { * Purges stale mappings from this map.<P> * * Ordinarily, stale mappings are only removed during - * a write operation; typically a write operation will + * a write operation; typically a write operation will * occur often enough that you'll never need to manually * invoke this method.<P> * @@ -399,7 +399,7 @@ public class ReferenceMap { /** * Resizes this hash table by doubling its capacity. * This is an expensive operation, as entries must - * be copied from the old smaller table to the new + * be copied from the old smaller table to the new * bigger table. */ private void resize() { 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 e2b8e479a..4f348e3ec 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 @@ -16,7 +16,7 @@ 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 + * A registry change event implementation. A filter can be specified. In that case, only * deltas for the selected host will be available to clients. */ public final class RegistryChangeEvent implements IRegistryChangeEvent { 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 bb6d03562..9cfc4e1bf 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 @@ -69,7 +69,7 @@ public class RegistryDelta { void setObjectManager(IObjectManager objectManager) { this.objectManager = objectManager; - //TODO May want to add into the existing one here... if it is possible to have batching + //TODO May want to add into the existing one here... if it is possible to have batching } public IObjectManager getObjectManager() { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryIndexChildren.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryIndexChildren.java index 705c4574a..a7864a011 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryIndexChildren.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryIndexChildren.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryIndexElement.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryIndexElement.java index 16e0c2a48..d53246822 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryIndexElement.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryIndexElement.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObject.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObject.java index ae9c879c0..62ffc14aa 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObject.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObject.java @@ -44,7 +44,7 @@ public abstract class RegistryObject implements KeyedElement { children = values; } - //This can not return null. It returns the singleton empty array or an array + //This can not return null. It returns the singleton empty array or an array protected int[] getRawChildren() { return children; } diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectFactoryMulti.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectFactoryMulti.java index c6869ca46..8d2ca5ac3 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectFactoryMulti.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryObjectFactoryMulti.java @@ -11,7 +11,7 @@ package org.eclipse.core.internal.registry; /** - * A factory method for the creation of the registry objects for + * A factory method for the creation of the registry objects for * registries supporting multiple languages. */ public class RegistryObjectFactoryMulti extends RegistryObjectFactory { 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 52dca508f..f772d94c2 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -56,7 +56,7 @@ public class RegistryObjectManager implements IObjectManager { private HashMap removedContributors; // key: contributor ID; value: contributor name private KeyedHashSet namespacesIndex; // registry elements (extension & extensionpoints) indexed by namespaces - // Map key: extensionPointFullyQualifiedName, value int[] of orphan extensions. + // Map key: extensionPointFullyQualifiedName, value int[] of orphan extensions. // The orphan access does not need to be synchronized because the it is protected by the lock in extension registry. private Object orphanExtensions; @@ -276,8 +276,8 @@ public class RegistryObjectManager implements IObjectManager { return result; } - // The current impementation of this method assumes that we don't cache dynamic - // extension. In this case all extensions not yet loaded (i.e. not in the memory cache) + // The current impementation of this method assumes that we don't cache dynamic + // extension. In this case all extensions not yet loaded (i.e. not in the memory cache) // are "not dynamic" and we actually check memory objects to see if they are dynamic. // // If we decide to allow caching of dynamic objects, the implementation @@ -600,7 +600,7 @@ public class RegistryObjectManager implements IObjectManager { return contributor; // check if we have it among removed contributors - potentially // notification of removals might be processed after the contributor - // marked as removed: + // marked as removed: if (removedContributors != null) return (RegistryContributor) removedContributors.get(id); return null; @@ -679,7 +679,7 @@ public class RegistryObjectManager implements IObjectManager { /** * Add to the set of the objects all extensions and extension points that - * could be navigated to from the objects in the set. + * could be navigated to from the objects in the set. */ synchronized void addNavigableObjects(Map associatedObjects) { Map result = new HashMap(); diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryProperties.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryProperties.java index daeea3a3d..083c7a9ef 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryProperties.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryProperties.java @@ -4,7 +4,7 @@ * 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 - * + * *******************************************************************************/ package org.eclipse.core.internal.registry; @@ -22,7 +22,7 @@ public class RegistryProperties { public static final String empty = ""; //$NON-NLS-1$ private static Properties registryProperties = new Properties(); - private static Object context = null; // BundleContext, but specified as Object to avoid class loading + private static Object context = null; // BundleContext, but specified as Object to avoid class loading public static void setContext(Object object) { context = object; @@ -47,14 +47,14 @@ public class RegistryProperties { // The registry could be used as a stand-alone utility without OSGi. // Try to obtain the property from the OSGi context, but only use bundleContext if - // it was already set by Activator indicating that OSGi layer is present. + // it was already set by Activator indicating that OSGi layer is present. private static String getContextProperty(final String propertyName) { if (context == null) return System.getProperty(propertyName); final String[] result = new String[1]; try { - // Wrap BundleContext into an inner class to make sure it will only get loaded + // Wrap BundleContext into an inner class to make sure it will only get loaded // if OSGi layer is present. Runnable innerClass = new Runnable() { @Override @@ -67,7 +67,7 @@ public class RegistryProperties { } catch (Exception e) { // If we are here, it is likely means that context was set, but OSGi layer // is not present or non-standard. This should not happen, but let's give - // the program a chance to continue - properties should have reasonable + // the program a chance to continue - properties should have reasonable // default values. IStatus status = new Status(IStatus.ERROR, IRegistryConstants.RUNTIME_NAME, 0, e.getMessage(), e); RuntimeLog.log(status); diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryProviderFactory.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryProviderFactory.java index e3d18cf54..660f577aa 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryProviderFactory.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryProviderFactory.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistrySupport.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistrySupport.java index 7cef0fccc..2467a8ca7 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistrySupport.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistrySupport.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -15,14 +15,14 @@ import org.eclipse.core.runtime.IStatus; /** * Simple implementation if the registry support functionality. - * The logging output is done onto System.out (for both specific and generic logs) + * The logging output is done onto System.out (for both specific and generic logs) * in the following format: - * + * * [Error|Warning|Log]: Main error message * [Error|Warning|Log]: Child error message 1 * ... * [Error|Warning|Log]: Child error message N - * + * * The translation routine assumes that keys are prefixed with '%'. If no resource * bundle is present, the key itself (without leading '%') is returned. There is * no decoding for the leading '%%'. diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryTimestamp.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryTimestamp.java index e53bb99fb..a412eec9b 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryTimestamp.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/RegistryTimestamp.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -44,7 +44,7 @@ public final class RegistryTimestamp { /** * Set value of the aggregated timestamp. - * @param timestamp the aggregated timestamp of the current registry contents + * @param timestamp the aggregated timestamp of the current registry contents */ public void set(long timestamp) { aggregateTimestamp = timestamp; @@ -62,14 +62,14 @@ public final class RegistryTimestamp { /** * Determines if the aggregate timestamp was modified using add() or remove() * methods. - * @return true: the timestamp was modified after the last set/reset + * @return true: the timestamp was modified after the last set/reset */ public boolean isModifed() { return modified; } /** - * Add individual contribution timestamp to the aggregated timestamp. + * Add individual contribution timestamp to the aggregated timestamp. * @param timestamp the time stamp of the contribution being added to the registry */ public void add(long timestamp) { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TableReader.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TableReader.java index 829d2bccb..2ef548bb2 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TableReader.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/TableReader.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.spi.RegistryContributor; import org.eclipse.osgi.util.NLS; public class TableReader { - //Markers in the cache + //Markers in the cache static final int NULL = 0; static final int OBJECT = 1; static final int LOBJECT = 2; @@ -140,7 +140,7 @@ public class TableReader { } - // Check various aspect of the cache to see if it's valid + // Check various aspect of the cache to see if it's valid private boolean checkCacheValidity(DataInputStream in, long expectedTimestamp) { int version; try { @@ -325,7 +325,7 @@ public class TableReader { for (int i = 0; i < nbrOfExtension; i++) { int nbrOfCe = mainInput.readInt(); for (int j = 0; j < nbrOfCe; j++) { - // note that max depth is set to 2 and extra input is never going to + // note that max depth is set to 2 and extra input is never going to // be used in this call to the loadConfigurationElementAndChildren(). objects.add(loadConfigurationElementAndChildren(mainInput, null, 1, 2, objects, null), holdObjects); } @@ -427,7 +427,7 @@ public class TableReader { result[1] = readStringOrNull(extraInput); //the schema result[2] = readStringOrNull(extraInput); //the fully qualified name result[3] = readStringOrNull(extraInput); //the namespace - result[4] = readStringOrNull(extraInput); //the contributor Id + result[4] = readStringOrNull(extraInput); //the contributor Id return result; } @@ -573,7 +573,7 @@ public class TableReader { return xpt; } - private ExtensionPoint loadFullExtensionPoint() throws IOException { //TODO I don't like this. + private ExtensionPoint loadFullExtensionPoint() throws IOException { //TODO I don't like this. ExtensionPoint xpt = basicLoadExtensionPoint(); String[] tmp = basicLoadExtensionPointExtraData(); xpt.setLabel(tmp[0]); 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 a666459ea..98ea1a3bd 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ 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 c2f432f6a..8c081e19c 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ 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 859333838..d1cb997d2 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 @@ -13,7 +13,7 @@ package org.eclipse.core.internal.registry; import org.eclipse.core.runtime.IConfigurationElement; /** - * @since 3.1 + * @since 3.1 */ public class ThirdLevelConfigurationElementHandle extends ConfigurationElementHandle { 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 7e5494767..af778d72d 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 @@ -20,12 +20,12 @@ import org.eclipse.osgi.service.datalocation.Location; import org.osgi.framework.*; /** - * The extension registry bundle. This activator will create the default OSGi registry + * The extension registry bundle. This activator will create the default OSGi registry * unless told otherwise by setting the following system property to false: * <code>eclipse.createRegistry=false</code> - * + * * The default registry will be stopped on the bundle shutdown. - * + * * @see IRegistryConstants#PROP_DEFAULT_REGISTRY */ public class Activator implements BundleActivator { @@ -75,7 +75,7 @@ public class Activator implements BundleActivator { } /** - * Look for the no registry cache flag and check to see if we should NOT be lazily loading plug-in + * Look for the no registry cache flag and check to see if we should NOT be lazily loading plug-in * definitions from the registry cache file. * NOTE: this command line processing is only performed in the presence of OSGi */ @@ -107,10 +107,10 @@ public class Activator implements BundleActivator { if ("true".equals(bundleContext.getProperty(IRegistryConstants.PROP_REGISTRY_NULL_USER_TOKEN))) //$NON-NLS-1$ userRegistryKey = null; - // Determine primary and alternative registry locations. Eclipse extension registry cache + // Determine primary and alternative registry locations. Eclipse extension registry cache // can be found in one of the two locations: // a) in the local configuration area (standard location passed in by the platform) -> priority - // b) in the shared configuration area (typically, shared install is used) + // b) in the shared configuration area (typically, shared install is used) File[] registryLocations; boolean[] readOnlyLocations; 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 fd24bd6c9..aa354bebc 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -23,7 +23,7 @@ import org.eclipse.osgi.util.NLS; import org.osgi.framework.*; /** - * A listener for bundle events. When a bundles come and go we look to see + * A listener for bundle events. When a bundles come and go we look to see * if there are any extensions or extension points and update the registry accordingly. * Using a Synchronous listener here is important. If the * bundle activator code tries to access the registry to get its extension @@ -33,7 +33,7 @@ import org.osgi.framework.*; */ public class EclipseBundleListener implements SynchronousBundleListener { private static final String PLUGIN_MANIFEST = "plugin.xml"; //$NON-NLS-1$ - private static final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$ + private static final String FRAGMENT_MANIFEST = "fragment.xml"; //$NON-NLS-1$ private ExtensionRegistry registry; private RegistryStrategyOSGI strategy; @@ -49,19 +49,19 @@ public class EclipseBundleListener implements SynchronousBundleListener { @Override public void bundleChanged(BundleEvent event) { - /* Only should listen for RESOLVED and UNRESOLVED events. - * - * When a bundle is updated the Framework will publish an UNRESOLVED and - * then a RESOLVED event which should cause the bundle to be removed - * and then added back into the registry. - * - * When a bundle is uninstalled the Framework should publish an UNRESOLVED - * event and then an UNINSTALLED event so the bundle will have been removed + /* Only should listen for RESOLVED and UNRESOLVED events. + * + * When a bundle is updated the Framework will publish an UNRESOLVED and + * then a RESOLVED event which should cause the bundle to be removed + * and then added back into the registry. + * + * When a bundle is uninstalled the Framework should publish an UNRESOLVED + * event and then an UNINSTALLED event so the bundle will have been removed * by the UNRESOLVED event before the UNINSTALLED event is published. - * + * * When a bundle is refreshed from PackageAdmin an UNRESOLVED event will be * published which will remove the bundle from the registry. If the bundle - * can be RESOLVED after a refresh then a RESOLVED event will be published + * can be RESOLVED after a refresh then a RESOLVED event will be published * which will add the bundle back. This is required because the classloader * will have been refreshed for the bundle so all extensions and extension * points for the bundle must be refreshed. @@ -249,7 +249,7 @@ public class EclipseBundleListener implements SynchronousBundleListener { if (localization == null) // localization may be empty in which case we should check the default localization = Constants.BUNDLE_LOCALIZATION_DEFAULT_BASENAME; - // we do a simple check to make sure the default nls path exists in the target; + // we do a simple check to make sure the default nls path exists in the target; // this is for performance reasons, but I'm not sure it is valid because a target could ship without the default nls properties file but this seems very unlikely URL baseNLS = target.getEntry(localization + ".properties"); //$NON-NLS-1$ if (baseNLS == null) diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java index adaa1c08b..4497d4292 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java @@ -4,10 +4,10 @@ * 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 - * Danail Nachev - bug 203599 - events if jobs bundle has been stopped + * Danail Nachev - bug 203599 - events if jobs bundle has been stopped *******************************************************************************/ package org.eclipse.core.internal.registry.osgi; @@ -24,11 +24,11 @@ import org.osgi.framework.ServiceReference; * The registry strategy used by the Equinox extension registry. Adds to the * OSGi registry: * <p><ul> - * <li>Use debug information supplied via .options files</li> + * <li>Use debug information supplied via .options files</li> * <li>Use Eclipse logging - Use Eclipse platform state for cache validation</li> * <li>Event scheduling is done using Eclipse job scheduling mechanism</li> - * </ul></p> - * + * </ul></p> + * * @since org.eclipse.equinox.registry 3.2 */ public class EquinoxRegistryStrategy extends RegistryStrategyOSGI { @@ -76,13 +76,13 @@ public class EquinoxRegistryStrategy extends RegistryStrategyOSGI { } /** - * This method will attempt to use Eclipse Jobs mechanism to schedule registry events. If, at any time, + * This method will attempt to use Eclipse Jobs mechanism to schedule registry events. If, at any time, * Eclipse Jobs mechanism is missing, this method will fallback on the "internal" event scheduling * provided by the registry strategy. - * + * * Once the switch to the fallback mechanism occurred, no further attempt to use scheduling from the Jobs bundle - * will be made (until registry bundle is restarted). Avoiding repeated checks in this scenario will ensure that - * most users see no performance degradation and that order of registry events remains consistent. + * will be made (until registry bundle is restarted). Avoiding repeated checks in this scenario will ensure that + * most users see no performance degradation and that order of registry events remains consistent. */ @Override public final void scheduleChangeEvent(Object[] listeners, Map deltas, Object registry) { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxUtils.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxUtils.java index dc485564d..96597e620 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxUtils.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxUtils.java @@ -18,9 +18,9 @@ import org.osgi.framework.*; * The class contains a set of Equinox-specific helper methods. The methods were isolated * into separate class to prevent an attempt to load Equinox classes in a generic OSGi * environment. - * + * * This class uses OSGi services. - * + * * @since org.eclipse.equinox.registry 3.2.100 */ public class EquinoxUtils { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/ExtensionEventDispatcherJob.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/ExtensionEventDispatcherJob.java index 33eadd583..bc23d1b9a 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/ExtensionEventDispatcherJob.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/ExtensionEventDispatcherJob.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -21,7 +21,7 @@ import org.eclipse.core.runtime.spi.RegistryStrategy; * Use Eclipse job scheduling mechanism. */ final public class ExtensionEventDispatcherJob extends Job { - // an "identy rule" that forces extension events to be queued + // an "identy rule" that forces extension events to be queued private final static ISchedulingRule EXTENSION_EVENT_RULE = new ISchedulingRule() { @Override public boolean contains(ISchedulingRule rule) { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/OSGIUtils.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/OSGIUtils.java index 360bf3131..3bf2828d5 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/OSGIUtils.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/OSGIUtils.java @@ -22,8 +22,8 @@ import org.osgi.util.tracker.ServiceTracker; /** * The class contains a set of helper methods for the runtime content plugin. - * The closeServices() method should be called before the plugin is stopped. - * + * The closeServices() method should be called before the plugin is stopped. + * * @since org.eclipse.equinox.registry 3.2 */ public class OSGIUtils { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryCommandProvider.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryCommandProvider.java index d1fd3bcc1..219aa1ce9 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryCommandProvider.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/RegistryCommandProvider.java @@ -7,7 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation - * Benjamin Muskalla - fix for the console help text (bug 240607) + * Benjamin Muskalla - fix for the console help text (bug 240607) *******************************************************************************/ package org.eclipse.core.internal.registry.osgi; @@ -30,7 +30,7 @@ public class RegistryCommandProvider implements CommandProvider { } /* - * This method either returns the help message for a particular command, + * This method either returns the help message for a particular command, * or returns the help messages for all commands (if commandName is null) */ private String getHelp(String commandName) { @@ -103,7 +103,7 @@ public class RegistryCommandProvider implements CommandProvider { /** * Handles the help command - * + * * @param intp * @return description for a particular command or false if there is no command with the specified name */ 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 1bbd1e1c5..88dc69e13 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ 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 beb3ca8b6..b5f36cab9 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -74,16 +74,16 @@ public class RegistryStrategyOSGI extends RegistryStrategy { /** * @param theStorageDir - array of file system directories to store cache files; might be null - * @param cacheReadOnly - array of read only attributes. True: cache at this location is read + * @param cacheReadOnly - array of read only attributes. True: cache at this location is read * only; false: cache is read/write - * @param key - control key for the registry (should be the same key as used in + * @param key - control key for the registry (should be the same key as used in * the RegistryManager#createExtensionRegistry() of this registry */ public RegistryStrategyOSGI(File[] theStorageDir, boolean[] cacheReadOnly, Object key) { super(theStorageDir, cacheReadOnly); token = key; - // Only do timestamp calculations if osgi.checkConfiguration is set to "true" (typically, + // Only do timestamp calculations if osgi.checkConfiguration is set to "true" (typically, // this implies -dev mode) BundleContext context = Activator.getContext(); if (context != null) @@ -112,20 +112,20 @@ public class RegistryStrategyOSGI extends RegistryStrategy { // Use OSGi bundles for namespace resolution (contributors: plugins and fragments) /** - * The default load factor for the bundle cache. + * The default load factor for the bundle cache. */ private static float DEFAULT_BUNDLECACHE_LOADFACTOR = 0.75f; /** - * The expected bundle cache size (calculated as a number of bundles divided - * by the DEFAULT_BUNDLECACHE_LOADFACTOR). The bundle cache will be resized - * automatically is this number is exceeded. + * The expected bundle cache size (calculated as a number of bundles divided + * by the DEFAULT_BUNDLECACHE_LOADFACTOR). The bundle cache will be resized + * automatically is this number is exceeded. */ private static int DEFAULT_BUNDLECACHE_SIZE = 200; /** * For performance, we cache mapping of IDs to Bundles. - * + * * We don't expect mapping to change during the runtime. (Or, in the OSGI terms, * we don't expect bundle IDs to be reused during the Eclipse run.) * The Bundle object is stored as a weak reference to facilitate GC @@ -143,7 +143,7 @@ public class RegistryStrategyOSGI extends RegistryStrategy { } catch (NumberFormatException e) { return null; } - // We assume here that OSGI Id will fit into "int". As the number of + // We assume here that OSGI Id will fit into "int". As the number of // registry elements themselves are expected to fit into "int", this // is a valid assumption for the time being. Bundle bundle = (Bundle) bundleMap.get((int) OSGiId); @@ -169,7 +169,7 @@ public class RegistryStrategyOSGI extends RegistryStrategy { contributingBundle = getBundle(contributor.getId()); if (contributingBundle == null) - throwException(NLS.bind(RegistryMessages.plugin_loadClassError, "UNKNOWN BUNDLE", className), new InvalidRegistryObjectException()); //$NON-NLS-1$ + throwException(NLS.bind(RegistryMessages.plugin_loadClassError, "UNKNOWN BUNDLE", className), new InvalidRegistryObjectException()); //$NON-NLS-1$ // load the requested class from this bundle Class classInstance = null; @@ -220,7 +220,7 @@ public class RegistryStrategyOSGI extends RegistryStrategy { // populate the registry with all the currently installed bundles. // There is a small window here while processBundles is being - // called where the pluginBundleListener may receive a BundleEvent + // called where the pluginBundleListener may receive a BundleEvent // to add/remove a bundle from the registry. This is ok since // the registry is a synchronized object and will not add the // same bundle twice. 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 4a3ed7ab5..221fa99de 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -13,7 +13,7 @@ package org.eclipse.core.internal.registry.spi; import org.eclipse.core.runtime.IConfigurationElement; /** - * Describes properties of configuration elements to be added to the registry. + * Describes properties of configuration elements to be added to the registry. * Properties are represented as pairs of strings: {attribute name; attribute value}. * <p> * It is expected that both attribute name and attribute value are not null. @@ -43,7 +43,7 @@ public final class ConfigurationElementAttribute { /** * Constructor. - * + * * @param name attribute name * @param value attribute value */ 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 d7545475f..f0def5707 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 @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -13,12 +13,12 @@ package org.eclipse.core.internal.registry.spi; import org.eclipse.core.runtime.IConfigurationElement; /** - * Describes configuration elements (content of an extension) to be added to - * the extension registry. Configuration element can contain attributes or - * a String value. Configuration element can contain other configuration + * Describes configuration elements (content of an extension) to be added to + * the extension registry. Configuration element can contain attributes or + * a String value. Configuration element can contain other configuration * elements (children). * <p> - * It is expected that configuration element's name is not null. Attributes and + * It is expected that configuration element's name is not null. Attributes and * children of the extension description might be null; value might be null as well. * </p> * <p> @@ -51,19 +51,19 @@ public final class ConfigurationElementDescription { /** * Children of the configuration element. - * @see IConfigurationElement#getChildren() + * @see IConfigurationElement#getChildren() */ private ConfigurationElementDescription[] children; /** * Constructor. - * + * * @param name - name of the configuration element * @param attributes - attributes of the configuration element. Might be null. * @param value - string value to be stored. Might be null. * @param children - children of the configuration element. Might be null. * @see IConfigurationElement#getName() - * @see IConfigurationElement#getChildren() + * @see IConfigurationElement#getChildren() * @see IConfigurationElement#getAttribute(String) * @see IConfigurationElement#getValue() */ @@ -76,13 +76,13 @@ public final class ConfigurationElementDescription { /** * Constructor. - * + * * @param name - name of the configuration element * @param attribute - attribute of the configuration element. Might be null. * @param value - string value to be stored. Might be null. * @param children - children of the configuration element. Might be null. * @see IConfigurationElement#getName() - * @see IConfigurationElement#getChildren() + * @see IConfigurationElement#getChildren() * @see IConfigurationElement#getAttribute(String) * @see IConfigurationElement#getValue() */ @@ -96,7 +96,7 @@ public final class ConfigurationElementDescription { /** * Returns children of the configuration element. * @return - children of the extension - * @see IConfigurationElement#getChildren() + * @see IConfigurationElement#getChildren() */ public ConfigurationElementDescription[] getChildren() { return children; diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/ContributorFactoryOSGi.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/ContributorFactoryOSGi.java index e33b9095e..fe1fe8177 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/ContributorFactoryOSGi.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/ContributorFactoryOSGi.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -15,8 +15,8 @@ import org.eclipse.core.runtime.spi.RegistryContributor; import org.osgi.framework.Bundle; /** - * The contributor factory creates new registry contributors for use in OSGi-based - * registries. + * The contributor factory creates new registry contributors for use in OSGi-based + * registries. * <p> * This class can not be extended or instantiated by clients. * </p> @@ -27,9 +27,9 @@ import org.osgi.framework.Bundle; public final class ContributorFactoryOSGi { /** - * Creates registry contributor object based on a Bundle. The bundle must not + * Creates registry contributor object based on a Bundle. The bundle must not * be <code>null</code>. - * + * * @param contributor bundle associated with the contribution * @return new registry contributor based on the Bundle */ @@ -54,12 +54,12 @@ public final class ContributorFactoryOSGi { /** * Returns the OSGi bundle used to define this contributor. If a fragment - * was used to create the contributor, the fragment is returned. - * - * <p>The method may return null if the contributor is not based on a bundle, - * if the bundle can't be found, or if the bundle is presently unresolved or + * was used to create the contributor, the fragment is returned. + * + * <p>The method may return null if the contributor is not based on a bundle, + * if the bundle can't be found, or if the bundle is presently unresolved or * uninstalled.</p> - * + * * @param contributor bundle-based registry contributor * @return the actual OSGi bundle associated with this contributor * @since org.eclipse.equinox.registry 3.3 diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/ContributorFactorySimple.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/ContributorFactorySimple.java index ec5f2796c..722481036 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/ContributorFactorySimple.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/ContributorFactorySimple.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -27,9 +27,9 @@ import org.eclipse.core.runtime.spi.RegistryContributor; public final class ContributorFactorySimple { /** - * Creates registry contributor object based on a determining object.The determining + * Creates registry contributor object based on a determining object.The determining * object must not be <code>null</code>. - * + * * @param determiningObject object associated with the contribution * @return new registry contributor based on the determining object */ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IConfigurationElement.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IConfigurationElement.java index 068b7481d..f9a9d1c9e 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IConfigurationElement.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IConfigurationElement.java @@ -4,14 +4,14 @@ * 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.runtime; /** - * A configuration element, with its attributes and children, + * A configuration element, with its attributes and children, * directly reflects the content and structure of the extension section * within the declaring plug-in's manifest (<code>plugin.xml</code>) file. * <p> @@ -19,8 +19,8 @@ package org.eclipse.core.runtime; * objects. * </p> * <p> - * These registry objects are intended for relatively short-term use. Clients that - * deal with these objects must be aware that they may become invalid if the + * These registry objects are intended for relatively short-term use. Clients that + * deal with these objects must be aware that they may become invalid if the * declaring plug-in is updated or uninstalled. If this happens, all methods except * {@link #isValid()} will throw {@link InvalidRegistryObjectException}. * For configuration element objects, the most common case is code in a plug-in dealing @@ -34,7 +34,7 @@ package org.eclipse.core.runtime; * are vulnerable. Client code can pre-test for invalid objects by calling {@link #isValid()}, * which never throws this exception. However, pre-tests are usually not sufficient * because of the possibility of the extension or configuration element object becoming - * invalid as a result of a concurrent activity. At-risk clients must treat + * invalid as a result of a concurrent activity. At-risk clients must treat * <code>InvalidRegistryObjectException</code> as if it were a checked exception. * Also, such clients should probably register a listener with the extension registry * so that they receive notification of any changes to the registry. @@ -47,26 +47,26 @@ package org.eclipse.core.runtime; */ public interface IConfigurationElement { /** - * Creates and returns a new instance of the executable extension + * Creates and returns a new instance of the executable extension * identified by the named attribute of this configuration element. * The named attribute value must contain a fully qualified name - * of a Java class. The class can either refer to a class implementing - * the executable extension or to a factory capable of returning the + * of a Java class. The class can either refer to a class implementing + * the executable extension or to a factory capable of returning the * executable extension. * <p> * The specified class is instantiated using its 0-argument public constructor. * <p> * Then the following checks are done:<br> - * If the specified class implements the {@link IExecutableExtension} - * interface, the method {@link IExecutableExtension#setInitializationData(IConfigurationElement, String, Object)} - * is called, passing to the object the configuration information that was used to create it. + * If the specified class implements the {@link IExecutableExtension} + * interface, the method {@link IExecutableExtension#setInitializationData(IConfigurationElement, String, Object)} + * is called, passing to the object the configuration information that was used to create it. * <p> - * If the specified class implements {@link IExecutableExtensionFactory} - * interface, the method {@link IExecutableExtensionFactory#create()} + * If the specified class implements {@link IExecutableExtensionFactory} + * interface, the method {@link IExecutableExtensionFactory#create()} * is invoked. * </p> * <p> - * Unlike other methods on this object, invoking this method may activate + * Unlike other methods on this object, invoking this method may activate * the plug-in. * </p> * @@ -82,11 +82,11 @@ public interface IConfigurationElement { /** * Returns the named attribute of this configuration element, or - * <code>null</code> if none. + * <code>null</code> if none. * <p> * The names of configuration element attributes * are the same as the attribute names of the corresponding XML element. - * For example, the configuration markup + * For example, the configuration markup * <pre> * <bg pattern="stripes"/> * </pre> @@ -105,14 +105,14 @@ public interface IConfigurationElement { public String getAttribute(String name) throws InvalidRegistryObjectException; /** - * When multi-language support is enabled, this method returns the named attribute of this - * configuration element in the specified locale, or <code>null</code> if none. + * When multi-language support is enabled, this method returns the named attribute of this + * configuration element in the specified locale, or <code>null</code> if none. * <p> - * The locale matching tries to find the best match between available translations and - * the requested locale, falling back to a more generic locale ("en") when the specific - * locale ("en_US") is not available. + * The locale matching tries to find the best match between available translations and + * the requested locale, falling back to a more generic locale ("en") when the specific + * locale ("en_US") is not available. * </p><p> - * If multi-language support is not enabled, this method is equivalent to the method + * If multi-language support is not enabled, this method is equivalent to the method * {@link #getAttribute(String)}. * </p> * @param attrName the name of the attribute @@ -127,11 +127,11 @@ public interface IConfigurationElement { /** * Returns the named attribute of this configuration element, or - * <code>null</code> if none. + * <code>null</code> if none. * <p> * The names of configuration element attributes * are the same as the attribute names of the corresponding XML element. - * For example, the configuration markup + * For example, the configuration markup * <pre> * <bg pattern="stripes"/> * </pre> @@ -158,7 +158,7 @@ public interface IConfigurationElement { * <p> * The names of configuration element attributes * are the same as the attribute names of the corresponding XML element. - * For example, the configuration markup + * For example, the configuration markup * <pre> * <bg color="blue" pattern="stripes"/> * </pre> @@ -167,19 +167,19 @@ public interface IConfigurationElement { * and <code>"pattern"</code>. * </p> * - * @return the names of the attributes + * @return the names of the attributes * @throws InvalidRegistryObjectException if this configuration element is no longer valid */ public String[] getAttributeNames() throws InvalidRegistryObjectException; /** * Returns all configuration elements that are children of this - * configuration element. + * configuration element. * Returns an empty array if this configuration element has no children. * <p> * Each child corresponds to a nested * XML element in the configuration markup. - * For example, the configuration markup + * For example, the configuration markup * <pre> * <view> *     <verticalHint>top</verticalHint> @@ -197,7 +197,7 @@ public interface IConfigurationElement { public IConfigurationElement[] getChildren() throws InvalidRegistryObjectException; /** - * Returns all child configuration elements with the given name. + * Returns all child configuration elements with the given name. * Returns an empty array if this configuration element has no children * with the given name. * @@ -208,7 +208,7 @@ public interface IConfigurationElement { */ public IConfigurationElement[] getChildren(String name) throws InvalidRegistryObjectException; - /** + /** * Returns the extension that declares this configuration element. * * @return the extension @@ -217,12 +217,12 @@ public interface IConfigurationElement { public IExtension getDeclaringExtension() throws InvalidRegistryObjectException; /** - * Returns the name of this configuration element. + * Returns the name of this configuration element. * The name of a configuration element is the same as - * the XML tag of the corresponding XML element. - * For example, the configuration markup + * the XML tag of the corresponding XML element. + * For example, the configuration markup * <pre> - * <wizard name="Create Project"/> + * <wizard name="Create Project"/> * </pre> * corresponds to a configuration element named <code>"wizard"</code>. * @@ -235,7 +235,7 @@ public interface IConfigurationElement { * Returns the element which contains this element. If this element * is an immediate child of an extension, the * returned value can be downcast to <code>IExtension</code>. - * Otherwise the returned value can be downcast to + * Otherwise the returned value can be downcast to * <code>IConfigurationElement</code>. * * @return the parent of this configuration element @@ -247,7 +247,7 @@ public interface IConfigurationElement { /** * Returns the text value of this configuration element. - * For example, the configuration markup + * For example, the configuration markup * <pre> * <script lang="javascript">.\scripts\cp.js</script> * </pre> @@ -265,14 +265,14 @@ public interface IConfigurationElement { public String getValue() throws InvalidRegistryObjectException; /** - * When multi-language support is enabled, this method returns the text value of this + * When multi-language support is enabled, this method returns the text value of this * configuration element in the specified locale, or <code>null</code> if none. - * <p> - * The locale matching tries to find the best match between available translations and - * the requested locale, falling back to a more generic locale ("en") when the specific - * locale ("en_US") is not available. + * <p> + * The locale matching tries to find the best match between available translations and + * the requested locale, falling back to a more generic locale ("en") when the specific + * locale ("en_US") is not available. * </p><p> - * If multi-language support is not enabled, this method is equivalent to the method + * If multi-language support is not enabled, this method is equivalent to the method * {@link #getValue()}. * </p> * @param locale the requested locale @@ -287,7 +287,7 @@ public interface IConfigurationElement { /** * Returns the untranslated text value of this configuration element. - * For example, the configuration markup + * For example, the configuration markup * <pre> * <script lang="javascript">.\scripts\cp.js</script> * </pre> @@ -298,7 +298,7 @@ public interface IConfigurationElement { * <p> * Note that translation specified in the plug-in manifest * file is <b>not</b> automatically applied. - * For example, the configuration markup + * For example, the configuration markup * <pre> * <tooltip>#hattip</tooltip> * </pre> @@ -316,40 +316,40 @@ public interface IConfigurationElement { /** * Returns the namespace for this configuration element. This value can be used * in various global facilities to discover this configuration element's contributor. - * + * * @return the namespace for this configuration element * @throws InvalidRegistryObjectException if this configuration element is no longer valid * @see IExtensionRegistry * @since 3.1 - * @deprecated As namespace is no longer restricted to the contributor name, + * @deprecated As namespace is no longer restricted to the contributor name, * use {@link #getNamespaceIdentifier()} to obtain namespace name or {@link #getContributor()} * to get the name of the contributor of this registry element. * <p> - * In the past namespace was dictated by the name of the bundle. If bundle <code>org.abc</code> - * contributed registry element with Id of <code>MyId</code>, the namespace of - * the element was always set to <code>org.abc</code>, producing the qualified name of + * In the past namespace was dictated by the name of the bundle. If bundle <code>org.abc</code> + * contributed registry element with Id of <code>MyId</code>, the namespace of + * the element was always set to <code>org.abc</code>, producing the qualified name of * <code>org.abc.MyId</code>. * </p><p> - * The namespace used to be the same as the bundle name. As a result, the {@link #getNamespace()} - * method was used both to obtain the name of the bundle and to obtain the namespace of a registry + * The namespace used to be the same as the bundle name. As a result, the {@link #getNamespace()} + * method was used both to obtain the name of the bundle and to obtain the namespace of a registry * element. * </p><p> - * Since 3.2, the extension registry allows elements to specify qualified name. The extension point - * of the plug-in <code>org.abc</code> could specify <code>org.zzz.MyExtPoint</code> as - * an Id. In this case, namespace name is <code>org.zzz</code>, but the contributor - * name is <code>org.abc</code>. + * Since 3.2, the extension registry allows elements to specify qualified name. The extension point + * of the plug-in <code>org.abc</code> could specify <code>org.zzz.MyExtPoint</code> as + * an Id. In this case, namespace name is <code>org.zzz</code>, but the contributor + * name is <code>org.abc</code>. * </p><p> - * (The use of a simple Id is still a preferred way. Whenever possible, specify only the simple + * (The use of a simple Id is still a preferred way. Whenever possible, specify only the simple * Id and let runtime take care of the rest.) * </p><p> - * If your code used the {@link #getNamespace()} to obtain the name of the contributing bundle, - * use {@link #getContributor()}. The typical usage pattern here is to find a bundle name to obtain - * some information from the corresponding OSGi bundle. For example, deducing the file location + * If your code used the {@link #getNamespace()} to obtain the name of the contributing bundle, + * use {@link #getContributor()}. The typical usage pattern here is to find a bundle name to obtain + * some information from the corresponding OSGi bundle. For example, deducing the file location * specified as a relative path to the bundle install location would fall into this group. * </p><p> - * If your code used the {@link #getNamespace()} to obtain the namespace of the registry element, - * use {@link #getNamespaceIdentifier()}. Typically, this is the case when code is trying to process - * registry elements belonging to some logical group. For example, processing notifications for all + * If your code used the {@link #getNamespace()} to obtain the namespace of the registry element, + * use {@link #getNamespaceIdentifier()}. Typically, this is the case when code is trying to process + * registry elements belonging to some logical group. For example, processing notifications for all * elements belonging to the <code>org.abc</code> namespace would fall into this category. * </p> */ @@ -357,23 +357,23 @@ public interface IConfigurationElement { /** * Returns the namespace name for this configuration element. - * + * * @return the namespace name for this configuration element * @throws InvalidRegistryObjectException if this configuration element is no longer valid - * @since org.eclipse.equinox.registry 3.2 + * @since org.eclipse.equinox.registry 3.2 */ public String getNamespaceIdentifier() throws InvalidRegistryObjectException; /** * Returns the contributor of this configuration element. - * + * * @return the contributor for this configuration element * @throws InvalidRegistryObjectException if this configuration element is no longer valid - * @since org.eclipse.equinox.registry 3.2 + * @since org.eclipse.equinox.registry 3.2 */ public IContributor getContributor() throws InvalidRegistryObjectException; - /* (non-javadoc) + /* (non-javadoc) * @see Object#equals(java.lang.Object) */ @Override @@ -381,7 +381,7 @@ public interface IConfigurationElement { /** * Returns whether this configuration element object is valid. - * + * * @return <code>true</code> if the object is valid, and <code>false</code> * if it is no longer valid * @since 3.1 diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IContributor.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IContributor.java index 20399eb3a..bc568afb4 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IContributor.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IContributor.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -12,9 +12,9 @@ package org.eclipse.core.runtime; /** * This interface describes a registry contributor - an entity that supplies information - * to the extension registry. + * to the extension registry. * <p> - * Registry contributor objects can be obtained by calling {@link IExtensionPoint#getContributor()}, + * Registry contributor objects can be obtained by calling {@link IExtensionPoint#getContributor()}, * {@link IExtension#getContributor()}, and {@link IConfigurationElement#getContributor()}. * Alternatively, a contributor factory appropriate for the registry in use can be called to directly * obtain an IContributor object. @@ -25,7 +25,7 @@ package org.eclipse.core.runtime; * </p> * @see org.eclipse.core.runtime.ContributorFactoryOSGi * @see org.eclipse.core.runtime.ContributorFactorySimple - * + * * @since org.eclipse.equinox.registry 3.2 * @noimplement This interface is not intended to be implemented by clients. * @noextend This interface is not intended to be extended by clients. @@ -34,8 +34,8 @@ public interface IContributor { /** * Provides name of the contributor (e.g., "org.eclipse.core.runtime"). - * - * @return name of the registry contributor + * + * @return name of the registry contributor */ public String getName(); } diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtension.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtension.java index ccf305999..a72620d7a 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtension.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtension.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -13,7 +13,7 @@ package org.eclipse.core.runtime; import org.eclipse.core.runtime.CoreException; /** - * Interface for executable extension classes that require access to + * Interface for executable extension classes that require access to * their configuration element, or implement an extension adapter. * <p> * Extension adapters are typically required in cases where the extension @@ -28,19 +28,19 @@ import org.eclipse.core.runtime.CoreException; * </p><p> * Clients may implement this interface. * </p> - * + * * @see IConfigurationElement#createExecutableExtension(String) */ public interface IExecutableExtension { /** * This method is called by the implementation of the method * <code>IConfigurationElement.createExecutableExtension</code> - * on a newly constructed extension, passing it its relevant configuration - * information. Most executable extensions only make use of the first + * on a newly constructed extension, passing it its relevant configuration + * information. Most executable extensions only make use of the first * two call arguments. * <p> - * Regular executable extensions specify their Java implementation - * class name as an attribute of the configuration element for the + * Regular executable extensions specify their Java implementation + * class name as an attribute of the configuration element for the * extension. For example * <pre> * <action run="com.example.BaseAction"/> @@ -105,14 +105,14 @@ public interface IExecutableExtension { * </ul> * </p> * - * @param config the configuration element used to trigger this execution. + * @param config the configuration element used to trigger this execution. * It can be queried by the executable extension for specific * configuration properties * @param propertyName the name of an attribute of the configuration element * used on the <code>createExecutableExtension(String)</code> call. This * argument can be used in the cases where a single configuration element * is used to define multiple executable extensions. - * @param data adapter data in the form of a <code>String</code>, + * @param data adapter data in the form of a <code>String</code>, * a <code>Hashtable</code>, or <code>null</code>. * @exception CoreException if error(s) detected during initialization processing * @see IConfigurationElement#createExecutableExtension(String) diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtensionFactory.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtensionFactory.java index 3da4a09d6..5be12399e 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtensionFactory.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtensionFactory.java @@ -11,17 +11,17 @@ package org.eclipse.core.runtime; /** - * This interface allows extension providers to control how the instances provided to extension-points are being created - * by referring to the factory instead of referring to a class. For example, the following extension to the preference page - * extension-point uses a factory called <code>PreferencePageFactory</code>. + * This interface allows extension providers to control how the instances provided to extension-points are being created + * by referring to the factory instead of referring to a class. For example, the following extension to the preference page + * extension-point uses a factory called <code>PreferencePageFactory</code>. * <code><pre> * <extension point="org.eclipse.ui.preferencePages"> - * <page name="..." class="org.eclipse.update.ui.PreferencePageFactory:org.eclipse.update.ui.preferences.MainPreferencePage"> + * <page name="..." class="org.eclipse.update.ui.PreferencePageFactory:org.eclipse.update.ui.preferences.MainPreferencePage"> * </page> * </extension> * </pre> * </code> - * + * * <p> * Effectively, factories give full control over the create executable extension process. * </p><p> @@ -37,7 +37,7 @@ package org.eclipse.core.runtime; public interface IExecutableExtensionFactory { /** * Creates and returns a new instance. - * + * * @exception CoreException if an instance of the executable extension * could not be created for any reason */ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtension.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtension.java index 9c6337829..1a91f763c 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtension.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtension.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -12,11 +12,11 @@ package org.eclipse.core.runtime; /** * An extension declared in a plug-in. - * All information is obtained from the declaring plug-in's + * All information is obtained from the declaring plug-in's * manifest (<code>plugin.xml</code>) file. * <p> - * These registry objects are intended for relatively short-term use. Clients that - * deal with these objects must be aware that they may become invalid if the + * These registry objects are intended for relatively short-term use. Clients that + * deal with these objects must be aware that they may become invalid if the * declaring plug-in is updated or uninstalled. If this happens, all methods except * {@link #isValid()} will throw {@link InvalidRegistryObjectException}. * For extension objects, the most common case is code in a plug-in dealing @@ -30,7 +30,7 @@ package org.eclipse.core.runtime; * Client code can pre-test for invalid objects by calling {@link #isValid()}, * which never throws this exception. However, pre-tests are usually not sufficient * because of the possibility of the extension object becoming invalid as a - * result of a concurrent activity. At-risk clients must treat + * result of a concurrent activity. At-risk clients must treat * <code>InvalidRegistryObjectException</code> as if it were a checked exception. * Also, such clients should probably register a listener with the extension registry * so that they receive notification of any changes to the registry. @@ -44,7 +44,7 @@ package org.eclipse.core.runtime; public interface IExtension { /** * Returns all configuration elements declared by this extension. - * These elements are a direct reflection of the configuration + * These elements are a direct reflection of the configuration * markup supplied in the manifest (<code>plugin.xml</code>) * file for the plug-in that declares this extension. * Returns an empty array if this extension does not declare any @@ -58,40 +58,40 @@ public interface IExtension { /** * Returns the namespace for this extension. This value can be used * in various global facilities to discover this extension's provider. - * + * * @return the namespace for this extension * @throws InvalidRegistryObjectException if this extension is no longer valid * @see IExtensionRegistry * @since 3.0 - * @deprecated As namespace is no longer restricted to the contributor name, + * @deprecated As namespace is no longer restricted to the contributor name, * use {@link #getNamespaceIdentifier()} to obtain namespace name or {@link #getContributor()} - * to get the name of the contributor of this registry element. + * to get the name of the contributor of this registry element. * <p> - * In the past namespace was dictated by the name of the bundle. If bundle <code>org.abc</code> - * contributed registry element with Id of <code>MyId</code>, the namespace of - * the element was always set to <code>org.abc</code>, producing the qualified name of + * In the past namespace was dictated by the name of the bundle. If bundle <code>org.abc</code> + * contributed registry element with Id of <code>MyId</code>, the namespace of + * the element was always set to <code>org.abc</code>, producing the qualified name of * <code>org.abc.MyId</code>. * </p><p> - * The namespace used to be the same as the bundle name. As a result, the {@link #getNamespace()} - * method was used both to obtain the name of the bundle and to obtain the namespace of a registry + * The namespace used to be the same as the bundle name. As a result, the {@link #getNamespace()} + * method was used both to obtain the name of the bundle and to obtain the namespace of a registry * element. * </p><p> - * Since 3.2, the extension registry allows elements to specify qualified name. The extension point - * of the plug-in <code>org.abc</code> could specify <code>org.zzz.MyExtPoint</code> as - * an Id. In this case, namespace name is <code>org.zzz</code>, but the contributor - * name is <code>org.abc</code>. + * Since 3.2, the extension registry allows elements to specify qualified name. The extension point + * of the plug-in <code>org.abc</code> could specify <code>org.zzz.MyExtPoint</code> as + * an Id. In this case, namespace name is <code>org.zzz</code>, but the contributor + * name is <code>org.abc</code>. * </p><p> - * (The use of a simple Id is still a preferred way. Whenever possible, specify only the simple + * (The use of a simple Id is still a preferred way. Whenever possible, specify only the simple * Id and let runtime take care of the rest.) * </p><p> - * If your code used the {@link #getNamespace()} to obtain the name of the contributing bundle, - * use {@link #getContributor()}. The typical usage pattern here is to find a bundle name to obtain - * some information from the corresponding OSGi bundle. For example, deducing the file location + * If your code used the {@link #getNamespace()} to obtain the name of the contributing bundle, + * use {@link #getContributor()}. The typical usage pattern here is to find a bundle name to obtain + * some information from the corresponding OSGi bundle. For example, deducing the file location * specified as a relative path to the bundle install location would fall into this group. * </p><p> - * If your code used the {@link #getNamespace()} to obtain the namespace of the registry element, - * use {@link #getNamespaceIdentifier()}. Typically, this is the case when code is trying to process - * registry elements belonging to some logical group. For example, processing notifications for all + * If your code used the {@link #getNamespace()} to obtain the namespace of the registry element, + * use {@link #getNamespaceIdentifier()}. Typically, this is the case when code is trying to process + * registry elements belonging to some logical group. For example, processing notifications for all * elements belonging to the <code>org.abc</code> namespace would fall into this category. * </p> */ @@ -99,19 +99,19 @@ public interface IExtension { /** * Returns the namespace name for this extension. - * + * * @return the namespace name for this extension * @throws InvalidRegistryObjectException if this extension is no longer valid - * @since org.eclipse.equinox.registry 3.2 + * @since org.eclipse.equinox.registry 3.2 */ public String getNamespaceIdentifier() throws InvalidRegistryObjectException; /** * Returns the contributor of this extension. - * + * * @return the contributor for this extension * @throws InvalidRegistryObjectException if this extension is no longer valid - * @since org.eclipse.equinox.registry 3.2 + * @since org.eclipse.equinox.registry 3.2 */ public IContributor getContributor() throws InvalidRegistryObjectException; @@ -139,15 +139,15 @@ public interface IExtension { public String getLabel() throws InvalidRegistryObjectException; /** - * When multi-language support is enabled, this method returns a displayable label for this + * When multi-language support is enabled, this method returns a displayable label for this * extension in the specified locale. Returns the empty string if no label for this extension * is specified in the plug-in manifest file. - * <p> - * The locale matching tries to find the best match between available translations and - * the requested locale, falling back to a more generic locale ("en") when the specific - * locale ("en_US") is not available. + * <p> + * The locale matching tries to find the best match between available translations and + * the requested locale, falling back to a more generic locale ("en") when the specific + * locale ("en_US") is not available. * </p><p> - * If multi-language support is not enabled, this method is equivalent to the method + * If multi-language support is not enabled, this method is equivalent to the method * {@link #getLabel()}. * </p> * @param locale the requested locale @@ -162,8 +162,8 @@ public interface IExtension { /** * Returns the simple identifier of this extension, or <code>null</code> * if this extension does not have an identifier. - * This identifier is specified in the plug-in manifest (<code>plugin.xml</code>) - * file as a non-empty string containing no period characters + * This identifier is specified in the plug-in manifest (<code>plugin.xml</code>) + * file as a non-empty string containing no period characters * (<code>'.'</code>) and must be unique within the namespace. * * @return the simple identifier of the extension (e.g. <code>"main"</code>) @@ -176,7 +176,7 @@ public interface IExtension { * Returns the unique identifier of this extension, or <code>null</code> * if this extension does not have an identifier. * If available, this identifier is unique within the plug-in registry, and - * is composed of the namespace where this extension + * is composed of the namespace where this extension * was declared and this extension's simple identifier. * * @return the unique identifier of the extension @@ -185,7 +185,7 @@ public interface IExtension { */ public String getUniqueIdentifier() throws InvalidRegistryObjectException; - /* (non-javadoc) + /* (non-javadoc) * @see Object#equals(java.lang.Object) */ @Override @@ -193,7 +193,7 @@ public interface IExtension { /** * Returns whether this extension object is valid. - * + * * @return <code>true</code> if the object is valid, and <code>false</code> * if it is no longer valid * @since 3.1 diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionDelta.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionDelta.java index 2347a61ac..a43dc5e94 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionDelta.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionDelta.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -22,13 +22,13 @@ package org.eclipse.core.runtime; */ public interface IExtensionDelta { /** - * Delta kind constant indicating that an extension has been added to an + * Delta kind constant indicating that an extension has been added to an * extension point. * @see IExtensionDelta#getKind() */ public int ADDED = 1; /** - * Delta kind constant indicating that an extension has been removed from an + * Delta kind constant indicating that an extension has been removed from an * extension point. * @see IExtensionDelta#getKind() */ @@ -36,7 +36,7 @@ public interface IExtensionDelta { /** * The kind of this extension delta. - * + * * @return the kind of change this delta represents * @see #ADDED * @see #REMOVED @@ -45,14 +45,14 @@ public interface IExtensionDelta { /** * Returns the affected extension. - * + * * @return the affected extension */ public IExtension getExtension(); /** * Returns the affected extension point. - * + * * @return the affected extension point */ public IExtensionPoint getExtensionPoint(); diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionPoint.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionPoint.java index 4eb6cb64b..59f14c185 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionPoint.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionPoint.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -12,12 +12,12 @@ package org.eclipse.core.runtime; /** * An extension point declared in a plug-in. - * Except for the list of extensions plugged in to it, the information - * available for an extension point is obtained from the declaring plug-in's + * Except for the list of extensions plugged in to it, the information + * available for an extension point is obtained from the declaring plug-in's * manifest (<code>plugin.xml</code>) file. * <p> - * These registry objects are intended for relatively short-term use. Clients that - * deal with these objects must be aware that they may become invalid if the + * These registry objects are intended for relatively short-term use. Clients that + * deal with these objects must be aware that they may become invalid if the * declaring plug-in is updated or uninstalled. If this happens, all methods except * {@link #isValid()} will throw {@link InvalidRegistryObjectException}. * For extension point objects, the most common case is code in a plug-in dealing @@ -32,7 +32,7 @@ package org.eclipse.core.runtime; * Client code can pre-test for invalid objects by calling {@link #isValid()}, * which never throws this exception. However, pre-tests are usually not sufficient * because of the possibility of the extension point object becoming invalid as a - * result of a concurrent activity. At-risk clients must treat + * result of a concurrent activity. At-risk clients must treat * <code>InvalidRegistryObjectException</code> as if it were a checked exception. * Also, such clients should probably register a listener with the extension registry * so that they receive notification of any changes to the registry. @@ -46,11 +46,11 @@ package org.eclipse.core.runtime; public interface IExtensionPoint { /** * Returns all configuration elements from all extensions configured - * into this extension point. Returns an empty array if this extension - * point has no extensions configured, or none of the extensions + * into this extension point. Returns an empty array if this extension + * point has no extensions configured, or none of the extensions * contain configuration elements. * - * @return the configuration elements for all extension configured + * @return the configuration elements for all extension configured * into this extension point * @throws InvalidRegistryObjectException if this extension point is no longer valid */ @@ -59,40 +59,40 @@ public interface IExtensionPoint { /** * Returns the namespace for this extension point. This value can be used * in various global facilities to discover this extension point's provider. - * + * * @return the namespace for this extension point * @throws InvalidRegistryObjectException if this extension point is no longer valid * @see IExtensionRegistry * @since 3.0 - * @deprecated As namespace is no longer restricted to the contributor name, + * @deprecated As namespace is no longer restricted to the contributor name, * use {@link #getNamespaceIdentifier()} to obtain namespace name or {@link #getContributor()} - * to get the name of the contributor of this registry element. + * to get the name of the contributor of this registry element. * <p> - * In the past namespace was dictated by the name of the bundle. If bundle <code>org.abc</code> - * contributed registry element with Id of <code>MyId</code>, the namespace of - * the element was always set to <code>org.abc</code>, producing the qualified name of + * In the past namespace was dictated by the name of the bundle. If bundle <code>org.abc</code> + * contributed registry element with Id of <code>MyId</code>, the namespace of + * the element was always set to <code>org.abc</code>, producing the qualified name of * <code>org.abc.MyId</code>. * </p><p> - * The namespace used to be the same as the bundle name. As a result, the {@link #getNamespace()} - * method was used both to obtain the name of the bundle and to obtain the namespace of a registry + * The namespace used to be the same as the bundle name. As a result, the {@link #getNamespace()} + * method was used both to obtain the name of the bundle and to obtain the namespace of a registry * element. * </p><p> - * Since 3.2, the extension registry allows elements to specify qualified name. The extension point - * of the plug-in <code>org.abc</code> could specify <code>org.zzz.MyExtPoint</code> as - * an Id. In this case, namespace name is <code>org.zzz</code>, but the contributor - * name is <code>org.abc</code>. + * Since 3.2, the extension registry allows elements to specify qualified name. The extension point + * of the plug-in <code>org.abc</code> could specify <code>org.zzz.MyExtPoint</code> as + * an Id. In this case, namespace name is <code>org.zzz</code>, but the contributor + * name is <code>org.abc</code>. * </p><p> - * (The use of a simple Id is still a preferred way. Whenever possible, specify only the simple + * (The use of a simple Id is still a preferred way. Whenever possible, specify only the simple * Id and let runtime take care of the rest.) * </p><p> - * If your code used the {@link #getNamespace()} to obtain the name of the contributing bundle, - * use {@link #getContributor()}. The typical usage pattern here is to find a bundle name to obtain - * some information from the corresponding OSGi bundle. For example, deducing the file location + * If your code used the {@link #getNamespace()} to obtain the name of the contributing bundle, + * use {@link #getContributor()}. The typical usage pattern here is to find a bundle name to obtain + * some information from the corresponding OSGi bundle. For example, deducing the file location * specified as a relative path to the bundle install location would fall into this group. * </p><p> - * If your code used the {@link #getNamespace()} to obtain the namespace of the registry element, - * use {@link #getNamespaceIdentifier()}. Typically, this is the case when code is trying to process - * registry elements belonging to some logical group. For example, processing notifications for all + * If your code used the {@link #getNamespace()} to obtain the namespace of the registry element, + * use {@link #getNamespaceIdentifier()}. Typically, this is the case when code is trying to process + * registry elements belonging to some logical group. For example, processing notifications for all * elements belonging to the <code>org.abc</code> namespace would fall into this category. * </p> */ @@ -100,19 +100,19 @@ public interface IExtensionPoint { /** * Returns the namespace name for this extension point. - * + * * @return the namespace name for this extension point * @throws InvalidRegistryObjectException if this extension point is no longer valid - * @since org.eclipse.equinox.registry 3.2 + * @since org.eclipse.equinox.registry 3.2 */ public String getNamespaceIdentifier() throws InvalidRegistryObjectException; /** * Returns the contributor of this extension point. - * + * * @return the contributor for this extension point * @throws InvalidRegistryObjectException if this extension point is no longer valid - * @since org.eclipse.equinox.registry 3.2 + * @since org.eclipse.equinox.registry 3.2 */ public IContributor getContributor() throws InvalidRegistryObjectException; @@ -122,7 +122,7 @@ public interface IExtensionPoint { * Since an extension might not have an identifier, some extensions * can only be found via the <code>getExtensions</code> method. * - * @param extensionId the unique identifier of an extension + * @param extensionId the unique identifier of an extension * (e.g. <code>"com.example.acme.main"</code>). * @return an extension, or <code>null</code> * @throws InvalidRegistryObjectException if this extension point is no longer valid @@ -153,16 +153,16 @@ public interface IExtensionPoint { public String getLabel() throws InvalidRegistryObjectException; /** - * When multi-language support is enabled, this method returns a displayable label + * When multi-language support is enabled, this method returns a displayable label * for this extension point in the specified locale. * Returns the empty string if no label for this extension point * is specified in the plug-in manifest file. - * <p> - * The locale matching tries to find the best match between available translations and - * the requested locale, falling back to a more generic locale ("en") when the specific - * locale ("en_US") is not available. + * <p> + * The locale matching tries to find the best match between available translations and + * the requested locale, falling back to a more generic locale ("en") when the specific + * locale ("en_US") is not available. * </p><p> - * If multi-language support is not enabled, this method is equivalent to the method + * If multi-language support is not enabled, this method is equivalent to the method * {@link #getLabel()}. * </p> * @param locale the requested locale @@ -175,9 +175,9 @@ public interface IExtensionPoint { public String getLabel(String locale) throws InvalidRegistryObjectException; /** - * Returns reference to the extension point schema. The schema - * reference is returned as a URL path relative to the plug-in - * installation URL. + * Returns reference to the extension point schema. The schema + * reference is returned as a URL path relative to the plug-in + * installation URL. * Returns the empty string if no schema for this extension point * is specified in the plug-in manifest file. * @@ -200,9 +200,9 @@ public interface IExtensionPoint { /** * Returns the unique identifier of this extension point. * This identifier is unique within the plug-in registry, and - * is composed of the namespace for this extension point + * is composed of the namespace for this extension point * and this extension point's simple identifier. - * + * * * @return the unique identifier of the extension point * (e.g. <code>"org.eclipse.core.resources.builders"</code>) @@ -210,7 +210,7 @@ public interface IExtensionPoint { */ public String getUniqueIdentifier() throws InvalidRegistryObjectException; - /* (non-javadoc) + /* (non-javadoc) * @see Object#equals(java.lang.Object) */ @Override @@ -218,7 +218,7 @@ public interface IExtensionPoint { /** * Returns whether this extension point object is valid. - * + * * @return <code>true</code> if the object is valid, and <code>false</code> * if it is no longer valid * @since 3.1 diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionRegistry.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionRegistry.java index 2036bb19b..f505504a7 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionRegistry.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExtensionRegistry.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -15,10 +15,10 @@ import java.util.ResourceBundle; /** * The extension registry holds the master list of all - * discovered namespaces, extension points and extensions. + * discovered namespaces, extension points and extensions. * <p> - * The extension registry can be queried, by name, for - * extension points and extensions. + * The extension registry can be queried, by name, for + * extension points and extensions. * </p> * <p> * The various objects that describe the contents of the extension registry @@ -42,9 +42,9 @@ import java.util.ResourceBundle; * the registry. * </p> * <p> - * Extensions and extension points are declared by generic entities called - * <cite>namespaces</cite>. The only fact known about namespaces is that they - * have unique string-based identifiers. One example of a namespace + * Extensions and extension points are declared by generic entities called + * <cite>namespaces</cite>. The only fact known about namespaces is that they + * have unique string-based identifiers. One example of a namespace * is a plug-in, for which the namespace id is the plug-in id. * </p><p> * This interface can be used without OSGi running. @@ -57,24 +57,24 @@ import java.util.ResourceBundle; public interface IExtensionRegistry { /** * <b>Note:</b> for new implementations consider using {@link #addListener(IRegistryEventListener, String)}. - * <p> - * Adds the given listener for registry change events related to extension points + * <p> + * Adds the given listener for registry change events related to extension points * in the given namespace. - * Has no effect if an identical listener is already registered. After - * completion of this method, the given listener will be registered for events - * related to extension points in the specified namespace. If no namespace - * is specified, the listener will receive notifications for changes to - * extension points in any namespace. + * Has no effect if an identical listener is already registered. After + * completion of this method, the given listener will be registered for events + * related to extension points in the specified namespace. If no namespace + * is specified, the listener will receive notifications for changes to + * extension points in any namespace. * </p><p> * Once registered, a listener starts receiving notification of changes to * the registry. Registry change notifications are sent asynchronously. - * The listener continues to receive notifications until it is removed. + * The listener continues to receive notifications until it is removed. * </p> * @param listener the listener * @param namespace the namespace in which to listen for changes * @see IRegistryChangeListener * @see IRegistryChangeEvent - * @see #removeRegistryChangeListener(IRegistryChangeListener) + * @see #removeRegistryChangeListener(IRegistryChangeListener) */ public void addRegistryChangeListener(IRegistryChangeListener listener, String namespace); @@ -83,14 +83,14 @@ public interface IExtensionRegistry { * <p> * Adds the given listener for registry change events. * Has no effect if an identical listener is already registered. - * + * * </p><p> * This method is equivalent to: * <pre> * addRegistryChangeListener(listener,null); * </pre> * </p> - * + * * @param listener the listener * @see IRegistryChangeListener * @see IRegistryChangeEvent @@ -101,8 +101,8 @@ public interface IExtensionRegistry { /** * Returns all configuration elements from all extensions configured - * into the identified extension point. Returns an empty array if the extension - * point does not exist, has no extensions configured, or none of the extensions + * into the identified extension point. Returns an empty array if the extension + * point does not exist, has no extensions configured, or none of the extensions * contain configuration elements. * * @param extensionPointId the unique identifier of the extension point @@ -113,13 +113,13 @@ public interface IExtensionRegistry { /** * Returns all configuration elements from all extensions configured - * into the identified extension point. Returns an empty array if the extension - * point does not exist, has no extensions configured, or none of the extensions + * into the identified extension point. Returns an empty array if the extension + * point does not exist, has no extensions configured, or none of the extensions * contain configuration elements. * - * @param namespace the namespace for the extension point + * @param namespace the namespace for the extension point * (e.g. <code>"org.eclipse.core.resources"</code>) - * @param extensionPointName the simple identifier of the + * @param extensionPointName the simple identifier of the * extension point (e.g. <code>"builders"</code>) * @return the configuration elements */ @@ -127,54 +127,54 @@ public interface IExtensionRegistry { /** * Returns all configuration elements from the identified extension. - * Returns an empty array if the extension does not exist or + * Returns an empty array if the extension does not exist or * contains no configuration elements. * - * @param namespace the namespace for the extension point + * @param namespace the namespace for the extension point * (e.g. <code>"org.eclipse.core.resources"</code>) - * @param extensionPointName the simple identifier of the + * @param extensionPointName the simple identifier of the * extension point (e.g. <code>"builders"</code>) - * @param extensionId the unique identifier of the extension + * @param extensionId the unique identifier of the extension * (e.g. <code>"com.example.acme.coolbuilder"</code>) * @return the configuration elements */ public IConfigurationElement[] getConfigurationElementsFor(String namespace, String extensionPointName, String extensionId); /** - * Returns the specified extension in this extension registry, + * Returns the specified extension in this extension registry, * or <code>null</code> if there is no such extension. * - * @param extensionId the unique identifier of the extension + * @param extensionId the unique identifier of the extension * (e.g. <code>"com.example.acme.coolbuilder"</code>) * @return the extension, or <code>null</code> */ public IExtension getExtension(String extensionId); /** - * Returns the specified extension in this extension registry, + * Returns the specified extension in this extension registry, * or <code>null</code> if there is no such extension. * The first parameter identifies the extension point, and the second * parameter identifies an extension plugged in to that extension point. * * @param extensionPointId the unique identifier of the extension point * (e.g. <code>"org.eclipse.core.resources.builders"</code>) - * @param extensionId the unique identifier of the extension + * @param extensionId the unique identifier of the extension * (e.g. <code>"com.example.acme.coolbuilder"</code>) * @return the extension, or <code>null</code> */ public IExtension getExtension(String extensionPointId, String extensionId); /** - * Returns the specified extension in this extension registry, + * Returns the specified extension in this extension registry, * or <code>null</code> if there is no such extension. * The first two parameters identify the extension point, and the third * parameter identifies an extension plugged in to that extension point. * - * @param namespace the namespace for the extension point + * @param namespace the namespace for the extension point * (e.g. <code>"org.eclipse.core.resources"</code>) - * @param extensionPointName the simple identifier of the + * @param extensionPointName the simple identifier of the * extension point (e.g. <code>"builders"</code>) - * @param extensionId the unique identifier of the extension + * @param extensionId the unique identifier of the extension * (e.g. <code>"com.example.acme.coolbuilder"</code>) * @return the extension, or <code>null</code> */ @@ -185,7 +185,7 @@ public interface IExtensionRegistry { * in this extension registry, or <code>null</code> if there is no such * extension point. * - * @param extensionPointId the unique identifier of the extension point + * @param extensionPointId the unique identifier of the extension point * (e.g., <code>"org.eclipse.core.resources.builders"</code>) * @return the extension point, or <code>null</code> */ @@ -196,9 +196,9 @@ public interface IExtensionRegistry { * with the given namespace and extension point simple identifier, * or <code>null</code> if there is no such extension point. * - * @param namespace the namespace for the given extension point + * @param namespace the namespace for the given extension point * (e.g. <code>"org.eclipse.core.resources"</code>) - * @param extensionPointName the simple identifier of the + * @param extensionPointName the simple identifier of the * extension point (e.g. <code>"builders"</code>) * @return the extension point, or <code>null</code> */ @@ -213,20 +213,20 @@ public interface IExtensionRegistry { public IExtensionPoint[] getExtensionPoints(); /** - * Returns all extension points declared in the given namespace. Returns an empty array if + * Returns all extension points declared in the given namespace. Returns an empty array if * there are no extension points declared in the namespace. - * - * @param namespace the namespace for the extension points - * (e.g. <code>"org.eclipse.core.resources"</code>) - * @return the extension points in this registry declared in the given namespace + * + * @param namespace the namespace for the extension points + * (e.g. <code>"org.eclipse.core.resources"</code>) + * @return the extension points in this registry declared in the given namespace */ public IExtensionPoint[] getExtensionPoints(String namespace); /** - * Returns all extension points supplied by the contributor, or <code>null</code> + * Returns all extension points supplied by the contributor, or <code>null</code> * if there are no such extension points. - * - * @param contributor the contributor for the extensions (for OSGi registry, bundles and + * + * @param contributor the contributor for the extensions (for OSGi registry, bundles and * fragments are different contributors) * @return the extension points, or <code>null</code> * @since 3.4 @@ -234,19 +234,19 @@ public interface IExtensionRegistry { public IExtensionPoint[] getExtensionPoints(IContributor contributor); /** - * Returns all extensions declared in the given namespace. Returns an empty array if + * Returns all extensions declared in the given namespace. Returns an empty array if * no extensions are declared in the namespace. - * - * @param namespace the namespace for the extensions + * + * @param namespace the namespace for the extensions * (e.g. <code>"org.eclipse.core.resources"</code>) - * @return the extensions in this registry declared in the given namespace + * @return the extensions in this registry declared in the given namespace */ public IExtension[] getExtensions(String namespace); /** - * Returns all extensions supplied by the contributor, or <code>null</code> if there + * Returns all extensions supplied by the contributor, or <code>null</code> if there * are no such extensions. - * @param contributor the contributor for the extensions (for OSGi registry, bundles and + * @param contributor the contributor for the extensions (for OSGi registry, bundles and * fragments are different contributors) * @return the extensions, or <code>null</code> * @since 3.4 @@ -254,20 +254,20 @@ public interface IExtensionRegistry { public IExtension[] getExtensions(IContributor contributor); /** - * Returns all namespaces currently used by extensions and extension points in this + * Returns all namespaces currently used by extensions and extension points in this * registry. Returns an empty array if there are no known extensions/extension points * in this registry. * <p> - * The fully-qualified name of an extension point or an extension consist of + * The fully-qualified name of an extension point or an extension consist of * a namespace and a simple name (much like a qualified Java class name consist * of a package name and a class name). The simple names are presumed to be unique * in the namespace. - * </p> + * </p> * @return all namespaces known to this registry */ public String[] getNamespaces(); - /** + /** * Removes the given registry change listener from this registry. * Has no effect if an identical listener is not registered. * @@ -279,20 +279,20 @@ public interface IExtensionRegistry { public void removeRegistryChangeListener(IRegistryChangeListener listener); /** - * Adds to this extension registry an extension point(s), extension(s), or - * a combination of those described by the XML file. The information in + * Adds to this extension registry an extension point(s), extension(s), or + * a combination of those described by the XML file. The information in * the XML file should be supplied in the same format as the plugin.xml; in fact, * Plug-in Manifest editor can be used to prepare the XML file. The top token - * of the contribution (normally, "plugin" or "fragment" in the Plug-in Manifest - * editor) is ignored by this method. + * of the contribution (normally, "plugin" or "fragment" in the Plug-in Manifest + * editor) is ignored by this method. * <p> - * This method is an access controlled method. Proper token (master token or user token) should - * be passed as an argument. Two registry keys are set in the registry 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 + * This method is an access controlled method. Proper token (master token or user token) should + * be passed as an argument. Two registry keys are set in the registry 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. * </p> - * @param is stream open on the XML file. The XML file can contain an extension + * @param is stream open on the XML file. The XML file can contain an extension * point(s) or/and extension(s) described in the format similar to plugin.xml. The method * closes the stream before returning * @param contributor the contributor making this contribution. @@ -304,18 +304,18 @@ public interface IExtensionRegistry { * @return <code>true</code> if the contribution was successfully processed and <code>false</code> * otherwise * @throws IllegalArgumentException if an incorrect token is passed - * + * * @see IContributor - * @since org.eclipse.equinox.registry 3.2 + * @since org.eclipse.equinox.registry 3.2 */ public boolean addContribution(InputStream is, IContributor contributor, boolean persist, String name, ResourceBundle translationBundle, Object token) throws IllegalArgumentException; /** * Removes the given extension from this registry. * <p> - * This method is an access controlled method. Proper token (master token or user token) should - * be passed as an argument. Two registry keys are set in the registry constructor - * {@link RegistryFactory#createRegistry(org.eclipse.core.runtime.spi.RegistryStrategy, Object, Object)}: + * This method is an access controlled method. Proper token (master token or user token) should + * be passed as an argument. Two registry keys are set in the registry 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> @@ -323,33 +323,33 @@ public interface IExtensionRegistry { * @param token the key used to check permissions * @return <code>true</code> if the extension was successfully removed, and <code>false</code> otherwise * @throws IllegalArgumentException if an incorrect token is passed - * - * @since org.eclipse.equinox.registry 3.2 + * + * @since org.eclipse.equinox.registry 3.2 */ public boolean removeExtension(IExtension extension, Object token) throws IllegalArgumentException; /** * Removes the specified extension point from this registry. * <p> - * This method is an access controlled method. Proper token (master token or user token) should - * be passed as an argument. Two registry keys are set in the registry constructor - * {@link RegistryFactory#createRegistry(org.eclipse.core.runtime.spi.RegistryStrategy, Object, Object)}: + * This method is an access controlled method. Proper token (master token or user token) should + * be passed as an argument. Two registry keys are set in the registry 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> * @param extensionPoint extension point to be removed * @param token the key used to check permissions - * @return <code>true</code> if the extension point was successfully removed, and + * @return <code>true</code> if the extension point was successfully removed, and * <code>false</code> otherwise * @throws IllegalArgumentException if incorrect token is passed - * - * @since org.eclipse.equinox.registry 3.2 + * + * @since org.eclipse.equinox.registry 3.2 */ public boolean removeExtensionPoint(IExtensionPoint extensionPoint, Object token) throws IllegalArgumentException; /** * Call this method to properly stop the registry. The method stops registry event processing - * and writes out cache information to be used in the next run. This is an access controlled + * and writes out cache information to be used in the next run. This is an access controlled * method; master token is required. * <p> * This method is an access controlled method. Master token should be passed as an argument. @@ -357,7 +357,7 @@ public interface IExtensionRegistry { * @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 - * + * * @since org.eclipse.equinox.registry 3.2 */ public void stop(Object token) throws IllegalArgumentException; @@ -366,48 +366,48 @@ public interface IExtensionRegistry { * Adds the given listener for registry change events. Listener will be notified * on changes to all extension points and underlying extensions. * <p> - * Depending on activity, listeners of this type might receive a large number + * Depending on activity, listeners of this type might receive a large number * of modifications and negatively impact overall system performance. Whenever * possible, consider registering listener specific to an extension point rather * than a "global" listener. * </p><p> * Once registered, a listener starts receiving notification of changes to * the registry. Registry change notifications are sent asynchronously. - * The listener continues to receive notifications until it is removed. + * The listener continues to receive notifications until it is removed. * </p><p> - * This method has no effect if the listener is already registered. + * This method has no effect if the listener is already registered. * </p> * @param listener the listener - * @since org.eclipse.equinox.registry 3.4 + * @since org.eclipse.equinox.registry 3.4 */ public void addListener(IRegistryEventListener listener); /** - * Adds the given listener for registry change events related to specified + * Adds the given listener for registry change events related to specified * extension point. * <p> * Once registered, a listener starts receiving notification of changes to * the registry. Registry change notifications are sent asynchronously. - * The listener continues to receive notifications until it is removed. + * The listener continues to receive notifications until it is removed. * </p><p> - * This method has no effect if the listener is already registered. + * This method has no effect if the listener is already registered. * </p> * @param listener the listener * @param extensionPointId the unique identifier of extension point * @see IExtensionPoint#getUniqueIdentifier() - * @since org.eclipse.equinox.registry 3.4 + * @since org.eclipse.equinox.registry 3.4 */ public void addListener(IRegistryEventListener listener, String extensionPointId); /** * Removes the given registry change listener from this registry. * <p> - * This method has no effect if the listener is not registered. + * This method has no effect if the listener is not registered. * </p> * @param listener the listener * @see #addListener(IRegistryEventListener) * @see #addListener(IRegistryEventListener, String) - * @since org.eclipse.equinox.registry 3.4 + * @since org.eclipse.equinox.registry 3.4 */ public void removeListener(IRegistryEventListener listener); @@ -417,7 +417,7 @@ public interface IExtensionRegistry { * See the runtime option "-registryMultiLanguage" for enabling multi-language * support. * </p> - * @return <code>true</code> if multiple languages are supported by this + * @return <code>true</code> if multiple languages are supported by this * instance of the extension registry; <code>false</code> otherwise. * @since org.eclipse.equinox.registry 3.5 */ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeEvent.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeEvent.java index 410c6e08d..48809cc3a 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeEvent.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeEvent.java @@ -4,14 +4,14 @@ * 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.runtime; /** - * Registry change events describe changes to the extension registry. + * Registry change events describe changes to the extension registry. * <p> * This interface can be used without OSGi running. * </p><p> @@ -23,40 +23,40 @@ package org.eclipse.core.runtime; * @noimplement This interface is not intended to be implemented by clients. */ public interface IRegistryChangeEvent { - /** - * Returns all extension deltas for all hosts. Returns an empty array if there are + /** + * Returns all extension deltas for all hosts. Returns an empty array if there are * no deltas in this event. - * - * @return all extension deltas + * + * @return all extension deltas */ public IExtensionDelta[] getExtensionDeltas(); - /** + /** * Returns all extension deltas for the given namespace. Returns an empty array if there are - * no deltas in this event for any extension points provided in the given namespace. - * - * @param namespace the namespace for the extension deltas - * @return all extension deltas for the given namespace + * no deltas in this event for any extension points provided in the given namespace. + * + * @param namespace the namespace for the extension deltas + * @return all extension deltas for the given namespace */ public IExtensionDelta[] getExtensionDeltas(String namespace); - /** - * Returns all the extension deltas for the given namespace and extension point. Returns an + /** + * Returns all the extension deltas for the given namespace and extension point. Returns an * empty array if there are no deltas in this event for the given extension point. - * + * * @param namespace the namespace for the extension point - * @param extensionPoint the simple identifier of the + * @param extensionPoint the simple identifier of the * extension point (e.g. <code>"builders"</code>) * @return all extension deltas for the given extension point */ public IExtensionDelta[] getExtensionDeltas(String namespace, String extensionPoint); - /** - * Returns the delta for the given namespace, extension point and extension. + /** + * Returns the delta for the given namespace, extension point and extension. * Returns <code>null</code> if none exists in this event. - * + * * @param namespace the namespace for the extension point - * @param extensionPoint the simple identifier of the + * @param extensionPoint the simple identifier of the * extension point (e.g. <code>"builders"</code>) * @param extension the unique identifier of the extension * @return the extension delta, or <code>null</code> diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeListener.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeListener.java index ce1f55d26..d68d0f145 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeListener.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryChangeListener.java @@ -15,31 +15,31 @@ import java.util.EventListener; /** * <b>Note:</b> for new implementations consider using {@link IRegistryEventListener}. * <p> - * A registry change listener is notified of changes to extensions points in the - * registry. These changes arise from subsequent manipulation of the registry after + * A registry change listener is notified of changes to extensions points in the + * registry. These changes arise from subsequent manipulation of the registry after * it was initially created. * </p><p> * This interface can be used without OSGi running. * </p><p> * Clients may implement this interface. * </p> - * + * * @since 3.0 * @see IExtensionRegistry * @see IRegistryChangeEvent */ public interface IRegistryChangeListener extends EventListener { /** - * Notifies this listener that some registry changes are happening, or have + * Notifies this listener that some registry changes are happening, or have * already happened. * <p> - * The supplied event gives details. This event object (and the deltas in it) is valid + * The supplied event gives details. This event object (and the deltas in it) is valid * only for the duration of the invocation of this method. * </p> <p> * Note: This method is called by the platform; it is not intended * to be called directly by clients. * </p> - * + * * @param event the registry change event * @see IRegistryChangeEvent */ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryEventListener.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryEventListener.java index 4c9edb10e..6cd9a021f 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryEventListener.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IRegistryEventListener.java @@ -30,7 +30,7 @@ public interface IRegistryEventListener extends EventListener { /** * Notifies this listener that extensions were added to the registry. * <p> - * The extensions supplied as the argument are valid only for the duration of the + * The extensions supplied as the argument are valid only for the duration of the * invocation of this method. * </p> * @param extensions extensions added to the registry @@ -40,7 +40,7 @@ public interface IRegistryEventListener extends EventListener { /** * Notifies this listener that extensions were removed from the registry. * <p> - * The extensions supplied as the argument are valid only for the duration of the + * The extensions supplied as the argument are valid only for the duration of the * invocation of this method. * </p> * @param extensions extensions removed from the registry @@ -50,7 +50,7 @@ public interface IRegistryEventListener extends EventListener { /** * Notifies this listener that extension points were added to the registry. * <p> - * The extension points supplied as the argument are valid only for the duration of the + * The extension points supplied as the argument are valid only for the duration of the * invocation of this method. * </p> * @param extensionPoints extension points added to the registry @@ -60,7 +60,7 @@ public interface IRegistryEventListener extends EventListener { /** * Notifies this listener that extension points were removed from the registry. * <p> - * The extension points supplied as the argument are valid only for the duration of the + * The extension points supplied as the argument are valid only for the duration of the * invocation of this method. * </p> * @param extensionPoints extension points removed from the registry diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/InvalidRegistryObjectException.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/InvalidRegistryObjectException.java index 4304b2e7c..c4fbb246a 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/InvalidRegistryObjectException.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/InvalidRegistryObjectException.java @@ -4,13 +4,13 @@ * 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.runtime; -/** +/** * An unchecked exception indicating that an attempt to access * an extension registry object that is no longer valid. * <p> diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryFactory.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryFactory.java index aba884f75..a0d0bf1cc 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryFactory.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryFactory.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -36,17 +36,17 @@ public final class RegistryFactory { /** * Creates a new extension registry based on the given set of parameters. * <p> - * The strategy is an optional collection of methods that supply additional registry - * functionality. Users may pass in <code>null</code> for the strategy if default + * The strategy is an optional collection of methods that supply additional registry + * functionality. Users may pass in <code>null</code> for the strategy if default * behavior is sufficient. * </p><p> - * The master token is stored by the registry and later used as an identifier of callers - * who are allowed full control over the registry functionality. Users may pass in + * The master token is stored by the registry and later used as an identifier of callers + * who are allowed full control over the registry functionality. Users may pass in * <code>null</code> as a master token. * </p><p> * The user token is stored by the registry and later used as an identifier of callers - * who are allowed to control registry at the user level. For instance, users attempting to - * modify dynamic contributions to the registry have to use the user token. Users may pass + * who are allowed to control registry at the user level. For instance, users attempting to + * modify dynamic contributions to the registry have to use the user token. Users may pass * in <code>null</code> as a user token. * </p> * @param strategy registry strategy or <code>null</code> @@ -60,9 +60,9 @@ public final class RegistryFactory { /** * Returns the default extension registry specified by the registry provider. - * May return <code>null</code> if the provider has not been set or if the + * May return <code>null</code> if the provider has not been set or if the * registry has not been created. - * + * * @return existing extension registry or <code>null</code> */ public static IExtensionRegistry getRegistry() { @@ -73,23 +73,23 @@ public final class RegistryFactory { } /** - * Creates a registry strategy that can be used in an OSGi container. The strategy uses - * OSGi contributions and contributors for the registry processing and takes advantage of + * Creates a registry strategy that can be used in an OSGi container. The strategy uses + * OSGi contributions and contributors for the registry processing and takes advantage of * additional mechanisms available through the OSGi library. * <p> - * The OSGi registry strategy sequentially checks the array of storage directories to + * The OSGi registry strategy sequentially checks the array of storage directories to * discover the location of the registry cache formed by previous invocations of the extension - * registry. Once found, the location is used to store registry cache. If this value + * registry. Once found, the location is used to store registry cache. If this value * is <code>null</code> then caching of the registry content is disabled. * </p><p> - * The cache read-only array is an array the same length as the storage directory array. - * It contains boolean values indicating whether or not each storage directory is read-only. - * If the value at an index is <code>true</code> then the location at the corresponding index - * in the storage directories array is read-only; if <code>false</code> then the cache location - * is read-write. The array can be <code>null</code> if the <code>storageDirs</code> parameter + * The cache read-only array is an array the same length as the storage directory array. + * It contains boolean values indicating whether or not each storage directory is read-only. + * If the value at an index is <code>true</code> then the location at the corresponding index + * in the storage directories array is read-only; if <code>false</code> then the cache location + * is read-write. The array can be <code>null</code> if the <code>storageDirs</code> parameter * is <code>null</code>. * </p><p> - * The master token should be passed to the OSGi registry strategy to permit it to perform + * The master token should be passed to the OSGi registry strategy to permit it to perform * contributions to the registry. * </p> * @param storageDirs array of file system directories or <code>null</code> diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.java index 4f29b1901..8db0dc07e 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.java @@ -4,7 +4,7 @@ * 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 * Sebastian Davids - fix for the bug 178028 (removals not propagated to handlers) @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.*; * <p> * This class can be used without OSGi running. * </p> - * @see org.eclipse.core.runtime.dynamichelpers.IExtensionTracker + * @see org.eclipse.core.runtime.dynamichelpers.IExtensionTracker * @since 3.1 */ public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListener { @@ -46,8 +46,8 @@ public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListe /** * Construct a new instance of the extension tracker using the given registry * containing tracked extensions and extension points. - * - * @param theRegistry the extension registry to track + * + * @param theRegistry the extension registry to track * @since org.eclipse.equinox.registry 3.2 */ public ExtensionTracker(IExtensionRegistry theRegistry) { @@ -129,10 +129,10 @@ public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListe /** * Notify all handlers whose filter matches that the given delta occurred. - * If the list of objects is not <code>null</code> then this is a removal and + * If the list of objects is not <code>null</code> then this is a removal and * the handlers will be given a chance to process the list. If it is <code>null</code> * then the notification is an addition. - * + * * @param delta the change to broadcast * @param objects the objects to pass to the handlers on removals */ @@ -251,8 +251,8 @@ public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListe /** * Return an instance of filter matching all changes for the given extension point. - * - * @param xpt the extension point + * + * @param xpt the extension point * @return a filter */ public static IFilter createExtensionPointFilter(final IExtensionPoint xpt) { @@ -266,7 +266,7 @@ public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListe /** * Return an instance of filter matching all changes for the given extension points. - * + * * @param xpts the extension points used to filter * @return a filter */ @@ -284,8 +284,8 @@ public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListe /** * Return an instance of filter matching all changes from a given plugin. - * - * @param id the plugin id + * + * @param id the plugin id * @return a filter */ public static IFilter createNamespaceFilter(final String id) { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionChangeHandler.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionChangeHandler.java index ded0f494f..13fc87ffd 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionChangeHandler.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionChangeHandler.java @@ -13,7 +13,7 @@ package org.eclipse.core.runtime.dynamichelpers; import org.eclipse.core.runtime.IExtension; /** - * Extension change handlers are notified of changes for a given extension + * Extension change handlers are notified of changes for a given extension * point in the context of an extension tracker. * <p> * This interface can be used without OSGi running. @@ -26,19 +26,19 @@ public interface IExtensionChangeHandler { /** * This method is called whenever an extension conforming to the extension point filter - * is being added to the registry. This method does not automatically register objects + * is being added to the registry. This method does not automatically register objects * to the tracker. - * + * * @param tracker a tracker to which the handler has been registered * @param extension the extension being added */ public void addExtension(IExtensionTracker tracker, IExtension extension); - /** + /** * This method is called after the removal of an extension. - * + * * @param extension the extension being removed - * @param objects the objects that were associated with the removed extension + * @param objects the objects that were associated with the removed extension */ public void removeExtension(IExtension extension, Object[] objects); } diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionTracker.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionTracker.java index 663a1af04..40ad64255 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionTracker.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IExtensionTracker.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -29,28 +29,28 @@ public interface IExtensionTracker { /** * Constant for strong (normal) reference holding. - * + * * Value <code>1</code>. */ public static final int REF_STRONG = ReferenceHashSet.HARD; /** * Constant for soft reference holding. - * + * * Value <code>2</code>. */ public static final int REF_SOFT = ReferenceHashSet.SOFT; /** * Constant for weak reference holding. - * + * * Value <code>3</code>. */ public static final int REF_WEAK = ReferenceHashSet.WEAK; /** * Register an extension change handler with this tracker using the given filter. - * + * * @param handler the handler to be registered * @param filter the filter to use to choose interesting changes */ @@ -58,8 +58,8 @@ public interface IExtensionTracker { /** * Unregister the given extension change handler previously registered with this tracker. - * - * @param handler the handler to be unregistered + * + * @param handler the handler to be unregistered */ public void unregisterHandler(IExtensionChangeHandler handler); @@ -67,8 +67,8 @@ public interface IExtensionTracker { * Create an association between the given extension and the given object. * The referenceType indicates how strongly the object is being kept in memory. * There is 3 possible values: {@link #REF_STRONG}, {@link #REF_SOFT}, {@link #REF_WEAK}. - * - * @param extension the extension + * + * @param extension the extension * @param object the object to associate with the extension * @param referenceType one of REF_STRONG, REF_SOFT, REF_WEAK * @see #REF_STRONG @@ -79,7 +79,7 @@ public interface IExtensionTracker { /** * Remove an association between the given extension and the given object. - * + * * @param extension the extension under which the object has been registered * @param object the object to unregister */ @@ -88,7 +88,7 @@ public interface IExtensionTracker { /** * Remove all the objects associated with the given extension. Return * the removed objects. - * + * * @param extension the extension for which the objects are removed * @return the objects that were associated with the extension */ @@ -97,10 +97,10 @@ public interface IExtensionTracker { /** * Return all the objects that have been associated with the given extension. * All objects registered strongly will be return unless they have been unregistered. - * The objects registered softly or weakly may not be returned if they have been garbage collected. + * The objects registered softly or weakly may not be returned if they have been garbage collected. * Return an empty array if no associations exist. - * - * @param extension the extension for which the object must be returned + * + * @param extension the extension for which the object must be returned * @return the array of associated objects */ public Object[] getObjects(IExtension extension); diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IFilter.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IFilter.java index 200f4abfa..3d2bc9c82 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IFilter.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/IFilter.java @@ -13,10 +13,10 @@ package org.eclipse.core.runtime.dynamichelpers; import org.eclipse.core.runtime.IExtensionPoint; /** - * A filter compares the given object to some pattern and returns + * A filter compares the given object to some pattern and returns * <code>true</code> if the two match and <code>false</code> otherwise. * <p> - * This interface may be implemented by clients, however factory methods are + * This interface may be implemented by clients, however factory methods are * available on IExtensionTracker. * </p><p> * This interface can be used without OSGi running. @@ -25,11 +25,11 @@ import org.eclipse.core.runtime.IExtensionPoint; */ public interface IFilter { /** - * Return <code>true</code> if the given object matches the criteria + * Return <code>true</code> if the given object matches the criteria * for this filter. - * + * * @param target the object to match - * @return <code>true</code> if the target matches this filter + * @return <code>true</code> if the target matches this filter * and <code>false</code> otherwise */ public boolean matches(IExtensionPoint target); diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/IDynamicExtensionRegistry.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/IDynamicExtensionRegistry.java index 396a2a1c1..4f0c60129 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/IDynamicExtensionRegistry.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/IDynamicExtensionRegistry.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -16,13 +16,13 @@ import org.eclipse.core.runtime.IContributor; * This interface provides an extra degree of access to an extension registry that * might be useful to registry implementers. * <p> - * At this time functionality available through this interface is not intended to + * At this time functionality available through this interface is not intended to * be used with the default Eclipse extension registry. * </p><p> - * <b>Note:</b> This class/interface is part of an interim SPI that is still under - * development and expected to change significantly before reaching stability. - * It is being made available at this early stage to solicit feedback from pioneering - * adopters on the understanding that any code that uses this SPI will almost certainly + * <b>Note:</b> This class/interface is part of an interim SPI that is still under + * development and expected to change significantly before reaching stability. + * It is being made available at this early stage to solicit feedback from pioneering + * adopters on the understanding that any code that uses this SPI will almost certainly * be broken (repeatedly) as the SPI evolves. * </p><p> * This interface is not intended to be extended by clients. @@ -40,7 +40,7 @@ public interface IDynamicExtensionRegistry { /** * Removes all extensions and extension points provided by the contributor. * <p> - * This method is an access controlled method. Access tokens are specified when the registry + * This method is an access controlled method. Access tokens are specified when the registry * is constructed by the registry implementers. * </p> * @see org.eclipse.core.runtime.RegistryFactory#createRegistry(RegistryStrategy, Object, Object) @@ -50,7 +50,7 @@ public interface IDynamicExtensionRegistry { public void removeContributor(IContributor contributor, Object key); /** - * Finds out if registry has the contributor. + * Finds out if registry has the contributor. * @param contributor registry contributor * @return true if the registry has this contributor; false otherwise */ diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/IRegistryProvider.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/IRegistryProvider.java index 6c12838c5..fe9dfc5dc 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/IRegistryProvider.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/IRegistryProvider.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -26,10 +26,10 @@ import org.eclipse.core.runtime.IExtensionRegistry; public interface IRegistryProvider { /** - * Returns the extension registry contributed by this provider; must not + * Returns the extension registry contributed by this provider; must not * be <code>null</code>. - * - * @return an extension registry + * + * @return an extension registry */ public IExtensionRegistry getRegistry(); } diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryContributor.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryContributor.java index 31f3426ca..b335e6bd9 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryContributor.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryContributor.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -14,15 +14,15 @@ import org.eclipse.core.runtime.IContributor; /** * This class describes a registry contributor which is an entity that supplies information - * to the extension registry. Depending on the registry strategy, contributor might delegate + * to the extension registry. Depending on the registry strategy, contributor might delegate * some of its functionality to a "host" contributor. For instance, OSGi registry strategy - * uses "host" contributor to delegate some functionality from fragments to plug-ins. + * uses "host" contributor to delegate some functionality from fragments to plug-ins. * <p> * This class can be instantiated by the registry Service Providers. * </p><p> * This class can be used without OSGi running. * </p><p> - * This class can not be extended. + * This class can not be extended. * </p> * @since org.eclipse.equinox.registry 3.2 * @noextend This class is not intended to be subclassed by clients. @@ -40,15 +40,15 @@ public final class RegistryContributor implements IContributor { private String actualContributorName; /** - * ID associated with the entity "in charge" of the contributor (e.g., "1"). IDs are expected - * to be unique in the workspace. If contributor does not rely on a host, this value should be + * ID associated with the entity "in charge" of the contributor (e.g., "1"). IDs are expected + * to be unique in the workspace. If contributor does not rely on a host, this value should be * the same as the actual contributor ID. */ private String hostId; /** * Name of the entity "in charge" of the contributor (e.g. "org.eclipse.core.runtime"). - * If contributor does not rely on a host, this value should be the same as the actual + * If contributor does not rely on a host, this value should be the same as the actual * contributor name. */ private String hostName; @@ -56,23 +56,23 @@ public final class RegistryContributor implements IContributor { /** * Constructor for the registry contributor. * <p> - * The actual ID is a string identifier for the contributor (e.g., "12") and is expected - * to be unique within the workspace. The actual ID of the contributor must not + * The actual ID is a string identifier for the contributor (e.g., "12") and is expected + * to be unique within the workspace. The actual ID of the contributor must not * be <code>null</code>. * </p><p> - * The actual name is the name associated with the contributor - * (e.g., "org.eclipse.core.runtime.fragment"). The actual name of the contributor must - * not be <code>null</code>. + * The actual name is the name associated with the contributor + * (e.g., "org.eclipse.core.runtime.fragment"). The actual name of the contributor must + * not be <code>null</code>. * </p><p> * The host ID is the identifier associated with the entity "in charge" of the contributor - * (e.g., "1"). IDs are expected to be unique in the workspace. If contributor does not + * (e.g., "1"). IDs are expected to be unique in the workspace. If contributor does not * rely on a host, then <code>null</code> should be used as the host ID. * </p><p> - * The host name is the name of the entity "in charge" of the contributor + * The host name is the name of the entity "in charge" of the contributor * (e.g., "org.eclipse.core.runtime"). If contributor does not rely on a host, then * <code>null</code> should be used as the host name. * </p><p> - * There should be 1-to-1 mapping between the contributor and the contibutor ID. + * There should be 1-to-1 mapping between the contributor and the contibutor ID. * The IDs (either actual or host) can not be re-used in the same registry. * For example, if ID of 12 was used to identify contributorA, the ID of 12 can not * be used to identify contributorB or a host for the contributorC. @@ -95,10 +95,10 @@ public final class RegistryContributor implements IContributor { } /** - * Provides actual ID associated with the registry contributor (e.g., "12"). IDs are expected + * Provides actual ID associated with the registry contributor (e.g., "12"). IDs are expected * to be unique in the workspace. - * - * @return actual ID of the registry contributor + * + * @return actual ID of the registry contributor */ public String getActualId() { return actualContributorId; @@ -106,19 +106,19 @@ public final class RegistryContributor implements IContributor { /** * Provides actual name of the registry contributor (e.g., "org.eclipe.core.runtime.fragment"). - * - * @return actual name of the registry contributor + * + * @return actual name of the registry contributor */ public String getActualName() { return actualContributorName; } /** - * Provides ID associated with the entity "in charge" of the contributor (e.g., "1"). IDs are expected - * to be unique in the workspace. If contributor does not rely on a host, this value should be + * Provides ID associated with the entity "in charge" of the contributor (e.g., "1"). IDs are expected + * to be unique in the workspace. If contributor does not rely on a host, this value should be * the same as the actual contributor ID. - * - * @return id of the registry contributor + * + * @return id of the registry contributor */ public String getId() { return hostId; @@ -127,8 +127,8 @@ public final class RegistryContributor implements IContributor { /** * Provides name of the entity "in charge" of the contributor (e.g., "org.eclipse.core.runtime"). * If contributor does not rely on a host, this value should be the same as the actual contributor name. - * - * @return name of the registry contributor + * + * @return name of the registry contributor */ @Override public String getName() { diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java index 1c5bd0fa4..0f55de6f8 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java @@ -4,7 +4,7 @@ * 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 *******************************************************************************/ @@ -19,7 +19,7 @@ import org.eclipse.osgi.util.NLS; /** * This is the basic registry strategy. It describes how the registry does logging, - * message translation, extra start/stop processing, event scheduling, caching, + * message translation, extra start/stop processing, event scheduling, caching, * and debugging. * <p> * In this strategy: @@ -31,7 +31,7 @@ import org.eclipse.osgi.util.NLS; * </ul></p><p> * This class can be used without OSGi running. * </p><p> - * This class can be overridden and/or instantiated by clients. + * This class can be overridden and/or instantiated by clients. * </p> * @since org.eclipse.equinox.registry 3.2 */ @@ -50,18 +50,18 @@ public class RegistryStrategy { private final boolean[] cacheReadOnly; /** - * Constructor for this default registry strategy. + * Constructor for this default registry strategy. * <p> - * The strategy sequentially checks the array of storage directories to + * The strategy sequentially checks the array of storage directories to * discover the location of the registry cache formed by previous invocations of the extension - * registry. Once found, the location is used to store registry cache. If this value + * registry. Once found, the location is used to store registry cache. If this value * is <code>null</code> then caching of the registry content is disabled. * </p><p> - * The cache read-only array is an array the same length as the storage directory array. - * It contains boolean values indicating whether or not each storage directory is read-only. - * If the value at an index is <code>true</code> then the location at the corresponding index - * in the storage directories array is read-only; if <code>false</code> then the cache location - * is read-write. The array can be <code>null</code> if the <code>storageDirs</code> parameter + * The cache read-only array is an array the same length as the storage directory array. + * It contains boolean values indicating whether or not each storage directory is read-only. + * If the value at an index is <code>true</code> then the location at the corresponding index + * in the storage directories array is read-only; if <code>false</code> then the cache location + * is read-write. The array can be <code>null</code> if the <code>storageDirs</code> parameter * is <code>null</code>. * </p> * @@ -100,7 +100,7 @@ public class RegistryStrategy { * Returns the read-only status of the registry cache location. * * @param index the index of the possible registry location - * @return <code>true</code> if the location is read only and + * @return <code>true</code> if the location is read only and * <code>false</code> if the location is read/write */ public final boolean isCacheReadOnly(int index) { @@ -111,9 +111,9 @@ public class RegistryStrategy { /** * Override this method to provide customized logging functionality - * to the registry. The method adds a log entry based on the supplied status. + * to the registry. The method adds a log entry based on the supplied status. * <p> - * This method writes a message to <code>System.out</code> + * This method writes a message to <code>System.out</code> * in the following format: * <pre> * [Error|Warning|Log]: Main error message @@ -121,7 +121,7 @@ public class RegistryStrategy { * ... * [Error|Warning|Log]: Child error message N * </pre></p> - * + * * @param status the status to log */ public void log(IStatus status) { @@ -129,11 +129,11 @@ public class RegistryStrategy { } /** - * Translates key using the supplied resource bundle. The resource bundle is + * Translates key using the supplied resource bundle. The resource bundle is * optional and might be <code>null</code>. * <p> - * The default translation routine assumes that keys are prefixed with '%'. If - * no resource bundle is present, the key itself (without leading '%') is returned. + * The default translation routine assumes that keys are prefixed with '%'. If + * no resource bundle is present, the key itself (without leading '%') is returned. * There is no decoding for the leading '%%'. * </p> * @@ -146,31 +146,31 @@ public class RegistryStrategy { } /** - * Override this method to provide additional processing performed + * Override this method to provide additional processing performed * when the registry is created and started. Overrides should call * <code>super.onStart()</code> at the beginning of the processing. * <p> - * <strong>NOTE</strong>: Avoid placing duplicate functionality in - * this method and {@link #onStart(IExtensionRegistry, boolean)} as + * <strong>NOTE</strong>: Avoid placing duplicate functionality in + * this method and {@link #onStart(IExtensionRegistry, boolean)} as * both methods will be called on the registry startup. * </p> * @param registry the extension registry being started - * - * @deprecated use {@link #onStart(IExtensionRegistry, boolean)}. + * + * @deprecated use {@link #onStart(IExtensionRegistry, boolean)}. */ public void onStart(IExtensionRegistry registry) { // The default implementation } /** - * Override this method to provide additional processing performed + * Override this method to provide additional processing performed * when the registry is created and started. Overrides should call - * <code>super.onStart()</code> at the beginning of the processing. - * + * <code>super.onStart()</code> at the beginning of the processing. + * * @param registry the extension registry being started - * @param loadedFromCache true is registry contents was loaded from - * cache when the registry was created - * + * @param loadedFromCache true is registry contents was loaded from + * cache when the registry was created + * * @since 3.4 */ public void onStart(IExtensionRegistry registry, boolean loadedFromCache) { @@ -179,8 +179,8 @@ public class RegistryStrategy { /** * Override this method to provide additional processing to be performed - * just before the registry is stopped. Overrides should call - * <code>super.onStop()</code> at the end of the processing. + * just before the registry is stopped. Overrides should call + * <code>super.onStop()</code> at the end of the processing. * @param registry the extension registry being stopped */ public void onStop(IExtensionRegistry registry) { @@ -188,12 +188,12 @@ public class RegistryStrategy { } /** - * Creates an executable extension. Override this method to supply an alternative processing - * for the creation of executable extensions. + * Creates an executable extension. Override this method to supply an alternative processing + * for the creation of executable extensions. * <p> * This method receives the contributor of the executable extension and, possibly, * an optional contributor name if specified by the executable extension. The overridden - * contributor name might be <code>null</code>. + * contributor name might be <code>null</code>. * </p><p> * In this implementation registry attempts to instantiate the class specified via * the class name (must not be <code>null</code>) using standard Java reflection mechanism. @@ -228,12 +228,12 @@ public class RegistryStrategy { } /** - * Override this method to customize scheduling of an extension registry event. Note that this method + * Override this method to customize scheduling of an extension registry event. Note that this method * <strong>must</strong> make the following call to actually process the event: * <p><pre><code> * RegistryStrategy.processChangeEvent(listeners, deltas, registry); * </code></pre></p><p> - * In the default implementation, the method registry events are executed in a queue + * In the default implementation, the method registry events are executed in a queue * on a separate thread (i.e. asynchronously, sequentially). * </p> * @@ -246,10 +246,10 @@ public class RegistryStrategy { } /** - * This method performs actual processing of the registry change event. It should + * This method performs actual processing of the registry change event. It should * only be used by overrides of the RegistryStrategy.scheduleChangeEvent. It will * return <code>null</code> if an unexpected registry type was encountered. - * + * * @param listeners the list of active listeners; may not be <code>null</code> * @param deltas the extension registry deltas; may not be <code>null</code> * @param registry the extension registry; may not be <code>null</code> @@ -262,8 +262,8 @@ public class RegistryStrategy { } /** - * Override this method to specify debug requirements to the registry. In the default - * implementation this method returns <code>false</code> indicating that debug functionality + * Override this method to specify debug requirements to the registry. In the default + * implementation this method returns <code>false</code> indicating that debug functionality * is turned off. * <p> * Note that in a general case the extension registry plug-in doesn't depend on OSGI and @@ -278,7 +278,7 @@ public class RegistryStrategy { } /** - * Override this method to specify debug requirements for the registry event processing. + * Override this method to specify debug requirements for the registry event processing. * In the default implementation this method returns <code>false</code> indicating that * debug of the registry events is turned off. * <p> @@ -294,7 +294,7 @@ public class RegistryStrategy { } /** - * Specifies if the extension registry should use cache to store registry data between + * Specifies if the extension registry should use cache to store registry data between * invocations. * <p> * The default implementation enables caching returning <code>true</code>. @@ -307,7 +307,7 @@ public class RegistryStrategy { } /** - * Specifies if lazy cache loading is used. + * Specifies if lazy cache loading is used. * <p> * The default implementation specifies that lazy cache loading is going to be used * and therefore returns <code>true</code>. @@ -321,21 +321,21 @@ public class RegistryStrategy { /** * This method is called as a part of the registry cache validation. The cache is valid - * on the registry startup if the pair {container time stamp, contributors time stamp} + * on the registry startup if the pair {container time stamp, contributors time stamp} * supplied by the registry strategy is the same as the {container time stamp, contributors time stamp} * stored in the registry cache. The goal of the validation is to be able to catch modifications - * made to the original data contributed into the registry and not reflected in the registry cache. + * made to the original data contributed into the registry and not reflected in the registry cache. * <p> - * The method produces a number that corresponds to the current state of the data stored + * The method produces a number that corresponds to the current state of the data stored * by the container. Increment the stamp if the data stored in the container has been updated - * so that the data cached by the registry is no longer valid. For instance, in Eclipse addition - * or removal of a bundle results in the number returned by this method being incremented. As a result, - * if a bundle that contributed plugin.xml into the extension registry was modified, the state doesn't - * match the state stored in the registry cache. In this case the cache content becomes invalid and - * the registry needs to be re-created from the original data. + * so that the data cached by the registry is no longer valid. For instance, in Eclipse addition + * or removal of a bundle results in the number returned by this method being incremented. As a result, + * if a bundle that contributed plugin.xml into the extension registry was modified, the state doesn't + * match the state stored in the registry cache. In this case the cache content becomes invalid and + * the registry needs to be re-created from the original data. * </p><p> - * Generally, treat this number as a hash code for the data stored in the registry. - * It stays the same as long as the registry content is not changing. It becomes a different + * Generally, treat this number as a hash code for the data stored in the registry. + * It stays the same as long as the registry content is not changing. It becomes a different * number as the registry content gets modified. * </p><p> * Return 0 to indicate that state verification is not required. @@ -348,23 +348,23 @@ public class RegistryStrategy { } /** - * This method is called as a part of the registry cache validation. The method calculates - * a number describing the time when the originating contributions (i.e., plugin.xml files - * in case of the Eclipse registry) were last modified. + * This method is called as a part of the registry cache validation. The method calculates + * a number describing the time when the originating contributions (i.e., plugin.xml files + * in case of the Eclipse registry) were last modified. * <p> - * The value returned by the method is compared with the timestamp tracked by the registry. + * The value returned by the method is compared with the timestamp tracked by the registry. * If contributions changed since they have been added to the registry (i.e., plugin.xml * file was modified since the last run), the value of the {@link #getContributionsTimestamp()} - * will change and no longer will be the same as the value tracked by the registry. In this case + * will change and no longer will be the same as the value tracked by the registry. In this case * the cache is considered to be invalid and the registry is going to be re-populated form scratch. * </p><p> * (The word "timestamp" is used very loosely here. In this context, "timestamp" is more likely - * to be a hash value aggregating a number of actual timestamps from the contributions.) + * to be a hash value aggregating a number of actual timestamps from the contributions.) * </p><p> - * This method may return 0 to indicate that no time stamp verification is required. + * This method may return 0 to indicate that no time stamp verification is required. * </p> * @return a value corresponding to the last modification time of contributions contained - * in the registry + * in the registry */ public long getContributionsTimestamp() { return 0; @@ -373,8 +373,8 @@ public class RegistryStrategy { /** * Returns the parser used by the registry to parse descriptions of extension points and extensions. * This method must not return <code>null</code>. - * - * @return this strategy's parser + * + * @return this strategy's parser * @see org.eclipse.core.runtime.IExtensionRegistry#addContribution(java.io.InputStream, IContributor, boolean, String, ResourceBundle, Object) */ public SAXParserFactory getXMLParser() { @@ -386,10 +386,10 @@ public class RegistryStrategy { /** * Translates array of keys supplied by the contributor to the requested locale. * <p> - * This method is intended to be overridden by specialized registry strategies - * that know translation conventions for the contributors, for instance, + * This method is intended to be overridden by specialized registry strategies + * that know translation conventions for the contributors, for instance, * the agreed upon locations of the translated keys for bundle contributors. - * The base implementation simply returns the array of non-translated keys. + * The base implementation simply returns the array of non-translated keys. * </p><p> * This method is only used if multi-language support is enabled. * </p> @@ -405,17 +405,17 @@ public class RegistryStrategy { } /** - * Returns the current locale for the extension registry with enabled + * Returns the current locale for the extension registry with enabled * multi-language support. * <p> - * The default implementation assumes that there is a single system wide + * The default implementation assumes that there is a single system wide * locale, equivalent to {@link Locale#getDefault()}. * </p><p> - * The result of this method should not be retained or passed to other threads. + * The result of this method should not be retained or passed to other threads. * The current locale can change any time and may be different for each thread. * </p><p> - * This method can be overridden by subclasses that wish to provide a way - * to change the default locale. + * This method can be overridden by subclasses that wish to provide a way + * to change the default locale. * </p><p> * This method is only used if multi-language support is enabled. * </p> |