diff options
author | Paul Pazderski | 2019-05-18 14:07:38 +0000 |
---|---|---|
committer | Paul Pazderski | 2019-05-19 23:54:17 +0000 |
commit | de3c0c5ff08c928e6d1eb4fac2704bbb2d261669 (patch) | |
tree | de6e0a11c45731a312b5e239c22387afe93fe19c /tests/org.eclipse.compare.tests | |
parent | 5e9e26b1abe5bd1df37faa91fde2d87fd79ed06b (diff) | |
download | eclipse.platform.team-I20190531-1800.tar.gz eclipse.platform.team-I20190531-1800.tar.xz eclipse.platform.team-I20190531-1800.zip |
Bug 547304 - [cleanup] Fix wrong space/tab indentationS4_12_0_RC2S4_12_0_RC1aS4_12_0_RC1S4_12_0_M3R4_12I20190605-1800I20190605-0600I20190604-1800I20190604-0600I20190603-1800I20190603-0600I20190602-1800I20190602-0600I20190601-1800I20190531-1800I20190531-0245I20190529-2005I20190529-1800I20190529-0600I20190528-1800I20190528-0915I20190528-0850I20190528-0600I20190527-1805I20190527-0600I20190526-1800I20190526-0600I20190525-1800I20190525-0600I20190524-1800I20190524-0135I20190522-1800I20190522-0600I20190521-1800I20190521-0600I20190520-1805I20190520-0600R4_12_maintenance
This change fixes space or mixed tab/space indentations in all Java
files. This also includes two or three space indentations and even fix
most stray single spaces in indentations.
The change includes only whitespace formatting and no code changes.
Change-Id: I4149aaf4e48ccf7b49083f36d52e0c7a67433c7d
Diffstat (limited to 'tests/org.eclipse.compare.tests')
6 files changed, 19 insertions, 19 deletions
diff --git a/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF index a69a1a49e..672694446 100644 --- a/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare.tests;singleton:=true -Bundle-Version: 3.6.400.qualifier +Bundle-Version: 3.6.500.qualifier Require-Bundle: org.junit, org.eclipse.compare, org.eclipse.jface.text, diff --git a/tests/org.eclipse.compare.tests/pom.xml b/tests/org.eclipse.compare.tests/pom.xml index d9c81e34e..765a756a4 100644 --- a/tests/org.eclipse.compare.tests/pom.xml +++ b/tests/org.eclipse.compare.tests/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.compare</groupId> <artifactId>org.eclipse.compare.tests</artifactId> - <version>3.6.400-SNAPSHOT</version> + <version>3.6.500-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java index 60fbf1172..026e8e433 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java @@ -292,12 +292,12 @@ public class PatchTest extends TestCase { if (patchConf != null) { JarEntryStorage jes = new JarEntryStorage(entry,jarFile); Properties properties = new Properties(); - try { - properties.load(jes.getContents()); - } catch (IOException e) { - fail("IOException occured while loading the Patch Configuration file for "+entryName.toString()); - } - processProperties(result, properties, entryName); + try { + properties.load(jes.getContents()); + } catch (IOException e) { + fail("IOException occured while loading the Patch Configuration file for "+entryName.toString()); + } + processProperties(result, properties, entryName); } else { processProperties(result, defaultPatchProperties, entryName); } @@ -325,13 +325,13 @@ public class PatchTest extends TestCase { continue; if (pcFile.exists()) { Properties properties = new Properties(); - try { - properties.load(new FileInputStream(pcFile)); - } catch (IOException e) { - fail("IOException occured while loading the Patch Configuration file for " + try { + properties.load(new FileInputStream(pcFile)); + } catch (IOException e) { + fail("IOException occured while loading the Patch Configuration file for " + subfolder.toString()); - } - processProperties(result, properties, subfolder.getName()); + } + processProperties(result, properties, subfolder.getName()); } else { processProperties(result, defaultPatchProperties, subfolder.getName()); } diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/RangeDifferencerThreeWayDiffTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/RangeDifferencerThreeWayDiffTest.java index bbf28666f..59d990d75 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/RangeDifferencerThreeWayDiffTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/RangeDifferencerThreeWayDiffTest.java @@ -28,8 +28,8 @@ public class RangeDifferencerThreeWayDiffTest extends TestCase { static final String S= System.getProperty("line.separator"); //$NON-NLS-1$ public RangeDifferencerThreeWayDiffTest(String name) { - super(name); - } + super(name); + } public void testInsertConflict() { String a = "A" + S + "B" + S + "C" + S + "D"; //$NON-NLS-1$ diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java index 433857e3d..cb46514c6 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java @@ -101,7 +101,7 @@ public class WorkspaceTest extends ResourceTest { ensureExistsInWorkspace(result, true); for (int i = 0; i < result.length; i++) { if (result[i].getType() == IResource.FILE) // 3786 bytes is the average size of Eclipse Java files! - ((IFile) result[i]).setContents(getRandomContents(100), true, false, null); + ((IFile) result[i]).setContents(getRandomContents(100), true, false, null); } return result; } diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/performance/RangeDifferencerTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/performance/RangeDifferencerTest.java index 315601e8a..daa5bfa6d 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/performance/RangeDifferencerTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/performance/RangeDifferencerTest.java @@ -29,8 +29,8 @@ public class RangeDifferencerTest extends PerformanceTestCase { // static private final String EXPLANATION = "Performance decrease caused by changes in the compare framework, see bug 210688"; public RangeDifferencerTest(String name) { - super(name); - } + super(name); + } /* * Creates document with 5000 lines. |