Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2007-04-19 20:10:09 +0000
committerMichael Valenta2007-04-19 20:10:09 +0000
commit37bf3f5d278e5fad90b2c193821e5f683639b4ef (patch)
tree00b2b43886912c8622f87f223a9b5a2403302508 /bundles/org.eclipse.compare
parentb1c635106dafe79c80ee913d72e020307029c362 (diff)
downloadeclipse.platform.team-37bf3f5d278e5fad90b2c193821e5f683639b4ef.tar.gz
eclipse.platform.team-37bf3f5d278e5fad90b2c193821e5f683639b4ef.tar.xz
eclipse.platform.team-37bf3f5d278e5fad90b2c193821e5f683639b4ef.zip
Bug 183222 [Aply Patch] IFilePatch.apply creates *.rej files
Diffstat (limited to 'bundles/org.eclipse.compare')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java2
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
index 0db47e216..c8e842c22 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
@@ -55,7 +55,7 @@ public class Patcher {
private Set mergedHunks = new HashSet();
private final PatchConfiguration configuration;
- private boolean fGenerateRejectFile = true;
+ private boolean fGenerateRejectFile = false;
public Patcher() {
configuration = new PatchConfiguration();
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java
index 489fdc2a4..6c87d215a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java
@@ -418,7 +418,7 @@ public class PreviewPatchPage2 extends WizardPage {
generateRejects.getSelection());
}
});
- generateRejects.setSelection(true);
+ generateRejects.setSelection(false);
generateRejects.setLayoutData(gd);
}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
index 0db47e216..c8e842c22 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/Patcher.java
@@ -55,7 +55,7 @@ public class Patcher {
private Set mergedHunks = new HashSet();
private final PatchConfiguration configuration;
- private boolean fGenerateRejectFile = true;
+ private boolean fGenerateRejectFile = false;
public Patcher() {
configuration = new PatchConfiguration();
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java
index 489fdc2a4..6c87d215a 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java
@@ -418,7 +418,7 @@ public class PreviewPatchPage2 extends WizardPage {
generateRejects.getSelection());
}
});
- generateRejects.setSelection(true);
+ generateRejects.setSelection(false);
generateRejects.setLayoutData(gd);
}

Back to the top