diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF index bee0aa8803..5df6b28dc4 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.artifact.repository;singleton:=true -Bundle-Version: 1.5.400.qualifier +Bundle-Version: 1.5.500.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.artifact.repository.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pgp/PGPSignatureVerifier.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pgp/PGPSignatureVerifier.java index 7808ef1c41..1a7ca8f1ad 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pgp/PGPSignatureVerifier.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/processors/pgp/PGPSignatureVerifier.java @@ -40,8 +40,7 @@ public final class PGPSignatureVerifier extends ProcessingStep { /** * ID of the registering - * org.eclipse.equinox.p2.artifact.repository.processingSteps - * extension. + * {@code org.eclipse.equinox.p2.artifact.repository.processingSteps} extension. */ public static final String ID = "org.eclipse.equinox.p2.processing.PGPSignatureCheck"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorSelector.java b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorSelector.java index b40c6bc423..5d707b8e72 100644 --- a/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorSelector.java +++ b/bundles/org.eclipse.equinox.p2.artifact.repository/src/org/eclipse/equinox/internal/p2/artifact/repository/MirrorSelector.java @@ -35,13 +35,13 @@ import org.xml.sax.SAXException; /** - * Mirror support class for repositories. This class implements - * mirror support equivalent to the mirroring of update manager sites. A repository - * optionally provides a mirror URL via the {@link IRepository#PROP_MIRRORS_URL} key. - * The contents of the file at this URL is expected to be an XML document - * containing a list of elements. The mirrors are assumed to be already - * sorted geographically with closer mirrors first. - *

+ * Mirror support class for repositories. This class implements mirror support + * equivalent to the mirroring of update manager sites. A repository optionally + * provides a mirror URL via the {@link IRepository#PROP_MIRRORS_URL} key. The + * contents of the file at this URL is expected to be an XML document containing + * a list of <mirror> elements. The mirrors are assumed to be already + * sorted geographically with closer mirrors first.
+ *
* Always use {@link MirrorSelector.MirrorInfoComparator} for comparison. */ public class MirrorSelector { diff --git a/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF index 67dd3441b0..5121d8b54c 100644 --- a/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.console/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.console;singleton:=true -Bundle-Version: 1.3.400.qualifier +Bundle-Version: 1.3.500.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.console.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java index e7d823fdfc..d4b008cfd9 100644 --- a/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java +++ b/bundles/org.eclipse.equinox.p2.console/src/org/eclipse/equinox/internal/p2/console/ProvCommandProvider.java @@ -263,8 +263,8 @@ public void _provliu(CommandInterpreter interpreter) { /** * Lists the installable units that match the given URL and query. A third * boolean argument can be provided where true means "full - * query" and false means "e;match query"e;. The - * default is false. + * query" and false means "match query". The default + * is false. */ public void _provlquery(CommandInterpreter interpreter) { String urlString = processArgument(interpreter.nextArgument()); @@ -546,7 +546,7 @@ public void _provlgp(CommandInterpreter interpreter) { * Lists the installable units that match the given profile id and query. The id * can be "this" to denote the self profile. A third boolean argument * can be provided where true means "full query" and - * false means "e;match query"e;. The default is + * false means "match query". The default is * false. */ public void _provlpquery(CommandInterpreter interpreter) { diff --git a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF index 857f7b4938..5798396c45 100644 --- a/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.core;singleton:=true -Bundle-Version: 2.12.100.qualifier +Bundle-Version: 2.12.200.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.core.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/OrderedProperties.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/OrderedProperties.java index d68425fd2f..0632b46837 100644 --- a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/OrderedProperties.java +++ b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/helpers/OrderedProperties.java @@ -55,14 +55,13 @@ public OrderedProperties(Map properties) { /** * Set the property value. *

- * If a property with the key already exists, the previous - * value is replaced. Otherwise a new property is added at - * the end collection. + * If a property with the key already exists, the previous value is replaced. + * Otherwise a new property is added at the end collection. * * @param key must not be null * @param value must not be null - * @return previous value associated with specified key, or null - * if there was no mapping for key. + * @return previous value associated with specified key, or {@code null} if + * there was no mapping for key. */ public Object setProperty(String key, String value) { init(); diff --git a/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF index 9d97c1e2e8..6df495cdc0 100644 --- a/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.director.app/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.director.app;singleton:=true -Bundle-Version: 1.3.400.qualifier +Bundle-Version: 1.3.500.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.director.app.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/ILog.java b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/ILog.java index c434681c7b..febc7a13dc 100644 --- a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/ILog.java +++ b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/ILog.java @@ -29,7 +29,8 @@ public interface ILog { /** * - * @deprecated Use {@link ILog#printOut()} or {@link ILog#printErr()} + * @deprecated Use {@link ILog#printOut(String)} or + * {@link ILog#printErr(String)} */ @Deprecated default void log(String message) { @@ -37,7 +38,7 @@ default void log(String message) { } /** - * Notify that logging is completed & cleanup resources + * Notify that logging is completed & cleanup resources */ void close(); diff --git a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF index 5f537d3ee1..2b6cbfc96e 100644 --- a/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.director/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.director;singleton:=true -Bundle-Version: 2.6.400.qualifier +Bundle-Version: 2.6.500.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.director.DirectorActivator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/PlannerStatus.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/PlannerStatus.java index ff00f323dc..716ea87ba0 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/PlannerStatus.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/provisional/p2/director/PlannerStatus.java @@ -59,18 +59,23 @@ public Map getRequestChanges() { } /** - * Returns a map of side-effects that will occur as a result of the plan being executed. - * Side-effects of an install may include: + *

+ * Returns a map of side-effects that will occur as a result of the plan being + * executed. Side-effects of an install may include: + *

*
    - *
  • Optional software being installed that will become satisfied once the plan - * is executed.
    • - *
  • Optional software currently in the profile that will be uninstalled as a result - * of the plan being executed. This occurs when the optional software has dependencies - * that are incompatible with the software being installed. - * This includes additional software that will be installed as a result of the change, - * or optional changes and their corresponding explanation. - * @return A map of {@link IInstallableUnit} to {@link IStatus} of the additional side effect - * status, or null if there are no side effects. + *
  • Optional software being installed that will become satisfied once the + * plan is executed.
    • + *
  • Optional software currently in the profile that will be uninstalled as a + * result of the plan being executed. This occurs when the optional software has + * dependencies that are incompatible with the software being installed. This + * includes additional software that will be installed as a result of the + * change, or optional changes and their corresponding explanation.
    • + *
+ * + * @return A map of {@link IInstallableUnit} to {@link IStatus} of the + * additional side effect status, or null if there are no + * side effects. */ public Map getRequestSideEffects() { return requestSideEffects; diff --git a/bundles/org.eclipse.equinox.p2.discovery.compatibility/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.discovery.compatibility/META-INF/MANIFEST.MF index 4b8655b932..46e7c93948 100644 --- a/bundles/org.eclipse.equinox.p2.discovery.compatibility/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.discovery.compatibility/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.equinox.p2.discovery.compatibility;singleton:=true -Bundle-Version: 1.3.400.qualifier +Bundle-Version: 1.3.500.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0", diff --git a/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/ConnectorDiscoveryExtensionReader.java b/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/ConnectorDiscoveryExtensionReader.java index 207bdb3a89..2b8ace603c 100644 --- a/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/ConnectorDiscoveryExtensionReader.java +++ b/bundles/org.eclipse.equinox.p2.discovery.compatibility/src/org/eclipse/equinox/internal/p2/discovery/compatibility/ConnectorDiscoveryExtensionReader.java @@ -19,7 +19,7 @@ /** * Connector Discovery extension point reader, for extension points of type - * org.eclipse.mylyn.discovery.core.connectorDiscovery + * {@code org.eclipse.mylyn.discovery.core.connectorDiscovery} * * @author David Green */ diff --git a/bundles/org.eclipse.equinox.p2.discovery/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.discovery/META-INF/MANIFEST.MF index a20e478112..e0e2f51390 100644 --- a/bundles/org.eclipse.equinox.p2.discovery/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.discovery/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.equinox.p2.discovery;singleton:=true -Bundle-Version: 1.3.300.qualifier +Bundle-Version: 1.3.400.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0", diff --git a/bundles/org.eclipse.equinox.p2.discovery/src/org/eclipse/equinox/internal/p2/discovery/model/CatalogItem.java b/bundles/org.eclipse.equinox.p2.discovery/src/org/eclipse/equinox/internal/p2/discovery/model/CatalogItem.java index fcf84b2dca..4594f6c0c7 100644 --- a/bundles/org.eclipse.equinox.p2.discovery/src/org/eclipse/equinox/internal/p2/discovery/model/CatalogItem.java +++ b/bundles/org.eclipse.equinox.p2.discovery/src/org/eclipse/equinox/internal/p2/discovery/model/CatalogItem.java @@ -108,8 +108,7 @@ public boolean isSelected() { /** * support selection * - * @param selected - * true if the item is selected, otherwise false + * @param selected true if the item is selected, otherwise false */ public void setSelected(boolean selected) { this.selected = selected; @@ -127,8 +126,8 @@ public Boolean getAvailable() { /** * indicate if this connector is available * - * @param available - * true if available, false if not, or null if availability is unknown + * @param available true if available, false if not, or null if availability is + * unknown */ public void setAvailable(Boolean available) { if (available != this.available || (available != null && !available.equals(this.available))) { @@ -155,8 +154,8 @@ public void removePropertyChangeListener(String propertyName, PropertyChangeList } /** - * the name of the connector including the name of the organization that produces the repository if appropriate, for - * example 'Mozilla Bugzilla'. + * the name of the connector including the name of the organization that + * produces the repository if appropriate, for example 'Mozilla Bugzilla'. */ public String getName() { return name; @@ -178,7 +177,8 @@ public void setProvider(String provider) { } /** - * The short name of the license, for example 'EPL 1.0', 'GPL 2.0', or 'Commercial'. + * The short name of the license, for example 'EPL 1.0', 'GPL 2.0', or + * 'Commercial'. */ public String getLicense() { return license; @@ -189,10 +189,9 @@ public void setLicense(String license) { } /** - * A description of the connector. Plug-ins should provide a description, especially if the description is not - * self-evident from the @name and - * - * @organization. + * A description of the connector. Plug-ins should provide a description, + * especially if the description is not self-evident from the @name and + * organization. */ public String getDescription() { return description; @@ -244,7 +243,7 @@ public void setCertificationId(String certificationId) { } /** - * E.g., "(& (osgi.os=macosx) (osgi.ws=carbon))" + * E.g., "(& (osgi.os=macosx) (osgi.ws=carbon))" */ public String getPlatformFilter() { return platformFilter; diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/phases/AuthorityChecker.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/phases/AuthorityChecker.java index 118e041419..d38db701b0 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/phases/AuthorityChecker.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/phases/AuthorityChecker.java @@ -281,31 +281,36 @@ public static void gatherCertificates(Map> authorities, I } /** + *

* Returns a list of URIs representing the hierarchical chain, starting from the * root authority, to the given location. The location will always be present as * the last element in the list. The first element represents the root * authority. + *

* *
    - *
  • file:/C:/folder/file
    • + *
  • file:/C:/folder/file *
      *
    • file:/
      • *
    • file:/C:/
      • *
    • file:/C:/folder/
      • *
    - *
  • https://host/folder/file
    • + * + *
  • https://host/folder/file *
      *
    • https://host
      • *
    • https://host/folder/
      • *
    • https://host/folder/file
      • *
    - *
  • jar:https://host/folder/file.jar!/path
    • + * + *
  • jar:https://host/folder/file.jar!/path *
      *
    • https://host
      • *
    • https://host/folder/
      • *
    • https://host/folder/file.jar
      • *
    • jar:https://host/folder/file.jar!/path
      • *
    + *
    • *
* * @param location an arbitrary location. diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/phases/CheckTrust.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/phases/CheckTrust.java index 87384eba06..29e5cf759e 100644 --- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/phases/CheckTrust.java +++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/phases/CheckTrust.java @@ -35,9 +35,8 @@ public class CheckTrust extends InstallableUnitPhase { /** * Parameter used to populate/get artifacts to check trust. The value for this - * property is Map<IArtifactDescriptor, File>. - * - * @see org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.CheckTrustAction + * property is Map<IArtifactDescriptor, File>. It is used by + * {@code see org.eclipse.equinox.internal.p2.touchpoint.eclipse.actions.CheckTrustAction}. */ public static final String PARM_ARTIFACTS = "artifacts"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.garbagecollector/META-INF/MANIFEST.MF index ce2a796cf3..f7d053d9d5 100644 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.garbagecollector/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.garbagecollector;singleton:=true -Bundle-Version: 1.3.300.qualifier +Bundle-Version: 1.3.400.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.equinox.internal.p2.garbagecollector;x-friends:="org.eclipse.equinox.p2.touchpoint.eclipse,org.eclipse.pde.core,org.eclipse.equinox.p2.ui.sdk.scheduler" diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/MarkSetProvider.java b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/MarkSetProvider.java index ee55e7ec4e..2f7af94538 100644 --- a/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/MarkSetProvider.java +++ b/bundles/org.eclipse.equinox.p2.garbagecollector/src/org/eclipse/equinox/internal/p2/garbagecollector/MarkSetProvider.java @@ -18,10 +18,11 @@ import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; /** - * Any class which declares itself as an extension to the org.eclipse.equinox.p2.garbagecollector.marksetproviders - * extension point must extend this base class. Given a Profile, implementors are required - * to provide an array of MarkSet objects, each of which must contain an IArtifactRepository - * and the IArtifactKeys used by the given Profile. + * Any class which declares itself as an extension to the + * {@code org.eclipse.equinox.p2.garbagecollector.marksetproviders} extension + * point must extend this base class. Given a Profile, implementors are required + * to provide an array of MarkSet objects, each of which must contain an + * IArtifactRepository and the IArtifactKeys used by the given Profile. */ public abstract class MarkSetProvider { diff --git a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF index 07c1cbaa1e..3a8e77111f 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.metadata/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.metadata;singleton:=true -Bundle-Version: 2.9.100.qualifier +Bundle-Version: 2.9.200.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.equinox.internal.p2.metadata; diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/TouchpointInstruction.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/TouchpointInstruction.java index 0b9b1dd290..325b8dba45 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/TouchpointInstruction.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/TouchpointInstruction.java @@ -26,30 +26,17 @@ *

* The format of a touchpoint instruction statement sequence is as follows: * - * statement-sequence : - * | statement ';' - * | statement-sequence statement - * ; + * statement-sequence : | statement ';' | statement-sequence statement ; * - *Where a statement is of the format: + * Where a statement is of the format: * - * statement : - * | actionName '(' parameters ')' - * ; + * statement : | actionName '(' parameters ')' ; * - * parameters : - * | // empty - * | parameter - * | parameters ',' parameter - * ; + * parameters : | // empty | parameter | parameters ',' parameter ; * - * parameter : - * | paramName ':' paramValue - * ; + * parameter : | paramName ':' paramValue ; * - * actionName, paramName, paramValue : - * | String - * ; + * actionName, paramName, paramValue : | String ; * * @noextend This class is not intended to be subclassed by clients. * @see MetadataFactory#createTouchpointInstruction(String, String) @@ -60,12 +47,13 @@ public class TouchpointInstruction implements ITouchpointInstruction { private final String importAttribute; /** - * Encodes an action statement in string form. This method will - * take care of escaping any illegal characters in function parameter values. + * Encodes an action statement in string form. This method will take care of + * escaping any illegal characters in function parameter values. * * @param actionName The name of the action. - * @param parameters The function's parameters. This is a Map - * where the keys are parameter names, and the values are parameter values + * @param parameters The function's parameters. This is a + * Map<String,String> where the keys are parameter names + * and the values are parameter values * @return An encoded touchpoint instruction statement */ public static String encodeAction(String actionName, Map parameters) { @@ -93,16 +81,16 @@ private static void appendEncoded(StringBuilder buf, String value) { char[] chars = value.toCharArray(); for (char c : chars) { switch (c) { - case '$' : - case ',' : - case ':' : - case ';' : - case '{' : - case '}' : - buf.append("${#").append(Integer.toString(c)).append('}'); //$NON-NLS-1$ - break; - default : - buf.append(c); + case '$': + case ',': + case ':': + case ';': + case '{': + case '}': + buf.append("${#").append(Integer.toString(c)).append('}'); //$NON-NLS-1$ + break; + default: + buf.append(c); } } } @@ -138,8 +126,8 @@ public boolean equals(Object obj) { } /** - * Returns the body of this touchpoint instruction. The body is either a sequence - * of instruction statements, or a simple string value. + * Returns the body of this touchpoint instruction. The body is either a + * sequence of instruction statements, or a simple string value. * * @return The body of this touchpoint instruction */ @@ -148,7 +136,7 @@ public String getBody() { return body; } - //TODO What is this? Please doc + // TODO What is this? Please doc @Override public String getImportAttribute() { return importAttribute; @@ -164,7 +152,8 @@ public int hashCode() { } /** - * Returns a string representation of this instruction for debugging purposes only. + * Returns a string representation of this instruction for debugging purposes + * only. */ @Override public String toString() { diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/Matches.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/Matches.java index bd804726b7..462003fa57 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/Matches.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/expression/Matches.java @@ -13,21 +13,54 @@ *******************************************************************************/ package org.eclipse.equinox.internal.p2.metadata.expression; -import java.util.*; -import org.eclipse.equinox.p2.metadata.*; -import org.eclipse.equinox.p2.metadata.expression.*; +import java.util.Dictionary; +import java.util.Hashtable; +import java.util.Locale; +import java.util.Map; +import org.eclipse.equinox.p2.metadata.IInstallableUnit; +import org.eclipse.equinox.p2.metadata.IRequirement; +import org.eclipse.equinox.p2.metadata.IUpdateDescriptor; +import org.eclipse.equinox.p2.metadata.Version; +import org.eclipse.equinox.p2.metadata.VersionRange; +import org.eclipse.equinox.p2.metadata.expression.IEvaluationContext; +import org.eclipse.equinox.p2.metadata.expression.IMatchExpression; +import org.eclipse.equinox.p2.metadata.expression.SimplePattern; import org.osgi.framework.Filter; /** - *

A class that performs "matching" The actual algorithm used for - * performing the match varies depending on the types of the items to match.

- *

The following things can be matched:

- * - * - * - * - * - * + *

+ * A class that performs "matching" The actual algorithm used for + * performing the match varies depending on the types of the items to match. + *

+ *

+ * The following things can be matched: + *

+ *
LHSRHSImplemented as
{@link String}{@link SimplePattern}rhs.isMatch(lhs)
{@link String}{@link LDAPApproximation}rhs.isMatch(lhs)
<any>{@link Class}rhs.isInstance(lhs)
{@link Class}{@link Class}rhs.isAssignableFrom(lhs)
+ * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * + * *
LHSRHSImplemented as
{@link String}{@link SimplePattern}rhs.isMatch(lhs)
{@link String}{@link LDAPApproximation}rhs.isMatch(lhs)
<any>{@link Class}rhs.isInstance(lhs)
{@link Class}{@link Class}rhs.isAssignableFrom(lhs)
*/ public class Matches extends Binary { @@ -40,7 +73,7 @@ public Object evaluate(IEvaluationContext context) { return Boolean.valueOf(match(lhs.evaluate(context), rhs.evaluate(context))); } - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({ "unchecked", "rawtypes" }) protected boolean match(Object lval, Object rval) { if (lval == null || rval == null) return false; @@ -64,9 +97,11 @@ protected boolean match(Object lval, Object rval) { return ((LDAPFilter) rval).isMatch(MemberProvider.create(lval, true)); } else if (rval instanceof Filter) { if (lval instanceof IInstallableUnit) - return Boolean.valueOf(((Filter) rval).match(new Hashtable<>(((IInstallableUnit) lval).getProperties()))); + return Boolean + .valueOf(((Filter) rval).match(new Hashtable<>(((IInstallableUnit) lval).getProperties()))); // TODO Below we use raw types for simplicity; - // we could convert to Dictionary but that is work and the filter impl + // we could convert to Dictionary but that is work and the filter + // impl // must still handle (and ignore) non String keys. if (lval instanceof Dictionary) return Boolean.valueOf(((Filter) rval).match((Dictionary) lval)); @@ -90,7 +125,8 @@ protected boolean match(Object lval, Object rval) { Class rclass = (Class) rval; return lval instanceof Class ? rclass.isAssignableFrom((Class) lval) : rclass.isInstance(lval); } - throw new IllegalArgumentException("Cannot match a " + lval.getClass().getName() + " with a " + rval.getClass().getName()); //$NON-NLS-1$//$NON-NLS-2$ + throw new IllegalArgumentException( + "Cannot match a " + lval.getClass().getName() + " with a " + rval.getClass().getName()); //$NON-NLS-1$//$NON-NLS-2$ } @Override @@ -148,7 +184,8 @@ private static boolean matchLocaleVariants(Locale rval, String lval) { int countryStart = uscore + 1; uscore = lval.indexOf('_', countryStart); return uscore < 0 ? equals(lval, rval.getCountry(), countryStart, lval.length()) // - : equals(lval, rval.getCountry(), countryStart, uscore) && equals(lval, rval.getVariant(), uscore + 1, lval.length()); + : equals(lval, rval.getCountry(), countryStart, uscore) + && equals(lval, rval.getVariant(), uscore + 1, lval.length()); } } diff --git a/bundles/org.eclipse.equinox.p2.publisher/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.publisher/META-INF/MANIFEST.MF index 5b7a6b2056..38852aede3 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.publisher/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.equinox.p2.publisher;singleton:=true -Bundle-Version: 1.9.200.qualifier +Bundle-Version: 1.9.300.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.publisher.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileAdvice.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileAdvice.java index 8591240e2d..f3b64625cb 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileAdvice.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileAdvice.java @@ -52,17 +52,22 @@ public class AdviceFileAdvice extends AbstractAdvice implements ITouchpointAdvic private boolean containsAdvice = false; /** - * Creates advice for an advice file at the given location. If basePath - * is a directory, then adviceFilePath is appended to this location to - * obtain the location of the advice file. If basePath is a file, then - * adviceFilePath is used to - * @param id The symbolic id of the installable unit this advice applies to - * @param version The version of the installable unit this advice applies to - * @param basePath The root location of the the advice file. This is either the location of - * the jar containing the advice, or a directory containing the advice file - * @param adviceFilePath The location of the advice file within the base path. This is - * either the path of a jar entry, or the path of the advice file within the directory - * specified by the base path. + * Creates advice for an advice file at the given location. If {@code basePath} + * is a directory, then {@code adviceFilePath} is appended to this location to + * obtain the location of the advice file. If {@code basePath} is a file, then + * {@code adviceFilePath} is used to + * + * @param id The symbolic id of the installable unit this advice + * applies to + * @param version The version of the installable unit this advice applies + * to + * @param basePath The root location of the the advice file. This is + * either the location of the jar containing the advice, + * or a directory containing the advice file + * @param adviceFilePath The location of the advice file within the base path. + * This is either the path of a jar entry, or the path of + * the advice file within the directory specified by the + * base path. */ public AdviceFileAdvice(String id, Version version, IPath basePath, IPath adviceFilePath) { Assert.isNotNull(id); diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF index b138ef16a8..9ed901bed9 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.repository.tools/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.equinox.p2.repository.tools;singleton:=true -Bundle-Version: 2.4.400.qualifier +Bundle-Version: 2.4.500.qualifier Bundle-Activator: org.eclipse.equinox.p2.internal.repository.tools.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/build.properties b/bundles/org.eclipse.equinox.p2.repository.tools/build.properties index 86332fb2c1..520a8920bb 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/build.properties +++ b/bundles/org.eclipse.equinox.p2.repository.tools/build.properties @@ -25,4 +25,5 @@ source.lib/repository-tools-ant.jar = src_ant/ output.lib/repository-tools-ant.jar = bin_ant/ jars.extra.classpath=platform:/plugin/org.apache.ant/lib/ant.jar,\ platform:/plugin/org.eclipse.equinox.p2.jarprocessor/lib/jarprocessor-ant.jar +pom.model.property.javadoc.excludePackageNames = org.eclipse.equinox.p2.internal.repository.tools.tasks src.includes = about.html diff --git a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF index 33481bec9b..4340b45fb2 100644 --- a/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.repository/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.repository;singleton:=true -Bundle-Version: 2.9.100.qualifier +Bundle-Version: 2.9.200.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.repository.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Transport.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Transport.java index 9f2e932f60..7a3b688819 100644 --- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Transport.java +++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/Transport.java @@ -189,18 +189,20 @@ public abstract long getLastModified(URI toDownload, IProgressMonitor monitor) * behavior: *

*
    - *
  • p2.httpRule
    • + *
  • p2.httpRule *
      *
    • redirect http:// -> https://
      • *
    • allow http:// -> http://
      • *
    • block http:// -> CoreException
      • *
    - *
  • p2.ftpRule
    • + * + *
  • p2.ftpRule *
      *
    • redirect ftp:// -> ftps://
      • *
    • allow ftp:// -> ftp://
      • *
    • block ftp:// -> CoreException
      • *
    + *
    • *
* * @param location an arbitrary location. diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/ChecksumHelper.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/ChecksumHelper.java index 825d5f34db..0a1840e8cc 100644 --- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/ChecksumHelper.java +++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/ChecksumHelper.java @@ -22,9 +22,13 @@ public class ChecksumHelper { public static final String MD5 = "md5"; //$NON-NLS-1$ /** - * @param property either {@link IArtifactDescriptor#ARTIFACT_CHECKSUM} or {@link IArtifactDescriptor#DOWNLOAD_CHECKSUM} - * @return (mutable) map of - * @throws IllegalArgumentException if checksum property neither {@link IArtifactDescriptor#ARTIFACT_CHECKSUM} nor {@link IArtifactDescriptor#DOWNLOAD_CHECKSUM} + * @param property either {@link IArtifactDescriptor#ARTIFACT_CHECKSUM} or + * {@link IArtifactDescriptor#DOWNLOAD_CHECKSUM} + * @return (mutable) map of <algorithm,checksum> + * @throws IllegalArgumentException if checksum property neither + * {@link IArtifactDescriptor#ARTIFACT_CHECKSUM} + * nor + * {@link IArtifactDescriptor#DOWNLOAD_CHECKSUM} */ static public Map getChecksums(IArtifactDescriptor descriptor, String property) throws IllegalArgumentException { if (!IArtifactDescriptor.ARTIFACT_CHECKSUM.equals(property) && !IArtifactDescriptor.DOWNLOAD_CHECKSUM.equals(property)) diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/ChecksumProducer.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/ChecksumProducer.java index fcd6e1f82e..5c460fd49e 100644 --- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/ChecksumProducer.java +++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/ChecksumProducer.java @@ -75,11 +75,11 @@ public static String computeMD5(File file) throws IOException { } /** - * @param file should not be null - * @param algorithm {@link java.security.MessageDigest#getInstance(String)} + * @param file should not be null + * @param algorithm {@link java.security.MessageDigest#getInstance(String)} * @param providerName {@link Provider#getName()} * @return checksum of the file - * @see {@link java.security.MessageDigest#getInstance(String, Provider)} + * @see java.security.MessageDigest#getInstance(String, Provider) */ public static String produce(File file, String algorithm, String providerName) throws IOException, NoSuchAlgorithmException, NoSuchProviderException { MessageDigest messageDigest = getMessageDigest(algorithm, providerName); diff --git a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/LocationProperties.java b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/LocationProperties.java index 3c5e2971ed..c5c58e4612 100644 --- a/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/LocationProperties.java +++ b/bundles/org.eclipse.equinox.p2.repository/src/org/eclipse/equinox/internal/p2/repository/helpers/LocationProperties.java @@ -1,4 +1,4 @@ -/******************************************************************************* +/******************************************************************************* * Copyright (c) 2010, 2015 EclipseSource and others. * * This @@ -24,21 +24,28 @@ import org.eclipse.equinox.p2.metadata.Version; /** - * A representation of Location Properties. Location properties are specified at a repository - * location in an index.p2 file as a series of properties. To create this object, use the - * {@link LocationProperties#create(InputStream)} method. This method is guaranteed never to - * return null, however, if the location properties file does not exist, or it cannot be read, - * or it is improperly formated, isValid will return {@link LocationProperties#exists()} will - * return false. - * - * Version 1 specifies the following 2 properties - * version=1 <-- Required - * metadata.repository.factory.order = <-- Optional - * artifact.repository.factory.order = <-- Optional - * md5.hash. = <-- Optional - * - * Where repository.factory.order is a comma separated list of strings + *

+ * A representation of Location Properties. Location properties are specified at + * a repository location in an index.p2 file as a series of properties. To + * create this object, use the {@link LocationProperties#create(InputStream)} + * method. This method is guaranteed never to return null, however, if the + * location properties file does not exist, or it cannot be read, or it is + * improperly formated, isValid will return {@link LocationProperties#exists()} + * will return false. + *

+ *

+ * Version 1 specifies the following properties + *

+ *
    + *
  • version=1 <-- Required
    • + *
  • metadata.repository.factory.order = <-- Optional
    • + *
  • artifact.repository.factory.order = <-- Optional
    • + *
  • md5.hash.<factoryID> = <-- Optional
    • + *
+ *

+ * Where repository.factory.order is a comma separated list of strings * representing repository suffix filters. + *

*/ public class LocationProperties { @@ -63,7 +70,7 @@ public static LocationProperties createEmptyIndexFile() { * Creates a LocationProperties Object from an input stream. If the LocationProperties * could be created, it is returned. If it could not be created, an empty LocationProperties * object is returned. To check if the location properties file exists, call {@link LocationProperties#exists()}; - * + * * @param stream The input stream from which to read the properties from * @return LocationPropreties if the stream represents a valid set of Location Properties */ @@ -104,7 +111,7 @@ private LocationProperties() { } /** - * Returns true if the location properties exist, could be read, and conforms to a proper version. + * Returns true if the location properties exist, could be read, and conforms to a proper version. * Returns false otherwise. */ public boolean exists() { @@ -112,9 +119,9 @@ public boolean exists() { } /** - * Returns the Version of the location properties file. This method is guaranteed + * Returns the Version of the location properties file. This method is guaranteed * to return a value for all location property files >= to Version 1.0 - * + * * @return The Version of this set of location properties */ public Version getVersion() { @@ -125,9 +132,9 @@ public Version getVersion() { * Returns the metadata FactoryID search order of location properties file. This method is * guaranteed to return a value for all location property files >= to Version 1.0 * For all other Versions, this method will return an empty string array - * + * * If {@link #END} is specified, then all other repositories should be ignored. - * + * * @return The Metadata FactoryID Search Order */ public String[] getMetadataFactorySearchOrder() { @@ -138,9 +145,9 @@ public String[] getMetadataFactorySearchOrder() { * Returns the artifact FactoryID search order of location properties file. This method is * guaranteed to return a value for all location property files >= to Version 1.0 * For all other Versions, this method will return an empty string array - * + * * If {@link #END} is specified, then all other repositories should be ignored. - * + * * @return The Artifact FactoryID Search Order */ public String[] getArtifactFactorySearchOrder() { @@ -183,7 +190,7 @@ private boolean initVersion1(Properties properties) { } /** - * @param key + * @param key */ private void initHashMD5Hash(String key, String value) { // Empty for now diff --git a/bundles/org.eclipse.equinox.p2.tests.discovery/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests.discovery/META-INF/MANIFEST.MF index 4bbda9641b..0fceb63a83 100644 --- a/bundles/org.eclipse.equinox.p2.tests.discovery/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.tests.discovery/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.equinox.p2.tests.discovery;singleton:=true -Bundle-Version: 1.4.500.qualifier +Bundle-Version: 1.4.600.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Export-Package: org.eclipse.equinox.p2.discovery.tests;x-internal:=true, diff --git a/bundles/org.eclipse.equinox.p2.tests.discovery/src/org/eclipse/equinox/p2/discovery/tests/DiscoveryTestConstants.java b/bundles/org.eclipse.equinox.p2.tests.discovery/src/org/eclipse/equinox/p2/discovery/tests/DiscoveryTestConstants.java index 30550b7859..a3ddebe532 100644 --- a/bundles/org.eclipse.equinox.p2.tests.discovery/src/org/eclipse/equinox/p2/discovery/tests/DiscoveryTestConstants.java +++ b/bundles/org.eclipse.equinox.p2.tests.discovery/src/org/eclipse/equinox/p2/discovery/tests/DiscoveryTestConstants.java @@ -20,10 +20,11 @@ public abstract class DiscoveryTestConstants { /** - * The URL of the mylyn discovery directory, may be overridden using the system property - * mylyn.discovery.directory. + * The URL of the mylyn discovery directory, may be overridden using the system + * property {@code mylyn.discovery.directory}. */ - public static final String DISCOVERY_URL = System.getProperty("mylyn.discovery.directory", "http://www.eclipse.org/mylyn/discovery/directory-3.3.xml"); //$NON-NLS-1$ //$NON-NLS-2$ + public static final String DISCOVERY_URL = System.getProperty("mylyn.discovery.directory", //$NON-NLS-1$ + "http://www.eclipse.org/mylyn/discovery/directory-3.3.xml"); //$NON-NLS-1$ private DiscoveryTestConstants() { // don't allow clients to instantiate diff --git a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF index 821849c95b..0be133d9be 100644 --- a/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.tests;singleton:=true -Bundle-Version: 1.9.500.qualifier +Bundle-Version: 1.9.600.qualifier Bundle-Activator: org.eclipse.equinox.p2.tests.TestActivator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.tests/pom.xml b/bundles/org.eclipse.equinox.p2.tests/pom.xml index 02cd5a5a61..75f485d7a4 100644 --- a/bundles/org.eclipse.equinox.p2.tests/pom.xml +++ b/bundles/org.eclipse.equinox.p2.tests/pom.xml @@ -15,7 +15,7 @@ org.eclipse.equinox.p2.tests - 1.9.500-SNAPSHOT + 1.9.600-SNAPSHOT eclipse-test-plugin diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestAgentProvider.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestAgentProvider.java index cc12d18dad..7503e62f7d 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestAgentProvider.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestAgentProvider.java @@ -26,7 +26,7 @@ /** * Provides {@link IProvisioningAgent} instances for tests. Use as JUnit 4 - * {@link Rule}. + * {@code Rule}. */ public final class TestAgentProvider extends ExternalResource { private final TemporaryFolder tempManager; @@ -51,7 +51,7 @@ protected void after() { /** * Returns an instance of an {@link IProvisioningAgent}. If this class is used - * as a JUnit method {@link Rule}, a separate instance is returned per test + * as a JUnit method {@code Rule}, a separate instance is returned per test * method. */ public IProvisioningAgent getAgent() throws ProvisionException { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestData.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestData.java index 65aecefc01..eee659772e 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestData.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/TestData.java @@ -144,11 +144,13 @@ public static void assertEquals(ZipInputStream expected, ZipInputStream actual) } /** - * Asserts that the file bytes in fileList are contained in input2 - * by matching the entry name with the root's path + fileList path. + * Asserts that the file bytes in fileList are contained in + * input2 by matching the entry name with the root's path + + * fileList path. * - * @param fileMap a map of files to verify in input2 keyed by relative paths - * i.e. Map + * @param fileMap a map of files to verify in input2 keyed by + * relative paths i.e., + * {@code Map} */ public static void assertContains(Map fileMap, ZipInputStream input2, boolean compareContent) throws IOException { Map jar2 = getEntries(input2); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java index 877159e627..fd028bc316 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactRepositoryManagerTest.java @@ -181,7 +181,8 @@ public void testPathWithSpaces() { } /** - * Tests for {@link IMetadataRepositoryManager#refreshRepository(URI, org.eclipse.core.runtime.IProgressMonitor)}. + * Tests for + * {@link org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager#refreshRepository(URI, org.eclipse.core.runtime.IProgressMonitor)}. */ public void testRefresh() throws ProvisionException { File site = getTestData("Repositoy", "/testData/artifactRepo/simple/"); @@ -276,7 +277,7 @@ public void testBasicAddRemove() { } /** - * Tests for {@link IRepositoryManager#contains(URI). + * Tests for {@link IRepositoryManager#contains(URI)}. */ public void testContains() { File site = getTestData("Repositoy", "/testData/artifactRepo/simple/"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/ContextQuery.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/ContextQuery.java index 316de26964..72c2c48532 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/ContextQuery.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/ContextQuery.java @@ -20,22 +20,29 @@ import org.eclipse.equinox.p2.query.IQueryResult; /** + *

* ContextQuery is the abstract superclass for Queries that require the entire - * input to evaluate the results. Queries must consider the group of elements before - * processing the results.

+ * input to evaluate the results. Queries must consider the group of elements + * before processing the results. + *

* + *

* ContextQueries must also be transitive. That is, if run on a subset of the * input, the order in which they are executed must not matter. If there is the * need for a non-transitive query, please see: * https://bugs.eclipse.org/bugs/show_bug.cgi?id=261403 + *

+ *

+ * Users of this query must call {@link #perform(Iterator)} to compute the + * results. + *

*

- * Users of this query must call {@link #perform(Iterator)} to compute - * the results.

* This class may be subclassed by clients. Subclasses should specify the type * of object they support querying on. Subclasses are also encouraged to clearly - * specify their match algorithm, and expose the parameters involved in the match - * computation, to allow {@link IQueryable} implementations to optimize their - * execution of the query.

+ * specify their match algorithm, and expose the parameters involved in the + * match computation, to allow {@link org.eclipse.equinox.p2.query.IQueryable} + * implementations to optimize their execution of the query. + *

* * @since 2.0 */ diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/QueryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/QueryTest.java index 0c56b9510f..71a1adde7b 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/QueryTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/QueryTest.java @@ -24,7 +24,7 @@ import org.junit.Test; /** - * Tests for the {@link org.eclipse.equinox.p2.query.Query} class. + * Tests for the {@link org.eclipse.equinox.p2.query.IQuery} class. */ @SuppressWarnings("deprecation") // MatchQuery public class QueryTest { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/FormatArrayTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/FormatArrayTest.java index b66f6a2dc2..0c9430edb0 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/FormatArrayTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/FormatArrayTest.java @@ -22,7 +22,7 @@ import org.junit.Test; /** - * Tests format(<>) - arrays. + * Tests format(<>) - arrays. */ public class FormatArrayTest { @Test diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/FormatQTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/FormatQTest.java index 1275e53bc8..8bfa59997e 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/FormatQTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/FormatQTest.java @@ -26,9 +26,9 @@ * where the quote is determined by the first character of the string segment. * The quote must be a non alphanumeric character, and the string must be * delimited by the same character except brackets and parenthesises (i.e. (), - * {}, [], <>) which are handled as pairs, thus 'q' matches "" and - * produces a single string segment with the text 'andrea-doria'. A non-quoted - * sequence of characters are not matched by 'q'. + * {}, [], <>) which are handled as pairs, thus 'q' matches + * "<andrea-doria>" and produces a single string segment with the text + * 'andrea-doria'. A non-quoted sequence of characters are not matched by 'q'. */ public class FormatQTest { @Test diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/RawVersionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/RawVersionTest.java index 329bfb3661..30aa1d7030 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/RawVersionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/RawVersionTest.java @@ -708,7 +708,8 @@ public void testNestedPadtoString() { } /** - * Tests that: 1p-M < 1.0.0 < 1.0.0p0 == 1p0 < 1.1 < 1.1.1 < 1p1 == 1.1p1 < 1pM + * Tests that: + * {@code 1p-M < 1.0.0 < 1.0.0p0 == 1p0 < 1.1 < 1.1.1 < 1p1 == 1.1p1 < 1pM} */ @Test public void testPadOrder() { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/VersionTesting.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/VersionTesting.java index 734f3c6ce2..f2884de430 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/VersionTesting.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/omniVersion/VersionTesting.java @@ -48,8 +48,7 @@ public void assertNotIncludedInRange(String message, VersionRange range, String } /** - * A strict assertion of order. - * asserts that b > a, a < b, a !=b, b != a + * A strict assertion of order. asserts that b > a, a < b, a !=b, b != a */ public static void assertOrder(Object a, Object b) { if (!(a instanceof Comparable && b instanceof Comparable)) diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java index 658056d8ca..a2d3cb137f 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileAdviceTest.java @@ -187,7 +187,8 @@ public void testGetProductFile() { } /** - * Test method for {@link org.eclipse.equinox.p2.publisher.eclipse.ProductFileAdvice#getIcons(java.lang.String)}. + * Test method for + * {@link org.eclipse.equinox.p2.publisher.eclipse.ProductFileAdvice#getIcons()}. */ public void testGetIcons() { String[] icons = productFileAdviceWin32.getIcons(); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileTest.java index 0f95b4e89b..a46cebec09 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductFileTest.java @@ -82,7 +82,8 @@ public void testGetLocation() { } /** - * Test method for {@link org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile#getProperties()}. + * Test method for + * {@link org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile#getConfigProperties()}. */ @Test public void testGetConfigurationProperties() { @@ -96,7 +97,7 @@ public void testGetConfigurationProperties() { /** * Test method for - * {@link org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile#getBundles(boolean)}. + * {@link org.eclipse.equinox.internal.p2.publisher.eclipse.ProductFile#getBundles()}. */ @Test public void testGetBundles() { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/AbstractTestServerClientCase.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/AbstractTestServerClientCase.java index 48f980d129..eb3a52eefe 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/AbstractTestServerClientCase.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/testserver/helper/AbstractTestServerClientCase.java @@ -41,7 +41,8 @@ public void run(TestResult result) { } /** - * Returns a URL string part consisting of http://localhost: + * Returns a URL string part consisting of http://localhost:<port> + * * @return String with first part of URL */ public String getBaseURL() { diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF index 0b6a023d68..8d24ec3281 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.touchpoint.natives;singleton:=true -Bundle-Version: 1.5.300.qualifier +Bundle-Version: 1.5.400.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.touchpoint.natives.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/SimpleBackupStore.java b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/SimpleBackupStore.java index b78096e20d..9814f3f52b 100644 --- a/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/SimpleBackupStore.java +++ b/bundles/org.eclipse.equinox.p2.touchpoint.natives/src/org/eclipse/equinox/internal/p2/touchpoint/natives/SimpleBackupStore.java @@ -730,7 +730,7 @@ private void restoreInPlaceBackups(Map unrestorable) { * E.g. \\Host\C$\file becomes __\Host\C$\file /users/test/file becomes * _/users/test/file C:/file becomes C/file * - * @param file a source file that needs to be backed up + * @param path a source file that needs to be backed up * * @return a file to which the original content can be backed up */ @@ -800,7 +800,7 @@ protected Path toSourcePath(Path buPath) { * * Exposed for testing purposes. * - * @param path + * @param path the path to back up * * @return a path next to the original where the original will be moved, rather * than will be moved @@ -816,7 +816,7 @@ protected Path toInPlaceBackupPath(Path path) { * * Exposed for testing purposes. * - * @param path + * @param buPath the backup path * * @return a source path */ diff --git a/bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF index b98000a11e..6eb2807ee4 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.updatesite/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.updatesite;singleton:=true -Bundle-Version: 1.3.400.qualifier +Bundle-Version: 1.3.500.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.updatesite.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/CategoryPublisherApplication.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/CategoryPublisherApplication.java index 519a6ef148..7678e96a35 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/CategoryPublisherApplication.java +++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/CategoryPublisherApplication.java @@ -27,7 +27,7 @@ *

* This application categorizes the elements in a repo based on a category * definition file. The category definition file is specified with - * -categoryDefinition + * <source>-categoryDefinition</source>. *

*/ public class CategoryPublisherApplication extends AbstractPublisherApplication { diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java index 5c22b58608..7323592c88 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java +++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/SiteXMLAction.java @@ -422,7 +422,7 @@ protected VersionRange createVersionRange(String versionId) { * Computes the mapping of features to categories as defined in the site.xml, if * available. Returns an empty map if there is not site.xml, or no categories. * - * @return A map of SiteFeature -> Set. + * @return A map of {@code SiteFeature -> Set}. */ protected Map> getFeatureToCategoryMappings(IPublisherInfo publisherInfo) { HashMap> mappings = new HashMap<>(); @@ -454,7 +454,7 @@ protected Map> getFeatureToCategoryMappings(IPubl * Computes the mapping of bundles to categories as defined in the site.xml, if * available. Returns an empty map if there is not site.xml, or no categories. * - * @return A map of SiteBundle -> Set. + * @return A map of {@code SiteBundle -> Set}. */ protected Map> getBundleToCategoryMappings(IPublisherInfo publisherInfo) { HashMap> mappings = new HashMap<>(); @@ -745,7 +745,7 @@ private String buildCategoryId(String categoryName) { } protected Transport getTransport(IPublisherInfo publisherInfo) { - IRepository repo = publisherInfo.getMetadataRepository(); + IRepository repo = publisherInfo.getMetadataRepository(); if (repo == null) repo = publisherInfo.getArtifactRepository(); if (repo == null) diff --git a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/UpdateSitePublisherApplication.java b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/UpdateSitePublisherApplication.java index 71bd40d71f..afd73f1a62 100644 --- a/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/UpdateSitePublisherApplication.java +++ b/bundles/org.eclipse.equinox.p2.updatesite/src/org/eclipse/equinox/internal/p2/updatesite/UpdateSitePublisherApplication.java @@ -22,8 +22,8 @@ /** *

* This application generates meta-data/artifact repositories from a local - * update site. The -source parameter must specify the top-level - * directory containing the update site. + * update site. The -source <localdir> parameter must specify the + * top-level directory containing the update site. *

*/ public class UpdateSitePublisherApplication extends AbstractPublisherApplication { diff --git a/features/org.eclipse.equinox.p2.discovery.feature/feature.xml b/features/org.eclipse.equinox.p2.discovery.feature/feature.xml index 96ecdfb306..bfa9ebe7a5 100644 --- a/features/org.eclipse.equinox.p2.discovery.feature/feature.xml +++ b/features/org.eclipse.equinox.p2.discovery.feature/feature.xml @@ -2,7 +2,7 @@