Skip to content

Commit 60eedfa

Browse files
nburnwal09nburnwal09
authored
Merge branch 'eclipse-pde:master' into quickFix_Singleton
2 parents 97a6955 + 85e7255 commit 60eedfa

File tree

229 files changed

+12444
-916
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

229 files changed

+12444
-916
lines changed

‎apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/comparator/tests/EnumDeltaTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ public void test11() {
301301
assertEquals("Wrong element type", IDelta.ENUM_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
302302
assertTrue("Not compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
303303
}
304-
304+
305305
/**
306306
* Removed @noreference to a new enum constant
307307
*/
@@ -325,7 +325,7 @@ public void test12() {
325325
assertEquals("Wrong element type", IDelta.ENUM_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
326326
assertTrue("Not compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
327327
}
328-
328+
329329
/**
330330
* Decrease access for an enum type
331331
*/
@@ -349,7 +349,7 @@ public void test13() {
349349
assertEquals("Wrong element type", IDelta.ENUM_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
350350
assertTrue("Not compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
351351
}
352-
352+
353353
/**
354354
* Added deprecation
355355
*/
@@ -372,7 +372,7 @@ public void test14() {
372372
assertEquals("Wrong element type", IDelta.ENUM_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
373373
assertTrue("Not compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
374374
}
375-
375+
376376
/**
377377
* Removed deprecation
378378
*/

‎apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/comparator/tests/FieldDeltaTests.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,7 +1731,7 @@ public void test70() {
17311731
assertEquals("Wrong element type", IDelta.FIELD_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
17321732
assertFalse("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
17331733
}
1734-
1734+
17351735
/**
17361736
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=230189
17371737
*/
@@ -1761,7 +1761,7 @@ public void test71() {
17611761
assertEquals("Wrong element type", IDelta.INTERFACE_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
17621762
assertFalse("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
17631763
}
1764-
1764+
17651765
/**
17661766
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=230189
17671767
*/
@@ -1791,7 +1791,7 @@ public void test72() {
17911791
assertEquals("Wrong element type", IDelta.INTERFACE_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
17921792
assertFalse("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
17931793
}
1794-
1794+
17951795
/**
17961796
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=244994
17971797
*/
@@ -1815,7 +1815,7 @@ public void test73() {
18151815
assertEquals("Wrong element type", IDelta.FIELD_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
18161816
assertFalse("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
18171817
}
1818-
1818+
18191819
/**
18201820
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=244994
18211821
*/
@@ -1846,7 +1846,7 @@ public void test74() {
18461846
assertEquals("Wrong element type", IDelta.FIELD_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
18471847
assertTrue("Not compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
18481848
}
1849-
1849+
18501850
/**
18511851
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=244994
18521852
*/
@@ -1871,7 +1871,7 @@ public void test75() {
18711871
assertEquals("Wrong element type", IDelta.FIELD_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
18721872
assertTrue("Not compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
18731873
}
1874-
1874+
18751875
/**
18761876
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=277925
18771877
*/
@@ -1894,7 +1894,7 @@ public void test76() {
18941894
assertEquals("Wrong element type", IDelta.FIELD_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
18951895
assertTrue("Not compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
18961896
}
1897-
1897+
18981898
/**
18991899
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=277925
19001900
*/
@@ -1917,7 +1917,7 @@ public void test77() {
19171917
assertEquals("Wrong element type", IDelta.FIELD_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
19181918
assertTrue("Not compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
19191919
}
1920-
1920+
19211921
/**
19221922
* Check decrease field visibility - public to private
19231923
*/
@@ -1940,7 +1940,7 @@ public void test8() {
19401940
assertEquals("Wrong element type", IDelta.FIELD_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
19411941
assertFalse("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
19421942
}
1943-
1943+
19441944
/**
19451945
* Check increase field visibility - protected to public
19461946
*/

‎apitools/org.eclipse.pde.api.tools.tests/src/org/eclipse/pde/api/tools/comparator/tests/MethodDeltaTests.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2707,7 +2707,7 @@ public void test112() {
27072707
assertEquals("Wrong element type", IDelta.METHOD_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
27082708
assertTrue("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
27092709
}
2710-
2710+
27112711
/**
27122712
* Changed Map to Map<String, String>
27132713
*/
@@ -2730,7 +2730,7 @@ public void test113() {
27302730
assertEquals("Wrong element type", IDelta.CONSTRUCTOR_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
27312731
assertTrue("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
27322732
}
2733-
2733+
27342734
/**
27352735
* Add type parameters (constructor)
27362736
*/
@@ -2753,7 +2753,7 @@ public void test114() {
27532753
assertEquals("Wrong element type", IDelta.CONSTRUCTOR_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
27542754
assertTrue("Not compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
27552755
}
2756-
2756+
27572757
/**
27582758
* Add checked exception (constructor)
27592759
*/
@@ -2777,7 +2777,7 @@ public void test115() {
27772777
assertEquals("Wrong element type", IDelta.CONSTRUCTOR_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
27782778
assertTrue("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
27792779
}
2780-
2780+
27812781
/**
27822782
* Add unchecked exception (constructor)
27832783
*/
@@ -2801,7 +2801,7 @@ public void test116() {
28012801
assertEquals("Wrong element type", IDelta.CONSTRUCTOR_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
28022802
assertTrue("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
28032803
}
2804-
2804+
28052805
/**
28062806
* Change last parameter from array to varargs (constructor)
28072807
*/
@@ -2824,7 +2824,7 @@ public void test117() {
28242824
assertEquals("Wrong element type", IDelta.CONSTRUCTOR_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
28252825
assertTrue("Not compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
28262826
}
2827-
2827+
28282828
/**
28292829
* Removed unchecked exception (constructor)
28302830
*/
@@ -2848,7 +2848,7 @@ public void test118() {
28482848
assertEquals("Wrong element type", IDelta.CONSTRUCTOR_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
28492849
assertTrue("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
28502850
}
2851-
2851+
28522852
/**
28532853
* Removed checked exception (constructor)
28542854
*/
@@ -2872,7 +2872,7 @@ public void test119() {
28722872
assertEquals("Wrong element type", IDelta.CONSTRUCTOR_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
28732873
assertTrue("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
28742874
}
2875-
2875+
28762876
/**
28772877
* Increased access (constructor)
28782878
*/
@@ -2896,7 +2896,7 @@ public void test120() {
28962896
assertEquals("Wrong element type", IDelta.CONSTRUCTOR_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
28972897
assertTrue("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
28982898
}
2899-
2899+
29002900
/**
29012901
* Non-final to final for @nooverride method
29022902
*/
@@ -2953,7 +2953,7 @@ public void test122() {
29532953
assertEquals("Wrong element type", IDelta.API_COMPONENT_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
29542954
assertFalse("Is compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
29552955
}
2956-
2956+
29572957
/**
29582958
* Added deprecation
29592959
*/
@@ -2976,7 +2976,7 @@ public void test123() {
29762976
assertEquals("Wrong element type", IDelta.METHOD_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
29772977
assertTrue("Not compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
29782978
}
2979-
2979+
29802980
/**
29812981
* Removed deprecation
29822982
*/
@@ -2999,7 +2999,7 @@ public void test124() {
29992999
assertEquals("Wrong element type", IDelta.METHOD_ELEMENT_TYPE, child.getElementType()); //$NON-NLS-1$
30003000
assertTrue("Not compatible", DeltaProcessor.isCompatible(child)); //$NON-NLS-1$
30013001
}
3002-
3002+
30033003
/**
30043004
* Added public method into protected member interface inside a class tagged
30053005
* as noextend
@@ -3016,7 +3016,7 @@ public void test125() {
30163016
IDelta delta = ApiComparator.compare(beforeApiComponent, afterApiComponent, before, after, VisibilityModifiers.API, null);
30173017
assertTrue("Not no delta", delta == ApiComparator.NO_DELTA); //$NON-NLS-1$
30183018
}
3019-
3019+
30203020
/**
30213021
* Added public method into protected member interface inside a class tagged
30223022
* as noextend

‎apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/provisional/problems/IApiProblemTypes.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ public interface IApiProblemTypes {
201201
*/
202202
public static final String UNUSED_PROBLEM_FILTERS = "UNUSED_PROBLEM_FILTERS"; //$NON-NLS-1$
203203
/**
204-
*
204+
*
205205
* /** Key for the severity of API Use Scan Type breakage problems.
206206
*/
207207
public static final String API_USE_SCAN_TYPE_SEVERITY = "API_USE_SCAN_TYPE_SEVERITY"; //$NON-NLS-1$

‎build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/AssembleTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
10+
*
1111
* Contributors: IBM Corporation - initial API and implementation
1212
*******************************************************************************/
1313

‎build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/FetchTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
10+
*
1111
* Contributors: IBM Corporation - initial API and implementation
1212
*******************************************************************************/
1313

‎build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
10+
*
1111
* Contributors: IBM Corporation - initial API and implementation
1212
*******************************************************************************/
1313

‎build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
10+
*
1111
* Contributors: Andrew Eisenberg - bug 303960 tests
1212
*******************************************************************************/
1313

@@ -571,7 +571,7 @@ public void testBug193393() throws Exception {
571571
/*
572572
* Test disabled and resources removed 23 July 2013 as Equinox framework no
573573
* longer supports pre-osgi plug-ins (Bug 411907)
574-
*
574+
*
575575
* Tests that 196754 works without a manifest (pre-osgi plug-in) Bug 196754:
576576
* Unpacked fragments have their manifest entries reordered during feature
577577
* export

‎build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/SourceTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* https://www.eclipse.org/legal/epl-2.0/
88
*
99
* SPDX-License-Identifier: EPL-2.0
10-
*
10+
*
1111
* Contributors: IBM Corporation - initial API and implementation
1212
*******************************************************************************/
1313

@@ -525,7 +525,7 @@ public void test243475_243227() throws Exception {
525525

526526
// TODO here the rcp.source_1.0.0.123.jar should be extracted to rcp.source_1.0.0.123 as it was before
527527
// but I'm too lazy to do that and Java doesn't provide one liner to do that
528-
528+
529529
String oldBuild = buildFolder.getLocation().toOSString();
530530
Utils.generateAllElements(build2, "sdk");
531531
buildProperties = BuildConfiguration.getBuilderProperties(build2);

‎build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class Utils {
6565
/**
6666
* Transfer the contents of resource into the destination IFile. During the
6767
* transfer, replace all instances of "@replaceTag@" with "replaceString"
68-
*
68+
*
6969
* @param resource
7070
* - input URL
7171
* @param destination

0 commit comments

Comments
 (0)