diff options
author | Ed Merks | 2019-09-25 04:46:17 +0000 |
---|---|---|
committer | Ed Merks | 2019-09-25 10:21:57 +0000 |
commit | a9d35b32a663fa8ca3629b31ce1b6d346196b22e (patch) | |
tree | ceee25b0dd20c27edec5443b8885e3fa75351c37 /tests | |
parent | 9569b75535b8052a007ed309eee4b2053dc8861c (diff) | |
download | eclipse.platform.team-a9d35b32a663fa8ca3629b31ce1b6d346196b22e.tar.gz eclipse.platform.team-a9d35b32a663fa8ca3629b31ce1b6d346196b22e.tar.xz eclipse.platform.team-a9d35b32a663fa8ca3629b31ce1b6d346196b22e.zip |
Bug 551438 - Fix files that have ended up with CRLF in the git
repository
Fix PatchBuilderTest to adjust expectations based on the line delimiter
of the input file.
Fix PatchUITest so that it passes on Windows when the expected input is
already using CRLF.
Change-Id: I6a397114f410feceb5791644591b76cd2e0bb11b
Signed-off-by: Ed Merks <ed.merks@gmail.com>
Diffstat (limited to 'tests')
35 files changed, 929 insertions, 904 deletions
diff --git a/tests/org.eclipse.compare.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.compare.tests/.settings/org.eclipse.core.runtime.prefs index c522e1f4a..5a0ad22d2 100644 --- a/tests/org.eclipse.compare.tests/.settings/org.eclipse.core.runtime.prefs +++ b/tests/org.eclipse.compare.tests/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1
-line.separator=\n
+eclipse.preferences.version=1 +line.separator=\n diff --git a/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs index 2a1fa004c..750481b7e 100644 --- a/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.compare.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,134 +1,134 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.APILeak=warning
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
-org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
+eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore +org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=warning +org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning +org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=error +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.incompatibleJDKLevel=ignore +org.eclipse.jdt.core.incompleteClasspath=error diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patch.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patch.txt index 1c6d6822c..ebe945ea1 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patch.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patch.txt @@ -1,20 +1,20 @@ ---- old.txt 2005-05-07 00:16:20.000000000 +0200
-+++ new.txt 2005-05-07 00:16:32.000000000 +0200
-@@ -3,2 +3,4 @@
- [c]
-+[c1]
-+[c2]
- [d]
-@@ -8,3 +10,3 @@
- [h]
--[i]
-+[i1]
- [j]
-@@ -14,3 +16,2 @@
- [n]
--[o]
- [p]
-@@ -19,2 +20,3 @@
- [s]
-+[s1]
- [t]
+--- old.txt 2005-05-07 00:16:20.000000000 +0200 ++++ new.txt 2005-05-07 00:16:32.000000000 +0200 +@@ -3,2 +3,4 @@ + [c] ++[c1] ++[c2] + [d] +@@ -8,3 +10,3 @@ + [h] +-[i] ++[i1] + [j] +@@ -14,3 +16,2 @@ + [n] +-[o] + [p] +@@ -19,2 +20,3 @@ + [s] ++[s1] + [t] diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt index 4aed4b55c..c13853369 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt @@ -1,25 +1,25 @@ -[a]
-[b]
-[c]
-[c1]
-[c2]
-[d]
-[e]
-[f]
-[g]
-[h]
-[i1]
-[j]
-[k]
-[l]
-[m]
-[n]
-[p]
-[q]
-[r]
-[s]
-[s1]
-[t]
-[u]
-[v]
-[w]
+[a] +[b] +[c] +[c1] +[c2] +[d] +[e] +[f] +[g] +[h] +[i1] +[j] +[k] +[l] +[m] +[n] +[p] +[q] +[r] +[s] +[s1] +[t] +[u] +[v] +[w] diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt index a758d109a..1b8d4c7ca 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt @@ -1,23 +1,23 @@ -[a]
-[b]
-[c]
-[d]
-[e]
-[f]
-[g]
-[h]
-[i]
-[j]
-[k]
-[l]
-[m]
-[n]
-[o]
-[p]
-[q]
-[r]
-[s]
-[t]
-[u]
-[v]
-[w]
+[a] +[b] +[c] +[d] +[e] +[f] +[g] +[h] +[i] +[j] +[k] +[l] +[m] +[n] +[o] +[p] +[q] +[r] +[s] +[t] +[u] +[v] +[w] diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patch.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patch.txt index 1c6d6822c..ebe945ea1 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patch.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patch.txt @@ -1,20 +1,20 @@ ---- old.txt 2005-05-07 00:16:20.000000000 +0200
-+++ new.txt 2005-05-07 00:16:32.000000000 +0200
-@@ -3,2 +3,4 @@
- [c]
-+[c1]
-+[c2]
- [d]
-@@ -8,3 +10,3 @@
- [h]
--[i]
-+[i1]
- [j]
-@@ -14,3 +16,2 @@
- [n]
--[o]
- [p]
-@@ -19,2 +20,3 @@
- [s]
-+[s1]
- [t]
+--- old.txt 2005-05-07 00:16:20.000000000 +0200 ++++ new.txt 2005-05-07 00:16:32.000000000 +0200 +@@ -3,2 +3,4 @@ + [c] ++[c1] ++[c2] + [d] +@@ -8,3 +10,3 @@ + [h] +-[i] ++[i1] + [j] +@@ -14,3 +16,2 @@ + [n] +-[o] + [p] +@@ -19,2 +20,3 @@ + [s] ++[s1] + [t] diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt index 4aed4b55c..c13853369 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt @@ -1,25 +1,25 @@ -[a]
-[b]
-[c]
-[c1]
-[c2]
-[d]
-[e]
-[f]
-[g]
-[h]
-[i1]
-[j]
-[k]
-[l]
-[m]
-[n]
-[p]
-[q]
-[r]
-[s]
-[s1]
-[t]
-[u]
-[v]
-[w]
+[a] +[b] +[c] +[c1] +[c2] +[d] +[e] +[f] +[g] +[h] +[i1] +[j] +[k] +[l] +[m] +[n] +[p] +[q] +[r] +[s] +[s1] +[t] +[u] +[v] +[w] diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.txt index a758d109a..1b8d4c7ca 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.txt @@ -1,23 +1,23 @@ -[a]
-[b]
-[c]
-[d]
-[e]
-[f]
-[g]
-[h]
-[i]
-[j]
-[k]
-[l]
-[m]
-[n]
-[o]
-[p]
-[q]
-[r]
-[s]
-[t]
-[u]
-[v]
-[w]
+[a] +[b] +[c] +[d] +[e] +[f] +[g] +[h] +[i] +[j] +[k] +[l] +[m] +[n] +[o] +[p] +[q] +[r] +[s] +[t] +[u] +[v] +[w] diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patch.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patch.txt index 1c6d6822c..ebe945ea1 100644 --- a/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patch.txt +++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patch.txt @@ -1,20 +1,20 @@ ---- old.txt 2005-05-07 00:16:20.000000000 +0200
-+++ new.txt 2005-05-07 00:16:32.000000000 +0200
-@@ -3,2 +3,4 @@
- [c]
-+[c1]
-+[c2]
- [d]
-@@ -8,3 +10,3 @@
- [h]
--[i]
-+[i1]
- [j]
-@@ -14,3 +16,2 @@
- [n]
--[o]
- [p]
-@@ -19,2 +20,3 @@
- [s]
-+[s1]
- [t]
+--- old.txt 2005-05-07 00:16:20.000000000 +0200 ++++ new.txt 2005-05-07 00:16:32.000000000 +0200 +@@ -3,2 +3,4 @@ + [c] ++[c1] ++[c2] + [d] +@@ -8,3 +10,3 @@ + [h] +-[i] ++[i1] + [j] +@@ -14,3 +16,2 @@ + [n] +-[o] + [p] +@@ -19,2 +20,3 @@ + [s] ++[s1] + [t] diff --git a/tests/org.eclipse.compare.tests/patchdata/context_full.txt b/tests/org.eclipse.compare.tests/patchdata/context_full.txt index ff06fcb44..6646db5ef 100644 --- a/tests/org.eclipse.compare.tests/patchdata/context_full.txt +++ b/tests/org.eclipse.compare.tests/patchdata/context_full.txt @@ -1,52 +1,52 @@ -[a]
-[b]
-[c]
-[d]
-[e]
-[f]
-[g]
-[h]
-[i]
-[j]
-[k]
-[l]
-[m]
-[n]
-[o]
-[p]
-[q]
-[r]
-[s]
-[t]
-[u]
-[v]
-[w]
-[x]
-[y]
-[z]
-[A]
-[B]
-[C]
-[D]
-[E]
-[F]
-[G]
-[H]
-[I]
-[J]
-[K]
-[L]
-[M]
-[N]
-[O]
-[P]
-[Q]
-[R]
-[S]
-[T]
-[U]
-[V]
-[W]
-[X]
-[Y]
+[a] +[b] +[c] +[d] +[e] +[f] +[g] +[h] +[i] +[j] +[k] +[l] +[m] +[n] +[o] +[p] +[q] +[r] +[s] +[t] +[u] +[v] +[w] +[x] +[y] +[z] +[A] +[B] +[C] +[D] +[E] +[F] +[G] +[H] +[I] +[J] +[K] +[L] +[M] +[N] +[O] +[P] +[Q] +[R] +[S] +[T] +[U] +[V] +[W] +[X] +[Y] [Z]
\ No newline at end of file diff --git a/tests/org.eclipse.compare.tests/patchdata/exp_addHunks.txt b/tests/org.eclipse.compare.tests/patchdata/exp_addHunks.txt index 3d09ef1ad..0324ad338 100644 --- a/tests/org.eclipse.compare.tests/patchdata/exp_addHunks.txt +++ b/tests/org.eclipse.compare.tests/patchdata/exp_addHunks.txt @@ -1,59 +1,59 @@ -[a1]
-[a2]
-[a]
-[b]
-[c]
-[d]
-[d1]
-[d2]
-[d3]
-[d4]
-[e]
-[f]
-[g]
-[h]
-[i]
-[j]
-[k]
-[l]
-[m]
-[n]
-[o]
-[p]
-[q]
-[r]
-[s]
-[t]
-[u]
-[v]
-[y]
-[z]
-[A]
-[B]
-[C]
-[D]
-[E]
-[F]
-[G]
-[H]
-[I]
-[J]
-[K]
-[L]
-[N]
-[N1]
-[N2]
-[O]
-[P]
-[Q]
-[R]
-[S]
-[T]
-[U]
-[V]
-[W]
-[W1]
-[W2]
-[W3]
-[Y]
+[a1] +[a2] +[a] +[b] +[c] +[d] +[d1] +[d2] +[d3] +[d4] +[e] +[f] +[g] +[h] +[i] +[j] +[k] +[l] +[m] +[n] +[o] +[p] +[q] +[r] +[s] +[t] +[u] +[v] +[y] +[z] +[A] +[B] +[C] +[D] +[E] +[F] +[G] +[H] +[I] +[J] +[K] +[L] +[N] +[N1] +[N2] +[O] +[P] +[Q] +[R] +[S] +[T] +[U] +[V] +[W] +[W1] +[W2] +[W3] +[Y] [Z]
\ No newline at end of file diff --git a/tests/org.eclipse.compare.tests/patchdata/exp_createFilePatch.txt b/tests/org.eclipse.compare.tests/patchdata/exp_createFilePatch.txt index 7d137a8e3..dc7a3d4f8 100644 --- a/tests/org.eclipse.compare.tests/patchdata/exp_createFilePatch.txt +++ b/tests/org.eclipse.compare.tests/patchdata/exp_createFilePatch.txt @@ -1,27 +1,27 @@ -[a1]
-[a2]
-[a3]
-[a]
-[b]
-[c]
-[f]
-[g]
-[h]
-[h1]
-[i]
-[j]
-[j1]
-[j2]
-[k]
-[l]
-[m]
-[n]
-[o]
-[p]
-[q]
-[r]
-[s]
-[t]
-[u]
-[v]
-[w]
+[a1] +[a2] +[a3] +[a] +[b] +[c] +[f] +[g] +[h] +[h1] +[i] +[j] +[j1] +[j2] +[k] +[l] +[m] +[n] +[o] +[p] +[q] +[r] +[s] +[t] +[u] +[v] +[w] diff --git a/tests/org.eclipse.compare.tests/patchdata/exp_modifyHunks.txt b/tests/org.eclipse.compare.tests/patchdata/exp_modifyHunks.txt index c3e64d74b..f42aa7381 100644 --- a/tests/org.eclipse.compare.tests/patchdata/exp_modifyHunks.txt +++ b/tests/org.eclipse.compare.tests/patchdata/exp_modifyHunks.txt @@ -1,28 +1,28 @@ -[a]
-[b]
-[c]
-[d]
-[d1]
-[d2]
-[d3]
-[d4]
-[e]
-[f]
-[g]
-[h]
-[i1]
-[j]
-[k]
-[l]
-[m]
-[n]
-[o]
-[p]
-[q]
-[r]
-[s]
-[s1]
-[t]
-[u]
-[v]
-[w]
+[a] +[b] +[c] +[d] +[d1] +[d2] +[d3] +[d4] +[e] +[f] +[g] +[h] +[i1] +[j] +[k] +[l] +[m] +[n] +[o] +[p] +[q] +[r] +[s] +[s1] +[t] +[u] +[v] +[w] diff --git a/tests/org.eclipse.compare.tests/patchdata/exp_removeHunks.txt b/tests/org.eclipse.compare.tests/patchdata/exp_removeHunks.txt index 68fc86fcd..96a93f485 100644 --- a/tests/org.eclipse.compare.tests/patchdata/exp_removeHunks.txt +++ b/tests/org.eclipse.compare.tests/patchdata/exp_removeHunks.txt @@ -1,51 +1,51 @@ -[a]
-[b]
-[c]
-[d]
-[e]
-[f]
-[g]
-[h]
-[i]
-[j]
-[k]
-[l]
-[m]
-[n]
-[o]
-[p]
-[q]
-[r]
-[s]
-[t]
-[u]
-[v]
-[y]
-[z]
-[A]
-[B]
-[C]
-[D]
-[E]
-[F]
-[I]
-[J]
-[J1]
-[K]
-[L]
-[M]
-[N]
-[O]
-[P]
-[Q]
-[R]
-[S]
-[T]
-[U]
-[V]
-[W]
-[W1]
-[W2]
-[W3]
-[Y]
+[a] +[b] +[c] +[d] +[e] +[f] +[g] +[h] +[i] +[j] +[k] +[l] +[m] +[n] +[o] +[p] +[q] +[r] +[s] +[t] +[u] +[v] +[y] +[z] +[A] +[B] +[C] +[D] +[E] +[F] +[I] +[J] +[J1] +[K] +[L] +[M] +[N] +[O] +[P] +[Q] +[R] +[S] +[T] +[U] +[V] +[W] +[W1] +[W2] +[W3] +[Y] [Z]
\ No newline at end of file diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_addHunks.txt b/tests/org.eclipse.compare.tests/patchdata/patch_addHunks.txt index 4c75b3d6e..3d51d344a 100644 --- a/tests/org.eclipse.compare.tests/patchdata/patch_addHunks.txt +++ b/tests/org.eclipse.compare.tests/patchdata/patch_addHunks.txt @@ -1,34 +1,34 @@ -### Eclipse Workspace Patch 1.0
-#P Bug202944
-Index: tmp/context_full.txt
-===================================================================
-RCS file: /TEST/Bug202944/tmp/context_full.txt,v
-retrieving revision 1.1
-diff -u -r1.1 context_full.txt
---- tmp/context_full.txt 23 Feb 2009 09:39:56 -0000 1.1
-+++ tmp/context_full.txt 23 Feb 2009 09:40:51 -0000
-@@ -1,3 +1,5 @@
-+[a1]
-+[a2]
- [a]
- [b]
- [c]
-@@ -20,8 +22,6 @@
- [t]
- [u]
- [v]
--[w]
--[x]
- [y]
- [z]
- [A]
-@@ -47,6 +47,8 @@
- [U]
- [V]
- [W]
--[X]
-+[W1]
-+[W2]
-+[W3]
- [Y]
- [Z]
+### Eclipse Workspace Patch 1.0 +#P Bug202944 +Index: tmp/context_full.txt +=================================================================== +RCS file: /TEST/Bug202944/tmp/context_full.txt,v +retrieving revision 1.1 +diff -u -r1.1 context_full.txt +--- tmp/context_full.txt 23 Feb 2009 09:39:56 -0000 1.1 ++++ tmp/context_full.txt 23 Feb 2009 09:40:51 -0000 +@@ -1,3 +1,5 @@ ++[a1] ++[a2] + [a] + [b] + [c] +@@ -20,8 +22,6 @@ + [t] + [u] + [v] +-[w] +-[x] + [y] + [z] + [A] +@@ -47,6 +47,8 @@ + [U] + [V] + [W] +-[X] ++[W1] ++[W2] ++[W3] + [Y] + [Z] diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_createHunk0.txt b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk0.txt index f1de92aaf..68ddedb1e 100644 --- a/tests/org.eclipse.compare.tests/patchdata/patch_createHunk0.txt +++ b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk0.txt @@ -1,19 +1,19 @@ -### Eclipse Workspace Patch 1.0
-#P Bug202944
-Index: tmp/list.txt
-===================================================================
-RCS file: /TEST/Bug202944/tmp/list.txt,v
-retrieving revision 1.2
-diff -u -r1.2 list.txt
---- tmp/list.txt 20 Feb 2009 11:02:27 -0000 1.2
-+++ tmp/list.txt 20 Feb 2009 11:03:29 -0000
-@@ -1,6 +1,8 @@
-+[a1]
-+[a2]
-+[a3]
- [a]
- [b]
--[c]
- [d]
- [e]
- [f]
+### Eclipse Workspace Patch 1.0 +#P Bug202944 +Index: tmp/list.txt +=================================================================== +RCS file: /TEST/Bug202944/tmp/list.txt,v +retrieving revision 1.2 +diff -u -r1.2 list.txt +--- tmp/list.txt 20 Feb 2009 11:02:27 -0000 1.2 ++++ tmp/list.txt 20 Feb 2009 11:03:29 -0000 +@@ -1,6 +1,8 @@ ++[a1] ++[a2] ++[a3] + [a] + [b] +-[c] + [d] + [e] + [f] diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_createHunk1.txt b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk1.txt index 7b0fb2930..9a1e3b060 100644 --- a/tests/org.eclipse.compare.tests/patchdata/patch_createHunk1.txt +++ b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk1.txt @@ -1,26 +1,26 @@ -### Eclipse Workspace Patch 1.0
-#P Bug202944
-Index: tmp/list.txt
-===================================================================
-RCS file: /TEST/Bug202944/tmp/list.txt,v
-retrieving revision 1.2
-diff -u -r1.2 list.txt
---- tmp/list.txt 20 Feb 2009 11:02:27 -0000 1.2
-+++ tmp/list.txt 20 Feb 2009 11:32:47 -0000
-@@ -1,13 +1,14 @@
- [a]
- [b]
--[c]
- [d]
--[e]
- [f]
- [g]
- [h]
-+[h1]
- [i]
- [j]
-+[j1]
-+[j2]
- [k]
- [l]
- [m]
+### Eclipse Workspace Patch 1.0 +#P Bug202944 +Index: tmp/list.txt +=================================================================== +RCS file: /TEST/Bug202944/tmp/list.txt,v +retrieving revision 1.2 +diff -u -r1.2 list.txt +--- tmp/list.txt 20 Feb 2009 11:02:27 -0000 1.2 ++++ tmp/list.txt 20 Feb 2009 11:32:47 -0000 +@@ -1,13 +1,14 @@ + [a] + [b] +-[c] + [d] +-[e] + [f] + [g] + [h] ++[h1] + [i] + [j] ++[j1] ++[j2] + [k] + [l] + [m] diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_createHunk2.txt b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk2.txt index 2f64be799..3ad99b923 100644 --- a/tests/org.eclipse.compare.tests/patchdata/patch_createHunk2.txt +++ b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk2.txt @@ -1,12 +1,12 @@ -### Eclipse Workspace Patch 1.0
-#P Bug202944
-Index: tmp/a.txt
-===================================================================
-RCS file: tmp/a.txt
-diff -N tmp/a.txt
---- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ tmp/a.txt 1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,3 @@
-+[aa]
-+[bb]
-+[cc]
+### Eclipse Workspace Patch 1.0 +#P Bug202944 +Index: tmp/a.txt +=================================================================== +RCS file: tmp/a.txt +diff -N tmp/a.txt +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ tmp/a.txt 1 Jan 1970 00:00:00 -0000 +@@ -0,0 +1,3 @@ ++[aa] ++[bb] ++[cc] diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_createHunk3.txt b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk3.txt index 0bec1a205..39f9dccd7 100644 --- a/tests/org.eclipse.compare.tests/patchdata/patch_createHunk3.txt +++ b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk3.txt @@ -1,14 +1,14 @@ -### Eclipse Workspace Patch 1.0
-#P Bug202944
-Index: tmp/a.txt
-===================================================================
-RCS file: /TEST/Bug202944/tmp/a.txt,v
-retrieving revision 1.1
-diff -u -r1.1 a.txt
---- tmp/a.txt 20 Feb 2009 11:37:35 -0000 1.1
-+++ tmp/a.txt 20 Feb 2009 11:38:40 -0000
-@@ -1,4 +0,0 @@
--[aa]
--[bb]
--[cc]
--[dd]
+### Eclipse Workspace Patch 1.0 +#P Bug202944 +Index: tmp/a.txt +=================================================================== +RCS file: /TEST/Bug202944/tmp/a.txt,v +retrieving revision 1.1 +diff -u -r1.1 a.txt +--- tmp/a.txt 20 Feb 2009 11:37:35 -0000 1.1 ++++ tmp/a.txt 20 Feb 2009 11:38:40 -0000 +@@ -1,4 +0,0 @@ +-[aa] +-[bb] +-[cc] +-[dd] diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_modifyHunks.txt b/tests/org.eclipse.compare.tests/patchdata/patch_modifyHunks.txt index 917b62b9b..87d5174f1 100644 --- a/tests/org.eclipse.compare.tests/patchdata/patch_modifyHunks.txt +++ b/tests/org.eclipse.compare.tests/patchdata/patch_modifyHunks.txt @@ -1,25 +1,25 @@ ---- old.txt 2005-05-07 00:16:20.000000000 +0200
-+++ new.txt 2005-05-07 00:16:32.000000000 +0200
-@@ -3,2 +3,4 @@
- [c]
-+[c1]
-+[c2]
- [d]
-@@ -8,3 +10,3 @@
- [h]
--[i]
-+[i1]
- [j]
-@@ -14,3 +16,2 @@
- [n]
--[o]
- [p]
-@@ -19,2 +20,3 @@
- [s]
-+[s1]
- [t]
-@@ -29,2 +31,3 @@
- [yy]
-+[xx]
- [yy]
+--- old.txt 2005-05-07 00:16:20.000000000 +0200 ++++ new.txt 2005-05-07 00:16:32.000000000 +0200 +@@ -3,2 +3,4 @@ + [c] ++[c1] ++[c2] + [d] +@@ -8,3 +10,3 @@ + [h] +-[i] ++[i1] + [j] +@@ -14,3 +16,2 @@ + [n] +-[o] + [p] +@@ -19,2 +20,3 @@ + [s] ++[s1] + [t] +@@ -29,2 +31,3 @@ + [yy] ++[xx] + [yy]
\ No newline at end of file diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_removeHunks.txt b/tests/org.eclipse.compare.tests/patchdata/patch_removeHunks.txt index 860e39ad7..f17393b69 100644 --- a/tests/org.eclipse.compare.tests/patchdata/patch_removeHunks.txt +++ b/tests/org.eclipse.compare.tests/patchdata/patch_removeHunks.txt @@ -1,55 +1,55 @@ -### Eclipse Workspace Patch 1.0
-#P Bug202944
-Index: tmp/context_full.txt
-===================================================================
-RCS file: /TEST/Bug202944/tmp/context_full.txt,v
-retrieving revision 1.1
-diff -u -r1.1 context_full.txt
---- tmp/context_full.txt 23 Feb 2009 09:39:56 -0000 1.1
-+++ tmp/context_full.txt 23 Feb 2009 10:03:51 -0000
-@@ -1,3 +1,5 @@
-+[a1]
-+[a2]
- [a]
- [b]
- [c]
-@@ -11,6 +13,8 @@
- [k]
- [l]
- [m]
-+[m1]
-+[m2]
- [n]
- [o]
- [p]
-@@ -20,8 +24,6 @@
- [t]
- [u]
- [v]
--[w]
--[x]
- [y]
- [z]
- [A]
-@@ -30,10 +32,9 @@
- [D]
- [E]
- [F]
--[G]
--[H]
- [I]
- [J]
-+[J1]
- [K]
- [L]
- [M]
-@@ -47,6 +48,8 @@
- [U]
- [V]
- [W]
--[X]
-+[W1]
-+[W2]
-+[W3]
- [Y]
- [Z]
+### Eclipse Workspace Patch 1.0 +#P Bug202944 +Index: tmp/context_full.txt +=================================================================== +RCS file: /TEST/Bug202944/tmp/context_full.txt,v +retrieving revision 1.1 +diff -u -r1.1 context_full.txt +--- tmp/context_full.txt 23 Feb 2009 09:39:56 -0000 1.1 ++++ tmp/context_full.txt 23 Feb 2009 10:03:51 -0000 +@@ -1,3 +1,5 @@ ++[a1] ++[a2] + [a] + [b] + [c] +@@ -11,6 +13,8 @@ + [k] + [l] + [m] ++[m1] ++[m2] + [n] + [o] + [p] +@@ -20,8 +24,6 @@ + [t] + [u] + [v] +-[w] +-[x] + [y] + [z] + [A] +@@ -30,10 +32,9 @@ + [D] + [E] + [F] +-[G] +-[H] + [I] + [J] ++[J1] + [K] + [L] + [M] +@@ -47,6 +48,8 @@ + [U] + [V] + [W] +-[X] ++[W1] ++[W2] ++[W3] + [Y] + [Z] diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchBuilderTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchBuilderTest.java index f97b818c8..a9d52ed1d 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchBuilderTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchBuilderTest.java @@ -52,7 +52,8 @@ public class PatchBuilderTest extends TestCase { String[] lines = new String[] { " [d]", "+[d1]", "+[d2]", "+[d3]", "+[d4]", " [e]" }; - addLineDelimiters(lines); + String lineDelimiter = getLineDelimiter(patchStorage); + addLineDelimiters(lines, lineDelimiter); IHunk[] toAdd = new IHunk[] { PatchBuilder.createHunk(3, lines) }; IFilePatch2 filePatch = PatchBuilder.addHunks(patches[0], toAdd); @@ -97,12 +98,13 @@ public class PatchBuilderTest extends TestCase { String[] lines0 = new String[] { " [d]", "+[d1]", "+[d2]", "+[d3]", "+[d4]", " [e]" }; - addLineDelimiters(lines0); + String lineDelimiter = getLineDelimiter(patchStorage); + addLineDelimiters(lines0, lineDelimiter); IHunk hunk0 = PatchBuilder.createHunk(3, lines0); String[] lines1 = new String[] { " [K]", " [L]", "-[M]", " [N]", "+[N1]", "+[N2]", " [O]", " [P]" }; - addLineDelimiters(lines1); + addLineDelimiters(lines1, lineDelimiter); IHunk hunk1 = PatchBuilder.createHunk(36, lines1); IHunk[] toAdd = new IHunk[] { hunk0, hunk1 }; @@ -178,13 +180,14 @@ public class PatchBuilderTest extends TestCase { IStorage contextStorage = new StringStorage("context.txt"); String[] lines0 = new String[] { "+[a1]", "+[a2]", "+[a3]", " [a]" }; - addLineDelimiters(lines0); + String lineDelimiter = getLineDelimiter(contextStorage); + addLineDelimiters(lines0, lineDelimiter); Hunk hunk0 = (Hunk) PatchBuilder.createHunk(0, lines0); String[] lines1 = new String[] { " [b]", " [c]", "-[d]", "-[e]", " [f]", " [g]", " [h]", "+[h1]", " [i]", " [j]", "+[j1]", "+[j2]", " [k]", " [l]" }; - addLineDelimiters(lines1); + addLineDelimiters(lines1, lineDelimiter); Hunk hunk1 = (Hunk) PatchBuilder.createHunk(1, lines1); IHunk[] hunks = new IHunk[] { hunk1, hunk0 }; @@ -211,7 +214,7 @@ public class PatchBuilderTest extends TestCase { assertEquals(expected, PatchUtils.asString(actual)); } - public void testCreateHunk0() throws CoreException { + public void testCreateHunk0() throws CoreException, IOException { IStorage patch = new StringStorage("patch_createHunk0.txt"); IFilePatch[] filePatches = ApplyPatchOperation.parsePatch(patch); assertEquals(1, filePatches.length); @@ -219,7 +222,8 @@ public class PatchBuilderTest extends TestCase { String[] lines = new String[] { "+[a1]", "+[a2]", "+[a3]", " [a]", " [b]", "-[c]", " [d]", " [e]", " [f]" }; - addLineDelimiters(lines); + String lineDelimiter = getLineDelimiter(patch); + addLineDelimiters(lines, lineDelimiter); Hunk hunk = (Hunk) PatchBuilder.createHunk(0, lines); String[] actual = hunk.getUnifiedLines(); assertTrue(lines != actual); @@ -228,7 +232,7 @@ public class PatchBuilderTest extends TestCase { assertHunkEquals(hunk, (Hunk) filePatches[0].getHunks()[0]); } - public void testCreateHunk1() throws CoreException { + public void testCreateHunk1() throws CoreException, IOException { IStorage patch = new StringStorage("patch_createHunk1.txt"); IFilePatch[] filePatches = ApplyPatchOperation.parsePatch(patch); assertEquals(1, filePatches.length); @@ -237,7 +241,8 @@ public class PatchBuilderTest extends TestCase { String[] lines = new String[] { " [a]", " [b]", "-[c]", " [d]", "-[e]", " [f]", " [g]", " [h]", "+[h1]", " [i]", " [j]", "+[j1]", "+[j2]", " [k]", " [l]", " [m]" }; - addLineDelimiters(lines); + String lineDelimiter = getLineDelimiter(patch); + addLineDelimiters(lines, lineDelimiter); Hunk hunk = (Hunk) PatchBuilder.createHunk(0, lines); String[] actual = hunk.getUnifiedLines(); assertTrue(lines != actual); @@ -246,14 +251,15 @@ public class PatchBuilderTest extends TestCase { assertHunkEquals(hunk, (Hunk) filePatches[0].getHunks()[0]); } - public void testCreateHunk2() throws CoreException { + public void testCreateHunk2() throws CoreException, IOException { IStorage patch = new StringStorage("patch_createHunk2.txt"); IFilePatch[] filePatches = ApplyPatchOperation.parsePatch(patch); assertEquals(1, filePatches.length); assertEquals(1, filePatches[0].getHunks().length); String[] lines = new String[] { "+[aa]", "+[bb]", "+[cc]" }; - addLineDelimiters(lines); + String lineDelimiter = getLineDelimiter(patch); + addLineDelimiters(lines, lineDelimiter); Hunk hunk = (Hunk) PatchBuilder.createHunk(0, lines); String[] actual = hunk.getUnifiedLines(); assertTrue(lines != actual); @@ -262,14 +268,15 @@ public class PatchBuilderTest extends TestCase { assertHunkEquals(hunk, (Hunk) filePatches[0].getHunks()[0]); } - public void testCreateHunk3() throws CoreException { + public void testCreateHunk3() throws CoreException, IOException { IStorage patch = new StringStorage("patch_createHunk3.txt"); IFilePatch[] filePatches = ApplyPatchOperation.parsePatch(patch); assertEquals(1, filePatches.length); assertEquals(1, filePatches[0].getHunks().length); String[] lines = new String[] { "-[aa]", "-[bb]", "-[cc]", "-[dd]" }; - addLineDelimiters(lines); + String lineDelimiter = getLineDelimiter(patch); + addLineDelimiters(lines, lineDelimiter); Hunk hunk = (Hunk) PatchBuilder.createHunk(0, lines); String[] actual = hunk.getUnifiedLines(); assertTrue(lines != actual); @@ -294,9 +301,27 @@ public class PatchBuilderTest extends TestCase { assertEquals(h1.getHunkType(true), h2.getHunkType(true)); } - private void addLineDelimiters(String[] lines) { + private String getLineDelimiter(IStorage storage) throws CoreException, IOException { + InputStream in = null; + try { + in = storage.getContents(); + int ch; + while ((ch = in.read()) != -1) { + if (ch == '\r') { + return "\r\n"; + } + } + } finally { + if (in != null) { + in.close(); + } + } + return "\n"; + } + + private void addLineDelimiters(String[] lines, String lineDelimiter) { for (int i = 0; i < lines.length; i++) { - lines[i] = lines[i] + "\r\n"; + lines[i] = lines[i] + lineDelimiter; } } diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchUITest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchUITest.java index e58e32557..5b49a3ccb 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchUITest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchUITest.java @@ -150,7 +150,7 @@ public class PatchUITest extends TestCase { InputStream expectedIS = PatchUtils.asInputStream("exp_addition.txt"); InputStream actualIS = testProject.getFile("exp_addition.txt").getContents(); - String expected = PatchUtils.asString(expectedIS).replaceAll("\n", "\r\n"); + String expected = PatchUtils.asString(expectedIS).replaceAll("\r?\n", "\r\n"); String actual = PatchUtils.asString(actualIS); assertEquals(expected, actual); diff --git a/tests/org.eclipse.core.tests.net/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.core.tests.net/.settings/org.eclipse.core.runtime.prefs index c522e1f4a..5a0ad22d2 100644 --- a/tests/org.eclipse.core.tests.net/.settings/org.eclipse.core.runtime.prefs +++ b/tests/org.eclipse.core.tests.net/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1
-line.separator=\n
+eclipse.preferences.version=1 +line.separator=\n diff --git a/tests/org.eclipse.core.tests.net/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.net/META-INF/MANIFEST.MF index 5e8222883..920e27320 100644 --- a/tests/org.eclipse.core.tests.net/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.core.tests.net/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Net Tests Plug-in Bundle-SymbolicName: org.eclipse.core.tests.net -Bundle-Version: 1.4.400.qualifier +Bundle-Version: 1.4.500.qualifier Bundle-Activator: org.eclipse.core.tests.net.Activator Bundle-Vendor: Eclipse.org Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", diff --git a/tests/org.eclipse.core.tests.net/pom.xml b/tests/org.eclipse.core.tests.net/pom.xml index c3632e313..3821be707 100644 --- a/tests/org.eclipse.core.tests.net/pom.xml +++ b/tests/org.eclipse.core.tests.net/pom.xml @@ -18,7 +18,7 @@ </parent> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.tests.net</artifactId> - <version>1.4.400-SNAPSHOT</version> + <version>1.4.500-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/org.eclipse.jsch.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.jsch.tests/.settings/org.eclipse.core.runtime.prefs index c522e1f4a..5a0ad22d2 100644 --- a/tests/org.eclipse.jsch.tests/.settings/org.eclipse.core.runtime.prefs +++ b/tests/org.eclipse.jsch.tests/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1
-line.separator=\n
+eclipse.preferences.version=1 +line.separator=\n diff --git a/tests/org.eclipse.jsch.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jsch.tests/META-INF/MANIFEST.MF index ec1e9a324..3d6cd7ec1 100644 --- a/tests/org.eclipse.jsch.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jsch.tests/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JSch Tests Plug-in Bundle-SymbolicName: org.eclipse.jsch.tests -Bundle-Version: 1.1.300.qualifier +Bundle-Version: 1.1.400.qualifier Eclipse-BundleShape: dir Bundle-Activator: org.eclipse.jsch.tests.Activator Bundle-Vendor: Eclipse.org diff --git a/tests/org.eclipse.jsch.tests/pom.xml b/tests/org.eclipse.jsch.tests/pom.xml index 0d3e9a956..28e1f59d4 100644 --- a/tests/org.eclipse.jsch.tests/pom.xml +++ b/tests/org.eclipse.jsch.tests/pom.xml @@ -18,6 +18,6 @@ </parent> <groupId>org.eclipse.jsch</groupId> <artifactId>org.eclipse.jsch.tests</artifactId> - <version>1.1.300-SNAPSHOT</version> + <version>1.1.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/tests/org.eclipse.team.tests.core/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.team.tests.core/.settings/org.eclipse.core.runtime.prefs index c522e1f4a..5a0ad22d2 100644 --- a/tests/org.eclipse.team.tests.core/.settings/org.eclipse.core.runtime.prefs +++ b/tests/org.eclipse.team.tests.core/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1
-line.separator=\n
+eclipse.preferences.version=1 +line.separator=\n diff --git a/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF b/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF index cac91353b..3f2e5118a 100644 --- a/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.tests.core; singleton:=true -Bundle-Version: 3.8.600.qualifier +Bundle-Version: 3.8.700.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.team.tests.core, diff --git a/tests/org.eclipse.team.tests.core/pom.xml b/tests/org.eclipse.team.tests.core/pom.xml index 576f7bc59..55070cf51 100644 --- a/tests/org.eclipse.team.tests.core/pom.xml +++ b/tests/org.eclipse.team.tests.core/pom.xml @@ -18,7 +18,7 @@ </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.tests.core</artifactId> - <version>3.8.600-SNAPSHOT</version> + <version>3.8.700-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties> diff --git a/tests/org.eclipse.team.tests.cvs.core/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.team.tests.cvs.core/.settings/org.eclipse.core.runtime.prefs index c522e1f4a..5a0ad22d2 100644 --- a/tests/org.eclipse.team.tests.cvs.core/.settings/org.eclipse.core.runtime.prefs +++ b/tests/org.eclipse.team.tests.cvs.core/.settings/org.eclipse.core.runtime.prefs @@ -1,2 +1,2 @@ -eclipse.preferences.version=1
-line.separator=\n
+eclipse.preferences.version=1 +line.separator=\n diff --git a/tests/org.eclipse.team.tests.cvs.core/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.team.tests.cvs.core/.settings/org.eclipse.jdt.core.prefs index 7155a0d00..f15a408eb 100644 --- a/tests/org.eclipse.team.tests.cvs.core/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.team.tests.cvs.core/.settings/org.eclipse.jdt.core.prefs @@ -1,133 +1,133 @@ -eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.APILeak=warning
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
-org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
-org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
+eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.cleanOutputFolder=clean +org.eclipse.jdt.core.builder.duplicateResourceTask=warning +org.eclipse.jdt.core.builder.invalidClasspath=abort +org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore +org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch +org.eclipse.jdt.core.circularClasspath=error +org.eclipse.jdt.core.classpath.exclusionPatterns=enabled +org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.doc.comment.support=enabled +org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 +org.eclipse.jdt.core.compiler.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public +org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled +org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=error +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.incompatibleJDKLevel=ignore +org.eclipse.jdt.core.incompleteClasspath=error diff --git a/tests/org.eclipse.team.tests.cvs.core/benchmark/cvsui_benchmark.bat b/tests/org.eclipse.team.tests.cvs.core/benchmark/cvsui_benchmark.bat index 3bc2ef092..81dd30bdf 100644 --- a/tests/org.eclipse.team.tests.cvs.core/benchmark/cvsui_benchmark.bat +++ b/tests/org.eclipse.team.tests.cvs.core/benchmark/cvsui_benchmark.bat @@ -1,55 +1,55 @@ -@rem ***************************************************************************
-@rem Copyright (c) 2002, 2011 IBM Corporation and others.
+@rem *************************************************************************** +@rem Copyright (c) 2002, 2011 IBM Corporation and others. m -m This program and the accompanying materials
-@rem are made available under the terms of the Eclipse Public License 2.0
-@rem which accompanies this distribution, and is available at
+m This program and the accompanying materials +@rem are made available under the terms of the Eclipse Public License 2.0 +@rem which accompanies this distribution, and is available at m https://www.eclipse.org/legal/epl-2.0/ m -m SPDX-License-Identifier: EPL-2.0
-@rem
-@rem Contributors:
-@rem IBM Corporation - initial API and implementation
-@rem ***************************************************************************
-@echo off
-rem Team UI benchmark script
-rem Expects the following plugins to be installed:
-rem org.eclipse.core.tests.harness
-rem org.eclipse.team.core
-rem org.eclipse.team.cvs.core
-rem org.eclipse.team.cvs.ui
-rem org.eclipse.team.tests.cvs
-rem org.eclipse.team.tests.cvs.core
-rem org.eclipse.team.ui
-rem org.junit
-
-set ROOT=D:\PerformanceTesting
-
-set ECLIPSE=%ROOT%\eclipse
-set REPOSITORY_PROPERTIES=%ROOT%\repository.properties
-
-rem set TEST=cvsui.benchmark.all
-rem set REPEAT=25
-rem set IGNOREFIRST=-ignorefirst
-
-set TEST=cvsui.benchmark.command
-set REPEAT=25
-set IGNOREFIRST=-ignorefirst
-
-set LOG=%ROOT%\%TEST%.xml
-set WORKSPACE=%ECLIPSE%\workspace
-set JRE=%ROOT%\jre
-set JAVA=%JRE%\bin\java.exe
-set HARNESS=org.eclipse.team.tests.cvs.core.harness
-
-set VMARGS=-Declipse.cvs.properties=%REPOSITORY_PROPERTIES%
-set PROGARGS=-dev bin -noupdate -application %HARNESS% -test %TEST% -log %LOG% -purge -repeat %REPEAT% %IGNOREFIRST%
-
-pushd %ECLIPSE%
-echo Purging the workspace: %WORKSPACE%
-del /S /F /Q %WORKSPACE% >NUL:
-@echo on
-@echo Running Team UI benchmark test
-%JAVA% -cp startup.jar %VMARGS% org.eclipse.core.launcher.Main %PROGARGS%
-@echo off
+m SPDX-License-Identifier: EPL-2.0 +@rem +@rem Contributors: +@rem IBM Corporation - initial API and implementation +@rem *************************************************************************** +@echo off +rem Team UI benchmark script +rem Expects the following plugins to be installed: +rem org.eclipse.core.tests.harness +rem org.eclipse.team.core +rem org.eclipse.team.cvs.core +rem org.eclipse.team.cvs.ui +rem org.eclipse.team.tests.cvs +rem org.eclipse.team.tests.cvs.core +rem org.eclipse.team.ui +rem org.junit + +set ROOT=D:\PerformanceTesting + +set ECLIPSE=%ROOT%\eclipse +set REPOSITORY_PROPERTIES=%ROOT%\repository.properties + +rem set TEST=cvsui.benchmark.all +rem set REPEAT=25 +rem set IGNOREFIRST=-ignorefirst + +set TEST=cvsui.benchmark.command +set REPEAT=25 +set IGNOREFIRST=-ignorefirst + +set LOG=%ROOT%\%TEST%.xml +set WORKSPACE=%ECLIPSE%\workspace +set JRE=%ROOT%\jre +set JAVA=%JRE%\bin\java.exe +set HARNESS=org.eclipse.team.tests.cvs.core.harness + +set VMARGS=-Declipse.cvs.properties=%REPOSITORY_PROPERTIES% +set PROGARGS=-dev bin -noupdate -application %HARNESS% -test %TEST% -log %LOG% -purge -repeat %REPEAT% %IGNOREFIRST% + +pushd %ECLIPSE% +echo Purging the workspace: %WORKSPACE% +del /S /F /Q %WORKSPACE% >NUL: +@echo on +@echo Running Team UI benchmark test +%JAVA% -cp startup.jar %VMARGS% org.eclipse.core.launcher.Main %PROGARGS% +@echo off popd
\ No newline at end of file |