Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2020-02-11 15:05:28 +0000
committerLars Vogel2020-02-11 15:05:28 +0000
commita383508baf7f4cdcc5ea5644488c518b69e244bb (patch)
tree31ed209e25e569dd48dab143caca6bb88cd0dc03
parentb079e9b7dc3b908c3542465b8a2372f1c003bb94 (diff)
downloadrt.equinox.p2-a383508baf7f4cdcc5ea5644488c518b69e244bb.tar.gz
rt.equinox.p2-a383508baf7f4cdcc5ea5644488c518b69e244bb.tar.xz
rt.equinox.p2-a383508baf7f4cdcc5ea5644488c518b69e244bb.zip
Change-Id: I39867212cb3a8f13714d3c1edb0f8e07bd5f8252 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java10
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java2
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/simpleconfigurator/manipulator/SimpleConfiguratorManipulator.java14
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/provisional/configurator/Configurator.java36
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/Activator.java24
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java8
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java10
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ConfiguratorCommandProvider.java6
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/BundleInfo.java2
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/EquinoxUtils.java2
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorConstants.java16
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java12
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/URIUtil.java6
-rw-r--r--bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/Utils.java4
14 files changed, 76 insertions, 76 deletions
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java
index e69d6f71b..9ae44275f 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorImpl.java
@@ -5,15 +5,15 @@
* and is available at https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
- *
+ *
* Ericsson AB (Pascal Rapicault) - Bug 397216 -[Shared] Better shared
* configuration change discovery
- *
+ *
* Red Hat, Inc (Krzysztof Daniel) - Bug 421935: Extend simpleconfigurator to
* read .info files from many locations
- *
+ *
*******************************************************************************/
package org.eclipse.equinox.internal.simpleconfigurator.manipulator;
@@ -57,7 +57,7 @@ public class SimpleConfiguratorManipulatorImpl implements SimpleConfiguratorMani
/**
* Return the ConfiguratorConfigFile which is determined by the parameters set
* in Manipulator.
- *
+ *
* @param manipulator
* @return File
*/
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java
index f258560cb..144787417 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.equinox.internal.simpleconfigurator.manipulator;
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/simpleconfigurator/manipulator/SimpleConfiguratorManipulator.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/simpleconfigurator/manipulator/SimpleConfiguratorManipulator.java
index 87de0616f..b8bc1a165 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/simpleconfigurator/manipulator/SimpleConfiguratorManipulator.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/simpleconfigurator/manipulator/SimpleConfiguratorManipulator.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -40,7 +40,7 @@ public interface SimpleConfiguratorManipulator {
public static final String SOURCE_INFO = new String("source.info"); //$NON-NLS-1$
/**
- * An instance of an ISimpleConfiguratorManipulator is registered as a ConfiguratorManipulator
+ * An instance of an ISimpleConfiguratorManipulator is registered as a ConfiguratorManipulator
* service with ConfiguratorManipulator.SERVICE_PROP_KEY_CONFIGURATOR_BUNDLESYMBOLICNAME =
* SERVICE_PROP_VALUE_CONFIGURATOR_SYMBOLICNAME.
*/
@@ -49,7 +49,7 @@ public interface SimpleConfiguratorManipulator {
/**
* Load the configuration file for the currently running system.
* <p>
- * Pass null for bundleInfoPath to read the bundle configuration file for the running system as
+ * Pass null for bundleInfoPath to read the bundle configuration file for the running system as
* specified by the "org.eclipse.equinox.simpleconfigurator.configUrl" system property.
* </p>
* <p>If bundleInfoPath == {@link #SOURCE_INFO} the default source configuration file for the running
@@ -66,7 +66,7 @@ public interface SimpleConfiguratorManipulator {
/**
* Load the configuration from the given input stream
* The supplied input stream is consumed by this method and will be closed.
- *
+ *
* @param configuration - the input stream to read the configuration from. The stream will be closed even if an exception is thrown
* @param installArea - Relative URIs from the configuration file will be resolved relative to here
* @return The loaded configuration. Bundles will have at least symbolic name, version and location information.
@@ -78,7 +78,7 @@ public interface SimpleConfiguratorManipulator {
* Save the configuration to the given output stream
* The output stream is flushed and left open.
* To be persisted, bundles are required to have at least a symbolic name, version and location.
- *
+ *
* @param configuration - bundle information to save
* @param outputStream - the output stream to write to. Stream is not closed
* @param installArea - bundle locations are written as relative to this URI
@@ -89,11 +89,11 @@ public interface SimpleConfiguratorManipulator {
/**
* Save the configuration to the specified file
* To be persisted, bundles are required to have at least a symbolic name, version and location.
- *
+ *
* @param configuration - bundle information to save
* @param configurationFile - file to save the configuration in
* @param installArea - bundle locations are written as relative to this URI
- *
+ *
* @throws IOException
*/
public void saveConfiguration(BundleInfo[] configuration, File configurationFile, URI installArea) throws IOException;
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/provisional/configurator/Configurator.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/provisional/configurator/Configurator.java
index b7f497d73..a083707de 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/provisional/configurator/Configurator.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/provisional/configurator/Configurator.java
@@ -19,52 +19,52 @@ import java.net.URL;
/**
* The implementation of this interface will be registered into a service registry
* by a Configurator Bundle.
- *
+ *
* The client bundle can apply configuration which can be interpreted by referring
- * the specified location to the current running OSGi environment. In addition,
- * the client can expect bundle state in advance .
- *
+ * the specified location to the current running OSGi environment. In addition,
+ * the client can expect bundle state in advance .
+ *
* TODO: this interface might not be required to be defined.
- *
- *
+ *
+ *
* **********************************************
- * Current Definition of Configurator Bundle:
- *
+ * Current Definition of Configurator Bundle:
+ *
* Configurator Bundle will do the following operation at its startup.
- *
+ *
* 1. Create a Configurator object.
* 2. Register it as a service to the service registry.
* 3. Get where to read for knowing what kinds of bundles in its implementation dependent way.
* 4. Call {@link Configurator#applyConfiguration(URL)} with the URL.
- *
+ *
* At its stopping, the service registered will be unregistered.
- *
+ *
* see org.eclipse.equinox.internal.provisional.configuratormanipulato.ConfiguratorManipulator
*
*/
public interface Configurator {
/**
- * Apply configuration read from the specified url to the OSGi
+ * Apply configuration read from the specified url to the OSGi
* environment currently running.
- *
+ *
* @param url URL to be read.
- * @throws IOException - If reading information from the specified url fails.
+ * @throws IOException - If reading information from the specified url fails.
*/
void applyConfiguration(URL url) throws IOException;
/**
- * Apply configuration read from the previously used url to the OSGi
+ * Apply configuration read from the previously used url to the OSGi
* environment currently running. If it is never used, do nothing.
- *
- * @throws IOException - If reading information from the specified url fails.
+ *
+ * @throws IOException - If reading information from the specified url fails.
*/
void applyConfiguration() throws IOException;
/**
* Return the url in use.
* If it is never used, return null.
- *
+ *
* @return URL
*/
URL getUrlInUse();
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/Activator.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/Activator.java
index 8832c3007..69c35058b 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/Activator.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/Activator.java
@@ -24,32 +24,32 @@ import org.osgi.framework.*;
/**
* At its start, SimpleConfigurator bundle does the followings.
- *
- * 1. A value will be gotten by @{link BundleContext#getProperty(key)} with
+ *
+ * 1. A value will be gotten by @{link BundleContext#getProperty(key)} with
* {@link SimpleConfiguratorConstants#PROP_KEY_CONFIGURL} as a key.
- * The value will be used for the referal URL. Under the url, there must be a simple
+ * The value will be used for the referal URL. Under the url, there must be a simple
* bundles list file to be installed with thier start level and flag of marked as started.
- *
+ *
* 2. If the value is null, do nothing any more.
* 3. Otherwise, retrieve the bundles list from the url and install,
* set start level of and start bundles, as specified.
- *
- * 4. A value will be gotten by @{link BundleContext#getProperty(key)} with
+ *
+ * 4. A value will be gotten by @{link BundleContext#getProperty(key)} with
* {@link SimpleConfiguratorConstants#PROP_KEY_EXCLUSIVE_INSTALLATION} as a key.
- *
- * 5. If it equals "false", it will do exclusive installation, which means that
+ *
+ * 5. If it equals "false", it will do exclusive installation, which means that
* the bundles will not be listed in the specified url but installed at the time
- * of the method call except SystemBundle will be uninstalled.
+ * of the method call except SystemBundle will be uninstalled.
* Otherwise, no uninstallation will not be done.
- *
+ *
*/
public class Activator implements BundleActivator {
public final static boolean DEBUG = false;
/**
- * If this property is set to true, simpleconfigurator will attempt to read
+ * If this property is set to true, simpleconfigurator will attempt to read
* multiple *.info files.
- *
+ *
* This field is writable only for test purposes.
*/
public static String EXTENSIONS = System.getProperty("p2.fragments");
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java
index f66da5081..24eb1a3fd 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/ConfigApplier.java
@@ -7,8 +7,8 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
+ *
+ * Contributors:
* IBM Corporation - initial API and implementation
* Red Hat, Inc (Krzysztof Daniel) - Bug 421935: Extend simpleconfigurator to
* read .info files from many locations, Bug 460967
@@ -445,8 +445,8 @@ class ConfigApplier {
}
/**
- * Uninstall bundles which are not listed on finalList.
- *
+ * Uninstall bundles which are not listed on finalList.
+ *
* @param finalList bundles list not to be uninstalled.
* @param packageAdmin package admin service.
* @return Collection HashSet of bundles finally installed.
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
index 292de22d2..4994ab718 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/SimpleConfiguratorImpl.java
@@ -7,12 +7,12 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Ericsson AB (Pascal Rapicault) - Bug 397216 -[Shared] Better shared configuration change discovery
* Red Hat, Inc (Krzysztof Daniel) - Bug 421935: Extend simpleconfigurator to
- * read .info files from many locations
+ * read .info files from many locations
*******************************************************************************/
package org.eclipse.equinox.internal.simpleconfigurator;
@@ -29,9 +29,9 @@ import org.osgi.framework.BundleContext;
* SimpleConfigurator provides ways to install bundles listed in a file
* accessible by the specified URL and expect states for it in advance without
* actual application.
- *
+ *
* In every methods of SimpleConfiguration object,
- *
+ *
* 1. A value will be gotten by @{link BundleContext#getProperty(key) with
* {@link SimpleConfiguratorConstants#PROP_KEY_EXCLUSIVE_INSTALLATION} as a key.
* 2. If it equals "true", it will do exclusive installation, which means that
@@ -115,7 +115,7 @@ public class SimpleConfiguratorImpl implements Configurator {
/**
* This method is public for testing purposes only.
* @param relativeURL - a relative URL of the configuration
- * @param configURL - an array of parent config URLs to which relativeURL can be appended.
+ * @param configURL - an array of parent config URLs to which relativeURL can be appended.
*/
public URL chooseConfigurationURL(URL relativeURL, URL[] configURL) throws MalformedURLException {
if (configURL != null) {
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ConfiguratorCommandProvider.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ConfiguratorCommandProvider.java
index a6763deac..a674e2288 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ConfiguratorCommandProvider.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/console/ConfiguratorCommandProvider.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -44,7 +44,7 @@ public class ConfiguratorCommandProvider implements CommandProvider {
/**
* Apply the current configuration
- * @param interpreter
+ * @param interpreter
*/
public void _confapply(CommandInterpreter interpreter) {
String parameter = interpreter.nextArgument();
@@ -57,7 +57,7 @@ public class ConfiguratorCommandProvider 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.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/BundleInfo.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/BundleInfo.java
index c5a7499e6..2c9e3201e 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/BundleInfo.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/BundleInfo.java
@@ -8,7 +8,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
package org.eclipse.equinox.internal.simpleconfigurator.utils;
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/EquinoxUtils.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/EquinoxUtils.java
index 7524a22e0..6fb494cee 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/EquinoxUtils.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/EquinoxUtils.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
package org.eclipse.equinox.internal.simpleconfigurator.utils;
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorConstants.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorConstants.java
index bc5a3fb4c..99ebd58f6 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorConstants.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorConstants.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -15,20 +15,20 @@ package org.eclipse.equinox.internal.simpleconfigurator.utils;
public class SimpleConfiguratorConstants {
/**
- * If BundleContext#getProperty(PROP_KEY_EXCLUSIVE_INSTALLATION) equals "true" ignoring case,
- * Configurator.applyConfiguration(url) will uninstall the installed bundles which are not
+ * If BundleContext#getProperty(PROP_KEY_EXCLUSIVE_INSTALLATION) equals "true" ignoring case,
+ * Configurator.applyConfiguration(url) will uninstall the installed bundles which are not
* listed in the simpleconfigurator config file after install bundles listed.
- * Otherwise, it never uninstall any bundles.
- *
+ * Otherwise, it never uninstall any bundles.
+ *
* Default: true
*/
public static final String PROP_KEY_EXCLUSIVE_INSTALLATION = "org.eclipse.equinox.simpleconfigurator.exclusiveInstallation"; //$NON-NLS-1$
/**
- * If BundleContext#getProperty(PROP_KEY_USE_REFERENCE) does not equal "false" ignoring case,
+ * If BundleContext#getProperty(PROP_KEY_USE_REFERENCE) does not equal "false" ignoring case,
* when a SimpleConfigurator installs a bundle, "reference:" is added to its bundle location in order to avoid
* caching its bundle jar. Otherwise, it will add nothing to any bundle location.
- *
+ *
* Default: true
*/
public static final String PROP_KEY_USE_REFERENCE = "org.eclipse.equinox.simpleconfigurator.useReference"; //$NON-NLS-1$
@@ -37,7 +37,7 @@ public class SimpleConfiguratorConstants {
* BundleContext#getProperty(PROP_KEY_CONFIGURL) is used for SimpleConfigurator to do life cycle control of bundles.
* The file specified by the returned url is read by SimpleConfigurator and do life cycle control according to it.
* If improper value or null is returned, SimpleConfigurator doesn't do it.
- *
+ *
* Default: null
*/
public static final String PROP_KEY_CONFIGURL = "org.eclipse.equinox.simpleconfigurator.configUrl"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
index 41a0af248..3fdde1880 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/SimpleConfiguratorUtils.java
@@ -7,8 +7,8 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
+ *
+ * Contributors:
* IBM Corporation - initial API and implementation
* Red Hat, Inc (Krzysztof Daniel) - Bug 421935: Extend simpleconfigurator to
* read .info files from many locations
@@ -200,8 +200,8 @@ public class SimpleConfiguratorUtils {
/**
* Read the configuration from the given InputStream
- *
- * @param stream - the stream is always closed
+ *
+ * @param stream - the stream is always closed
* @param base
* @return List of {@link BundleInfo}
* @throws IOException
@@ -234,9 +234,9 @@ public class SimpleConfiguratorUtils {
}
/*
- * We expect the first line of the bundles.info to be
+ * We expect the first line of the bundles.info to be
* #encoding=UTF-8
- * if it isn't, then it is an older bundles.info and should be
+ * if it isn't, then it is an older bundles.info and should be
* read with the default encoding
*/
private static String determineEncoding(BufferedInputStream stream) {
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/URIUtil.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/URIUtil.java
index e7c945452..43ac01db5 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/URIUtil.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/URIUtil.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.equinox.internal.simpleconfigurator.utils;
@@ -180,8 +180,8 @@ public class URIUtil {
/**
* Returns a URI as a URL.
- *
- * @throws MalformedURLException
+ *
+ * @throws MalformedURLException
*/
public static URL toURL(URI uri) throws MalformedURLException {
return new URL(uri.toString());
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/Utils.java b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/Utils.java
index c925546bf..0ca249a43 100644
--- a/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/Utils.java
+++ b/bundles/org.eclipse.equinox.simpleconfigurator/src/org/eclipse/equinox/internal/simpleconfigurator/utils/Utils.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors: IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.equinox.internal.simpleconfigurator.utils;
@@ -21,7 +21,7 @@ import java.util.List;
/*
* This class was copied from org.eclipse.equinox.internal.frameworkadmin.utils
* package of org.eclipse.equinox.frameworkadmin plugin on March 3 2007.
- *
+ *
* The reason why it was copied is to make simpleconfigurator dependent on any
* bundles(org.eclipse.equinox.framework).
*/

Back to the top