Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2020-02-11 15:03:38 +0000
committerLars Vogel2020-02-11 15:03:38 +0000
commit010c2043b85ac5b287862b1c50e851c9c244b832 (patch)
tree977cf73a294134932d4ccdd3099d5f7eb1a8d35d
parentb67804855dc279e7339057b5af83238cac7a4e12 (diff)
downloadrt.equinox.p2-010c2043b85ac5b287862b1c50e851c9c244b832.tar.gz
rt.equinox.p2-010c2043b85ac5b287862b1c50e851c9c244b832.tar.xz
rt.equinox.p2-010c2043b85ac5b287862b1c50e851c9c244b832.zip
Removes whitespace from frameworkadmin bundles
Change-Id: I7bb7c62ca64c078df44ff7a33b736ecd9f8f3307 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java16
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxConstants.java4
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwAdminImpl.java8
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxLauncherData.java2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/Log.java2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/FileUtils.java8
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/AbstractFwkAdminTest.java16
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/Activator.java4
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/AllTests.java6
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/Bug258370.java2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/FrameworkExtensionTest.java6
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/LauncherConfigLocationTest.java6
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/LauncherDataTest.java2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/MacOSLikeSetup.java2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/NoConfigurationValueInEclipseIni.java2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/OSGiVersionChange.java2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ParserUtilsTest.java14
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTest1.java2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTest3.java2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTestBug285935.java2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/TestRunningInstance.java2
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/TestVMArg.java4
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/UtilsTest.java2
24 files changed, 59 insertions, 59 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
index 65958ebeb..1dd81817b 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
@@ -316,7 +316,7 @@ public class EclipseLauncherParser {
//append jvm args
setJVMArgs(newlines, launcherData);
- // backup file if exists.
+ // backup file if exists.
if (backup)
if (launcherConfigFile.exists()) {
File dest = Utils.getSimpleDataFormattedFile(launcherConfigFile);
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java
index 68ecb28e3..0d602bb32 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java
@@ -50,7 +50,7 @@ public class EquinoxBundlesState implements BundlesState {
/**
* eclipse.exe will launch a fw where plugins/org.eclipse.osgi_*.*.*.*.jar is an
* implementation of fw.
- *
+ *
* @param launcherData
* @param configData
* @return File of fwJar to be used.
@@ -238,7 +238,7 @@ public class EquinoxBundlesState implements BundlesState {
/**
* If useFwPersistentData flag equals false, this constructor will not take a
* framework persistent data into account. Otherwise, it will.
- *
+ *
* @param context
* @param fwAdmin
* @param manipulator
@@ -260,7 +260,7 @@ public class EquinoxBundlesState implements BundlesState {
/**
* This constructor does NOT take a framework persistent data into account. It
* will create State object based on the specified platformProperties.
- *
+ *
* @param context
* @param fwAdmin
* @param manipulator
@@ -286,7 +286,7 @@ public class EquinoxBundlesState implements BundlesState {
/**
* compose new state without reading framework persistent data. The
* configData.getFwDependentProps() is used for the composition.
- *
+ *
* @param launcherData
* @param configData
* @param bInfos
@@ -299,7 +299,7 @@ public class EquinoxBundlesState implements BundlesState {
* compose new state without reading framework persistent data. The given
* properties is used for the composition. If system bundle is not included in
* the given bInfos, the fw jar launcherData contains will be used.
- *
+ *
* @param launcherData
* @param configData
* @param properties
@@ -317,7 +317,7 @@ public class EquinoxBundlesState implements BundlesState {
/**
* compose state. If it cannot compose it by somehow, false is returned.
- *
+ *
* @param bInfos
* @param props
* @param fwPersistentDataLocation
@@ -641,7 +641,7 @@ public class EquinoxBundlesState implements BundlesState {
/**
* get platforme properties from the given state.
- *
+ *
* @param state
*/
private void setPlatformProperties(State state) {
@@ -662,7 +662,7 @@ public class EquinoxBundlesState implements BundlesState {
/**
* set platfromProperties required to compose state object into
* platformProperties of this state.
- *
+ *
* @param props
*/
private void setPlatformPropertiesToState(Dictionary<Object, Object> props) {
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxConstants.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxConstants.java
index 09f4c9fab..601ac8bd8 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxConstants.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxConstants.java
@@ -16,7 +16,7 @@ package org.eclipse.equinox.internal.frameworkadmin.equinox;
public class EquinoxConstants {
/**
- * If BundleContext#getProperty(PROP_KEY_USE_REFERENCE) does not equal "false",
+ * If BundleContext#getProperty(PROP_KEY_USE_REFERENCE) does not equal "false",
* Manipulator#save() will add "reference:" to any bundle location specified osgi.bundles in order to avoid
* caching its bundle jar. Otherwise, it will add nothing to any bundle location.
*/
@@ -51,7 +51,7 @@ public class EquinoxConstants {
public static final String PROP_OSGI_FW = "osgi.framework"; //$NON-NLS-1$
public static final String PROP_OSGI_SYSPATH = "osgi.syspath"; //$NON-NLS-1$
public static final String PROP_LAUNCHER_NAME = "osgi.launcherIni"; //$NON-NLS-1$
- public static final String PROP_SHARED_CONFIGURATION_AREA = "osgi.sharedConfiguration.area"; //$NON-NLS-1$
+ public static final String PROP_SHARED_CONFIGURATION_AREA = "osgi.sharedConfiguration.area"; //$NON-NLS-1$
public static final String INI_EXTENSION = ".ini"; //$NON-NLS-1$
public static final String EXE_EXTENSION = ".exe"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwAdminImpl.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwAdminImpl.java
index 6362f6c5d..29e5ec29f 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwAdminImpl.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxFwAdminImpl.java
@@ -98,10 +98,10 @@ public class EquinoxFwAdminImpl implements FrameworkAdmin {
}
/**
- * If both the vendor and the Bundle-Version in the manifest match,
+ * If both the vendor and the Bundle-Version in the manifest match,
* return true. Otherwise false.
- *
- * @return flag true if the ManipulatorAdmin object can handle currently running fw launch.
+ *
+ * @return flag true if the ManipulatorAdmin object can handle currently running fw launch.
*/
boolean isRunningFw() {
//TODO implementation for Eclipse.exe and for Equinox
@@ -116,7 +116,7 @@ public class EquinoxFwAdminImpl implements FrameworkAdmin {
if (value > 0) {
return true;
}
- // TODO need to identify the version of eclipse.exe used for this launch, if used.
+ // TODO need to identify the version of eclipse.exe used for this launch, if used.
return false;
}
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxLauncherData.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxLauncherData.java
index 61ad927dc..b8e9c5b2a 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxLauncherData.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxLauncherData.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.frameworkadmin.equinox;
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/Log.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/Log.java
index 2bd81aa39..86da5dffc 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/Log.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/Log.java
@@ -19,7 +19,7 @@ import org.osgi.service.log.LogService;
import org.osgi.util.tracker.ServiceTracker;
/**
- * Utility class with static methods for logging to LogService, if available
+ * Utility class with static methods for logging to LogService, if available
*/
@SuppressWarnings({"rawtypes", "unchecked"})
public class Log {
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/FileUtils.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/FileUtils.java
index ae1764f90..1372b8b03 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/FileUtils.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/utils/FileUtils.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
* Pascal Rapicault - Support for bundled macosx http://bugs.eclipse.org/57349
@@ -108,10 +108,10 @@ public class FileUtils {
}
/**
- * If a bundle of the specified location is in the Eclipse plugin format (either plugin-name_version.jar
+ * If a bundle of the specified location is in the Eclipse plugin format (either plugin-name_version.jar
* or as a folder named plugin-name_version ), return version string.Otherwise, return null;
- *
- * @return version string. If invalid format, return null.
+ *
+ * @return version string. If invalid format, return null.
*/
private static Version getVersion(String version) {
if (version.length() == 0)
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/AbstractFwkAdminTest.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/AbstractFwkAdminTest.java
index 6bb86ff6b..cd726da8c 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/AbstractFwkAdminTest.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/AbstractFwkAdminTest.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
*******************************************************************************/
@@ -101,7 +101,7 @@ public abstract class AbstractFwkAdminTest {
protected File getTestFolder(String name) {
return getTestFolder(name, true);
}
-
+
protected File getTestFolder(String name, boolean clean) {
Location instanceLocation = Platform.getInstanceLocation();
URL url = instanceLocation != null ? instanceLocation.getURL() : null;
@@ -166,7 +166,7 @@ public abstract class AbstractFwkAdminTest {
private String getProperty(File file, String property) {
Properties p = new Properties();
try (FileInputStream fis = new FileInputStream(file)) {
- p.load(fis);
+ p.load(fis);
} catch (FileNotFoundException e) {
fail("Can't find file " + file);
} catch (IOException e) {
@@ -174,12 +174,12 @@ public abstract class AbstractFwkAdminTest {
}
return p.getProperty(property);
}
-
+
public void assertPropertyContains(File file, String property, String text) {
String value = getProperty(file, property);
if (value == null)
fail("property: " + property + " not found in: " +file);
-
+
int index = value.indexOf(text);
if (index == -1)
fail(text + " not found in property:" + property + " for file: " +file);
@@ -189,7 +189,7 @@ public abstract class AbstractFwkAdminTest {
String value = getProperty(file, property);
if (value == null)
return;
-
+
int index = value.indexOf(text);
if (index != -1)
fail(text + " found in property:" + property + " for file: " +file);
@@ -255,7 +255,7 @@ public abstract class AbstractFwkAdminTest {
}
return;
}
- try (InputStream input = new BufferedInputStream(new FileInputStream(source));
+ try (InputStream input = new BufferedInputStream(new FileInputStream(source));
OutputStream output = new BufferedOutputStream(new FileOutputStream(target))) {
byte[] buffer = new byte[8192];
@@ -305,7 +305,7 @@ public abstract class AbstractFwkAdminTest {
protected void writeEclipseIni(File location, String[] lines) {
location.getParentFile().mkdirs();
try (BufferedWriter bw = new BufferedWriter(new FileWriter(location))){
-
+
for (String line : lines) {
bw.write(line);
bw.newLine();
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/Activator.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/Activator.java
index ff24d5df4..bfe9b23fc 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/Activator.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/Activator.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
*******************************************************************************/
@@ -21,7 +21,7 @@ public class Activator implements BundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- ctx = context;
+ ctx = context;
}
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/AllTests.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/AllTests.java
index 4e1835651..715501feb 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/AllTests.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/AllTests.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
* Ericsson AB - ongoing development
@@ -21,8 +21,8 @@ import org.junit.runners.Suite;
/**
* Performs all automated director tests.
*/
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
Bug196525.class,
Bug258370.class,
CleanupTest.class,
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/Bug258370.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/Bug258370.java
index d4aa23ccf..e8edb8ca2 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/Bug258370.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/Bug258370.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
*******************************************************************************/
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/FrameworkExtensionTest.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/FrameworkExtensionTest.java
index d78e734db..27704419e 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/FrameworkExtensionTest.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/FrameworkExtensionTest.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
*******************************************************************************/
@@ -32,10 +32,10 @@ public class FrameworkExtensionTest extends FwkAdminAndSimpleConfiguratorTest {
assertContent(getBundleTxt(), "dummy.frameworkextension");
assertPropertyContains(getConfigIni(),"osgi.framework.extensions", "dummy.frameworkextension");
assertNotPropertyContains(getConfigIni(),"osgi.bundles", "dummy.frameworkextension");
-
+
BundleInfo basicBundleInfo = new BundleInfo("dummy.frameworkextension", "1.0.0", null, -1, false);
manipulator.getConfigData().removeBundle(basicBundleInfo);
- manipulator.save(false);
+ manipulator.save(false);
assertNotContent(getBundleTxt(), "dummy.frameworkextension");
assertNotPropertyContains(getConfigIni(),"osgi.framework.extensions", "dummy.frameworkextension");
}
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/LauncherConfigLocationTest.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/LauncherConfigLocationTest.java
index d1f50e5ea..6150ff74e 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/LauncherConfigLocationTest.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/LauncherConfigLocationTest.java
@@ -36,7 +36,7 @@ public class LauncherConfigLocationTest extends AbstractFwkAdminTest {
File installFolder = Activator.getContext().getDataFile(LauncherConfigLocationTest.class.getName());
if(installFolder.exists())
delete(installFolder);
-
+
File configurationFolder = new File(installFolder, "configuration");
String launcherName = "foo";
@@ -44,7 +44,7 @@ public class LauncherConfigLocationTest extends AbstractFwkAdminTest {
assertNotNull("Null launcher data" + launcherData, launcherData);
launcherData.setFwConfigLocation(configurationFolder);
launcherData.setLauncher(new File(installFolder, launcherName));
-
+
File defaultlaunchConfig = new File(installFolder, launcherName + ".ini");
assertFalse(defaultlaunchConfig.exists());
File launchConfig = new File(installFolder, "mylaunch.ini");
@@ -55,7 +55,7 @@ public class LauncherConfigLocationTest extends AbstractFwkAdminTest {
} catch (IllegalStateException e) {
//TODO We ignore the framework JAR location not set exception
}
-
+
BundleInfo osgiBi = new BundleInfo("org.eclipse.osgi", "3.3.1", URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/org.eclipse.osgi.jar"))), 0, true);
BundleInfo configuratorBi = new BundleInfo("org.eclipse.equinox.simpleconfigurator", "1.0.0", URIUtil.toURI(FileLocator.resolve(Activator.getContext().getBundle().getEntry("dataFile/org.eclipse.equinox.simpleconfigurator.jar"))), 1, true);
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/LauncherDataTest.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/LauncherDataTest.java
index e5803dbe1..e9d7ce225 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/LauncherDataTest.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/LauncherDataTest.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
*******************************************************************************/
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/MacOSLikeSetup.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/MacOSLikeSetup.java
index 84ef80367..883e39f04 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/MacOSLikeSetup.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/MacOSLikeSetup.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.frameworkadmin.tests;
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/NoConfigurationValueInEclipseIni.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/NoConfigurationValueInEclipseIni.java
index 5858e5777..601afd64d 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/NoConfigurationValueInEclipseIni.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/NoConfigurationValueInEclipseIni.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.frameworkadmin.tests;
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/OSGiVersionChange.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/OSGiVersionChange.java
index 3f0572e84..baae2ec43 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/OSGiVersionChange.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/OSGiVersionChange.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
*******************************************************************************/
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ParserUtilsTest.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ParserUtilsTest.java
index 9051d7aa4..b4b010e4a 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ParserUtilsTest.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ParserUtilsTest.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
*******************************************************************************/
@@ -31,7 +31,7 @@ public class ParserUtilsTest extends AbstractFwkAdminTest {
args.add("-foo");
args.add("bar");
assertEquals( "bar", ParserUtils.getValueForArgument("-foo", args));
-
+
args.set(1, "-bar");
assertEquals(null, ParserUtils.getValueForArgument("-foo", args));
}
@@ -40,11 +40,11 @@ public class ParserUtilsTest extends AbstractFwkAdminTest {
String [] args = new String [] { "-bar", "-foo", "-other"};
ParserUtils.removeArgument("-foo", Arrays.asList(args));
assertArrayEquals(args, new String [] {"-bar", null, "-other"});
-
+
args = new String [] { "-bar", "-foo", "other"};
ParserUtils.removeArgument("-foo", Arrays.asList(args));
assertArrayEquals(args, new String [] {"-bar", null, null});
-
+
args = new String [] { "-bar", "-foo", "s-pecial"};
ParserUtils.removeArgument("-foo", Arrays.asList(args));
assertArrayEquals(args, new String [] {"-bar", null, null});
@@ -56,7 +56,7 @@ public class ParserUtilsTest extends AbstractFwkAdminTest {
assertEquals(2, args.size());
assertEquals(args.get(0), "-foo");
assertEquals(args.get(1), "bar");
-
+
args.add("-other");
args.set(1, "s-pecial");
ParserUtils.setValueForArgument("-foo", "bas", args);
@@ -64,7 +64,7 @@ public class ParserUtilsTest extends AbstractFwkAdminTest {
assertEquals(args.get(0), "-foo");
assertEquals(args.get(1), "bas");
assertEquals(args.get(2), "-other");
-
+
args.remove(1);
ParserUtils.setValueForArgument("-foo", "bas", args);
assertEquals(3, args.size());
@@ -77,7 +77,7 @@ public class ParserUtilsTest extends AbstractFwkAdminTest {
String path = "";
File result =ParserUtils.fromOSGiJarToOSGiInstallArea(path);
assertNotNull("1.0", result);
-
+
path = "osgi.jar";
result =ParserUtils.fromOSGiJarToOSGiInstallArea(path);
assertNotNull("1.0", result);
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTest1.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTest1.java
index e1f14a814..11993944a 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTest1.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTest1.java
@@ -41,7 +41,7 @@ public class ReaderTest1 extends AbstractFwkAdminTest {
} catch (IllegalStateException e) {
//TODO We ignore the framework JAR location not set exception
}
- assertEquals(new File(installFolder, "conf"), manipulator.getLauncherData().getFwConfigLocation());
+ assertEquals(new File(installFolder, "conf"), manipulator.getLauncherData().getFwConfigLocation());
assertEquals("bar", manipulator.getConfigData().getProperty("foo"));
}
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTest3.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTest3.java
index d7268bb84..4a55e55b5 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTest3.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTest3.java
@@ -41,7 +41,7 @@ public class ReaderTest3 extends AbstractFwkAdminTest {
} catch (IllegalStateException e) {
//TODO We ignore the framework JAR location not set exception
}
- assertEquals(new File(installFolder, "configuration"), manipulator.getLauncherData().getFwConfigLocation());
+ assertEquals(new File(installFolder, "configuration"), manipulator.getLauncherData().getFwConfigLocation());
assertEquals("bar", manipulator.getConfigData().getProperty("foo"));
}
}
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTestBug285935.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTestBug285935.java
index e143edf32..416a56924 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTestBug285935.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/ReaderTestBug285935.java
@@ -41,7 +41,7 @@ public class ReaderTestBug285935 extends AbstractFwkAdminTest {
} catch (IllegalStateException e) {
//TODO We ignore the framework JAR location not set exception
}
- assertEquals(new File(installFolder, "conf"), manipulator.getLauncherData().getFwConfigLocation());
+ assertEquals(new File(installFolder, "conf"), manipulator.getLauncherData().getFwConfigLocation());
assertEquals("bar", manipulator.getConfigData().getProperty("foo"));
}
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/TestRunningInstance.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/TestRunningInstance.java
index 413856a63..7c80f8a40 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/TestRunningInstance.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/TestRunningInstance.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
*******************************************************************************/
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/TestVMArg.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/TestVMArg.java
index fb2e50d39..9ae0682a4 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/TestVMArg.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/TestVMArg.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
*******************************************************************************/
@@ -129,7 +129,7 @@ public class TestVMArg extends FwkAdminAndSimpleConfiguratorTest {
/**
* But 282303: Have -vm ../jre as program arguments. See them vanish during the
* save operation of the manipulator
- *
+ *
* @throws FrameworkAdminRuntimeException
* @throws IOException
*/
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/UtilsTest.java b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/UtilsTest.java
index 22684786d..f3defb56b 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/UtilsTest.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.test/src/org/eclipse/equinox/frameworkadmin/tests/UtilsTest.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
*******************************************************************************/

Back to the top