diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java')
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java index b4410999e..cd22913fa 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java @@ -582,11 +582,11 @@ public class GenerateDiffFileWizard extends Wizard { * Ensure the page is in a valid state. */ /*if (!validatePage()) { - store.storeRadioSelection(CLIPBOARD); - initializeDefaultValues(); - validatePage(); - } - pageValid= true;*/ + store.storeRadioSelection(CLIPBOARD); + initializeDefaultValues(); + validatePage(); + } + pageValid= true;*/ validatePage(); updateEnablements(); @@ -1045,7 +1045,7 @@ public class GenerateDiffFileWizard extends Wizard { public final static int FORMAT_STANDARD = 3; /** - The possible root of the patch + The possible root of the patch */ public final static int ROOT_WORKSPACE = 1; public final static int ROOT_PROJECT = 2; @@ -1303,11 +1303,11 @@ public class GenerateDiffFileWizard extends Wizard { public LocalOption[] getOptions() { List<LocalOption> options = new ArrayList<>(5); /* if(includeNewFilesOptions.getSelection()) { - options.add(Diff.INCLUDE_NEWFILES); - } - if(!recurseOption.getSelection()) { - options.add(Command.DO_NOT_RECURSE); - }*/ + options.add(Diff.INCLUDE_NEWFILES); + } + if(!recurseOption.getSelection()) { + options.add(Command.DO_NOT_RECURSE); + }*/ //Add new files for now options.add(Diff.INCLUDE_NEWFILES); @@ -1545,11 +1545,11 @@ public class GenerateDiffFileWizard extends Wizard { defaultValuesStore.storeLocationSelection(LocationPage.WORKSPACE); defaultValuesStore.storeWorkspacePath(workspaceResource); /* try { - workspaceResource.getParent().refreshLocal(IResource.DEPTH_ONE, null); - } catch(CoreException e) { - CVSUIPlugin.openError(getShell(), CVSUIMessages.GenerateCVSDiff_error, null, e); - return false; - } */ + workspaceResource.getParent().refreshLocal(IResource.DEPTH_ONE, null); + } catch(CoreException e) { + CVSUIPlugin.openError(getShell(), CVSUIMessages.GenerateCVSDiff_error, null, e); + return false; + } */ } else { //Problem with workspace location, open with clipboard next time defaultValuesStore.storeLocationSelection(LocationPage.CLIPBOARD); |