Apply Patch fixes
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java
index 9b7e054..42ec765 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java
@@ -218,7 +218,7 @@
ISchedulingRule[] retargetedFiles = new ISchedulingRule[0];
- if (currentPage.getName().equals(PreviewPatchPage2.PREVIEWPATCHPAGE_NAME)){
+ if (currentPage.getName().equals(PreviewPatchPage2.PREVIEWPATCHPAGE2_NAME)){
Diff[] diffs = fPatcher.getDiffs();
PreviewPatchPage2 previewPage = (PreviewPatchPage2) currentPage;
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 4116e1c..274fbe7 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
@@ -66,7 +66,7 @@
public class PreviewPatchPage2 extends WizardPage implements IContentChangeListener {
- protected final static String PREVIEWPATCHPAGE_NAME= "PreviewPatchPage"; //$NON-NLS-1$
+ protected final static String PREVIEWPATCHPAGE2_NAME= "PreviewPatchPage2"; //$NON-NLS-1$
private PatchWizard fPatchWizard;
private PreviewPatchPageInput patcherCompareEditorInput;
private CompareConfiguration previewPatchPageConfiguration;
@@ -346,7 +346,7 @@
}
public PreviewPatchPage2(PatchWizard pw) {
- super(PREVIEWPATCHPAGE_NAME, PatchMessages.PreviewPatchPage_title, null);
+ super(PREVIEWPATCHPAGE2_NAME, PatchMessages.PreviewPatchPage_title, null);
fPatchWizard= pw;
}
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java
index 9b7e054..42ec765 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java
@@ -218,7 +218,7 @@
ISchedulingRule[] retargetedFiles = new ISchedulingRule[0];
- if (currentPage.getName().equals(PreviewPatchPage2.PREVIEWPATCHPAGE_NAME)){
+ if (currentPage.getName().equals(PreviewPatchPage2.PREVIEWPATCHPAGE2_NAME)){
Diff[] diffs = fPatcher.getDiffs();
PreviewPatchPage2 previewPage = (PreviewPatchPage2) currentPage;
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 4116e1c..274fbe7 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
@@ -66,7 +66,7 @@
public class PreviewPatchPage2 extends WizardPage implements IContentChangeListener {
- protected final static String PREVIEWPATCHPAGE_NAME= "PreviewPatchPage"; //$NON-NLS-1$
+ protected final static String PREVIEWPATCHPAGE2_NAME= "PreviewPatchPage2"; //$NON-NLS-1$
private PatchWizard fPatchWizard;
private PreviewPatchPageInput patcherCompareEditorInput;
private CompareConfiguration previewPatchPageConfiguration;
@@ -346,7 +346,7 @@
}
public PreviewPatchPage2(PatchWizard pw) {
- super(PREVIEWPATCHPAGE_NAME, PatchMessages.PreviewPatchPage_title, null);
+ super(PREVIEWPATCHPAGE2_NAME, PatchMessages.PreviewPatchPage_title, null);
fPatchWizard= pw;
}
