### Eclipse Workspace Patch 1.0
#P org.eclipse.team.cvs.ui
Index: src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java,v
retrieving revision 1.20
diff -u -r1.20 TagInRepositoryAction.java
--- src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java	21 Jun 2006 19:11:14 -0000	1.20
+++ src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java	17 Jun 2007 03:04:44 -0000
@@ -14,7 +14,6 @@
 import org.eclipse.team.internal.ccvs.core.ICVSResource;
 import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation;
 import org.eclipse.team.internal.ccvs.ui.operations.TagInRepositoryOperation;
-import org.eclipse.team.internal.ui.actions.TeamAction;
 
 public class TagInRepositoryAction extends TagAction {
 
Index: plugin.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/plugin.xml,v
retrieving revision 1.278
diff -u -r1.278 plugin.xml
--- plugin.xml	7 May 2007 15:51:30 -0000	1.278
+++ plugin.xml	17 Jun 2007 03:04:44 -0000
@@ -575,6 +575,13 @@
                label="%FetchAllMembers.label"
                tooltip="%FetchAllMembers.tooltip"
                menubarPath="miscGroup"/>
+         <action
+               class="org.eclipse.team.internal.ccvs.ui.actions.BranchInRepositoryAction"
+               icon="$nl$/icons/full/elcl16/newstream_wiz.gif"
+               id="org.eclipse.team.ccvs.ui.tagInRepository"
+               label="&amp;Brach..."
+               menubarPath="tagGroup">
+         </action>
       </objectContribution>
       <objectContribution
             objectClass="org.eclipse.team.internal.ccvs.core.ICVSRemoteFile"
Index: src/org/eclipse/team/internal/ccvs/ui/tags/BranchFromRemoteDialog.java
===================================================================
RCS file: src/org/eclipse/team/internal/ccvs/ui/tags/BranchFromRemoteDialog.java
diff -N src/org/eclipse/team/internal/ccvs/ui/tags/BranchFromRemoteDialog.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/team/internal/ccvs/ui/tags/BranchFromRemoteDialog.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,174 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.team.internal.ccvs.ui.tags;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.team.internal.ccvs.core.CVSTag;
+import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
+import org.eclipse.team.internal.ccvs.ui.IHelpContextIds;
+import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation;
+import org.eclipse.team.internal.ui.PixelConverter;
+import org.eclipse.team.internal.ui.SWTUtils;
+import org.eclipse.team.internal.ui.dialogs.DetailsDialog;
+
+public class BranchFromRemoteDialog extends DetailsDialog {
+
+    private static final int TAG_AREA_HEIGHT_HINT = 200;
+    
+	private ITagOperation operation;
+	
+	private Text tagText;
+	private Button moveTagButton;
+	
+	private String tagName = ""; //$NON-NLS-1$
+	private boolean moveTag = false;
+
+    private TagSource tagSource;
+
+    private TagSelectionArea tagArea;
+	
+	public BranchFromRemoteDialog(Shell parentShell, String title, ITagOperation operation) {
+		super(parentShell, title);
+		this.tagSource = operation.getTagSource();
+		this.operation = operation;
+	}
+	
+	/**
+	 * @see DetailsDialog#createMainDialogArea(Composite)
+	 */
+	protected void createMainDialogArea(Composite parent) {
+		
+		final int width= convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH + 50);
+		
+		final Label label = SWTUtils.createLabel(parent, "Please enter a branch name"); 
+		label.setLayoutData(SWTUtils.createGridData(width, SWT.DEFAULT, true, false));
+
+		tagText = new Text(parent, SWT.SINGLE | SWT.BORDER);
+		tagText.setLayoutData(SWTUtils.createHFillGridData());
+		tagText.addModifyListener(
+			new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					tagName = tagText.getText();
+					updateEnablements();
+				}
+			}
+		);
+		
+		moveTagButton= SWTUtils.createCheckBox(parent, CVSUIMessages.TagAction_moveTag); 
+		moveTagButton.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				moveTag = moveTagButton.getSelection();
+			}
+		});
+
+	}
+
+    /* (non-Javadoc)
+     * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#getHelpContextId()
+     */
+    protected String getHelpContextId() {
+        return IHelpContextIds.TAG_AS_VERSION_DIALOG;
+    }
+
+	public boolean shouldMoveTag()  {
+		return moveTag;
+	}
+	
+	/**
+	 * @see DetailsDialog#createDropDownDialogArea(Composite)
+	 */
+	protected Composite createDropDownDialogArea(Composite parent) {
+		
+		final PixelConverter converter= SWTUtils.createDialogPixelConverter(parent);
+		
+		final Composite composite = new Composite(parent, SWT.NONE);
+	    composite.setLayout(SWTUtils.createGridLayout(1, converter, SWTUtils.MARGINS_DIALOG));
+	    
+	    final GridData gridData = new GridData(GridData.FILL_BOTH);
+	    gridData.heightHint = TAG_AREA_HEIGHT_HINT;
+	    composite.setLayoutData(gridData);
+		
+		tagArea = new TagSelectionArea(getShell(), tagSource, TagSelectionArea.INCLUDE_BRANCHES, null);
+		tagArea.setTagAreaLabel(CVSUIMessages.TagAction_existingVersions);  
+		tagArea.setIncludeFilterInputArea(false);
+		tagArea.createArea(composite);
+		tagArea.addPropertyChangeListener(new IPropertyChangeListener() {
+            public void propertyChange(PropertyChangeEvent event) {
+                if (event.getProperty().equals(TagSelectionArea.SELECTED_TAG)) {
+                    CVSTag tag = tagArea.getSelection();
+                    if (tag != null) {
+                        tagText.setText(tag.getName());
+                    }
+                } else if (event.getProperty().equals(TagSelectionArea.OPEN_SELECTED_TAG)) {
+                    CVSTag tag = tagArea.getSelection();
+                    if (tag != null) {
+                        tagText.setText(tag.getName());
+                        okPressed();
+                    }
+                }
+            }
+        });
+		return composite;
+	}
+	
+	/**
+	 * Validates tag name
+	 */
+	protected void updateEnablements() {
+		String message = null;
+		if(tagName.length() == 0) {
+			message = ""; //$NON-NLS-1$
+		} else {		
+			IStatus status = CVSTag.validateTagName(tagName);
+			if (!status.isOK()) {
+				message = status.getMessage();
+			}
+		}
+		setPageComplete(message == null);
+		setErrorMessage(message);
+		if (tagArea != null) {
+		    tagArea.setFilter(tagName);
+		}
+	}
+	
+	/**
+	 * Returns the tag name entered into this dialog
+	 */
+	public String getTagName() {
+		return tagName;
+	}
+	
+	/**
+	 * @return
+	 */
+	public ITagOperation getOperation() {
+		operation.setTag(new CVSTag(tagName, CVSTag.BRANCH));
+		if (moveTag) {
+			operation.moveTag();
+		}
+		return operation;
+	}
+	
+	/* (non-Javadoc)
+     * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#isMainGrabVertical()
+     */
+    protected boolean isMainGrabVertical() {
+        return false;
+    }
+
+}
Index: src/org/eclipse/team/internal/ccvs/ui/actions/BranchInRepositoryAction.java
===================================================================
RCS file: src/org/eclipse/team/internal/ccvs/ui/actions/BranchInRepositoryAction.java
diff -N src/org/eclipse/team/internal/ccvs/ui/actions/BranchInRepositoryAction.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/team/internal/ccvs/ui/actions/BranchInRepositoryAction.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.team.internal.ccvs.ui.actions;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialogWithToggle;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.window.Window;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
+import org.eclipse.team.internal.ccvs.core.ICVSResource;
+import org.eclipse.team.internal.ccvs.ui.*;
+import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation;
+import org.eclipse.team.internal.ccvs.ui.operations.TagInRepositoryOperation;
+import org.eclipse.team.internal.ccvs.ui.tags.BranchFromRemoteDialog;
+
+public class BranchInRepositoryAction extends TagAction {
+
+	/**
+	 * @see TeamAction#isEnabled()
+	 */
+	public boolean isEnabled() {
+		ICVSResource[] resources = getSelectedCVSResources();
+		if (resources.length == 0) return false;
+		for (int i = 0; i < resources.length; i++) {
+			if (resources[i] instanceof ICVSRepositoryLocation) return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * @see CVSAction#needsToSaveDirtyEditors()
+	 */
+	protected boolean needsToSaveDirtyEditors() {
+		return false;
+	}
+	
+	/**
+	 * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#requiresLocalSyncInfo()
+	 */
+	protected boolean requiresLocalSyncInfo() {
+		return false;
+	}
+
+	protected ITagOperation createTagOperation() {
+		return new TagInRepositoryOperation(getTargetPart(), getSelectedRemoteResources());
+	}
+	
+	protected ITagOperation configureOperation() {
+		IPreferenceStore store = CVSUIPlugin.getPlugin().getPreferenceStore();
+		ITagOperation operation = createTagOperation();
+		if (operation.isEmpty()) {
+		    return null;
+		}
+		if (!performPrompting(operation)) {
+			return null;
+		}
+		BranchFromRemoteDialog dialog = new BranchFromRemoteDialog(getShell(),
+											"Create branch from existing version", 
+											operation);
+		if (dialog.open() != Window.OK) return null;
+
+		// The user has indicated they want to force a move.  Make sure they really do.		
+		if (dialog.shouldMoveTag() && store.getBoolean(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG))  {
+			MessageDialogWithToggle confirmDialog = MessageDialogWithToggle.openYesNoQuestion(getShell(), 
+				CVSUIMessages.TagAction_moveTagConfirmTitle,  
+				NLS.bind(CVSUIMessages.TagAction_moveTagConfirmMessage, new String[] { dialog.getTagName() }), 
+				null,
+				false,
+				null,
+				null);
+			
+			if (confirmDialog.getReturnCode() == IDialogConstants.YES_ID)  {
+				store.setValue(ICVSUIConstants.PREF_CONFIRM_MOVE_TAG, !confirmDialog.getToggleState());
+			} else  {
+				return null;
+			}
+		}
+		
+		// The user is a cowboy and wants to do it.
+		return dialog.getOperation();
+	}
+}