diff options
2 files changed, 2 insertions, 70 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java index a2a916a8b..d21de3069 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java @@ -21,6 +21,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.Wizard; import org.eclipse.team.internal.ccvs.core.ICVSFolder; +import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; @@ -33,7 +34,6 @@ public class UpdateWizard extends Wizard { private IResource[] resources; private final IWorkbenchPart part; - private UpdateWizardPage optionsPage; private TagSelectionWizardPage tagSelectionPage; public UpdateWizard(IWorkbenchPart part, IResource[] resources) { @@ -44,14 +44,10 @@ public class UpdateWizard extends Wizard { public void addPages() { ImageDescriptor substImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_CHECKOUT); - tagSelectionPage = new TagSelectionWizardPage("tagPage", "Select Tag", substImage, "Select the tag for the update", null /* no laqbel */, ProjectElement.INCLUDE_ALL_TAGS); //$NON-NLS-1$ tagSelectionPage.setAllowNoTag(true); tagSelectionPage.setFolders(getCVSFolders()); addPage(tagSelectionPage); - - optionsPage = new UpdateWizardPage("updatePage", Policy.bind("UpdateWizard.updatePage"), substImage); //$NON-NLS-1$ //$NON-NLS-2$ - addPage(optionsPage); } private ICVSFolder[] getCVSFolders() { @@ -74,7 +70,7 @@ public class UpdateWizard extends Wizard { */ public boolean performFinish() { try { - new UpdateOperation(part, resources, optionsPage.getLocalOptions(), tagSelectionPage.getSelectedTag()).run(); + new UpdateOperation(part, resources, Command.NO_LOCAL_OPTIONS, tagSelectionPage.getSelectedTag()).run(); } catch (InvocationTargetException e) { CVSUIPlugin.openError(getShell(), null, null, e); return false; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java deleted file mode 100644 index 97a733a26..000000000 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizardPage.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.internal.ccvs.ui.wizards; - - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; -import org.eclipse.team.internal.ccvs.core.client.Update; -import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; -import org.eclipse.team.internal.ccvs.ui.Policy; - -public class UpdateWizardPage extends CVSWizardPage { - - private Button fetchAbsentDirectories; - private Button pruneEmptyFolders; - - public UpdateWizardPage(String pageName, String title, ImageDescriptor titleImage) { - super(pageName, title, titleImage); - setDescription(Policy.bind("UpdateWizardPage.description")); - } - - /* - * @see IDialogPage#createControl(Composite) - */ - public void createControl(Composite parent) { - Composite composite = createComposite(parent, 2); - fetchAbsentDirectories = createCheckBox(composite, "&Fetch absent directories"); - pruneEmptyFolders = createCheckBox(composite, "&Prune empty directories"); - initializeValues(); - - Dialog.applyDialogFont(parent); - setControl(composite); - } - - private void initializeValues() { - fetchAbsentDirectories.setSelection(true); - pruneEmptyFolders.setSelection(CVSProviderPlugin.getPlugin().getPruneEmptyDirectories()); - } - - public LocalOption[] getLocalOptions() { - List localOptions = new ArrayList(); - if (fetchAbsentDirectories.getSelection()) { - localOptions.add(Update.RETRIEVE_ABSENT_DIRECTORIES); - } - if (pruneEmptyFolders.getSelection()) { - localOptions.add(Update.PRUNE_EMPTY_DIRECTORIES); - } - return (LocalOption[]) localOptions.toArray(new LocalOption[localOptions.size()]); - } -} |