Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/HunkResult.java')
-rw-r--r--bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/HunkResult.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/HunkResult.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/HunkResult.java
index a488540f8..6b37d90dc 100644
--- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/HunkResult.java
+++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/HunkResult.java
@@ -51,7 +51,7 @@ public class HunkResult {
* @param lines the lines to be patched
* @return whether the hunk could be applied
*/
- public boolean patch(List lines) {
+ public boolean patch(List<String> lines) {
this.fMatches = false;
PatchConfiguration configuration = getConfiguration();
// if the fuzz is not set for the current hunk use the one from fDiffResult
@@ -115,7 +115,7 @@ public class HunkResult {
* a progress monitor
* @return the fuzz factor or -1 if the hunk could not be matched
*/
- public int calculateFuzz(List lines, IProgressMonitor monitor) {
+ public int calculateFuzz(List<String> lines, IProgressMonitor monitor) {
this.fMatches = false;
PatchConfiguration configuration = getConfiguration();
int fuzz = 0;
@@ -228,7 +228,7 @@ public class HunkResult {
public String getContents(boolean afterState, boolean fullContext) {
if (fullContext) {
boolean problemFound = false;
- List lines = getDiffResult().getBeforeLines();
+ List<String> lines = getDiffResult().getBeforeLines();
if (afterState) {
if (isOK()) {
int oldShift = this.fShift;

Back to the top