Attachment #71560 for bug #193012

View | Details | Raw Unified | Return to bug 193012
Collapse All | Expand All

Lines 14-20 Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java (-1 lines)
14	import org.eclipse.team.internal.ccvs.core.ICVSResource;	14	import org.eclipse.team.internal.ccvs.core.ICVSResource;
15	import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation;	15	import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation;
16	import org.eclipse.team.internal.ccvs.ui.operations.TagInRepositoryOperation;	16	import org.eclipse.team.internal.ccvs.ui.operations.TagInRepositoryOperation;
17	import org.eclipse.team.internal.ui.actions.TeamAction;
18		17
19	public class TagInRepositoryAction extends TagAction {	18	public class TagInRepositoryAction extends TagAction {
20		19

Lines 575-580 Link Here

(-)plugin.xml (+7 lines)
575	label="%FetchAllMembers.label"	575	label="%FetchAllMembers.label"
576	tooltip="%FetchAllMembers.tooltip"	576	tooltip="%FetchAllMembers.tooltip"
577	menubarPath="miscGroup"/>	577	menubarPath="miscGroup"/>
		578	<action
		579	class="org.eclipse.team.internal.ccvs.ui.actions.BranchInRepositoryAction"
		580	icon="$nl$/icons/full/elcl16/newstream_wiz.gif"
		581	id="org.eclipse.team.ccvs.ui.tagInRepository"
		582	label="&Brach..."
		583	menubarPath="tagGroup">
		584	</action>
578	</objectContribution>	585	</objectContribution>
579	<objectContribution	586	<objectContribution
580	objectClass="org.eclipse.team.internal.ccvs.core.ICVSRemoteFile"	587	objectClass="org.eclipse.team.internal.ccvs.core.ICVSRemoteFile"




/*******************************************************************************
 * 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;
    }

}




/*******************************************************************************
 * 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();
	}
}

Return to bug 193012

Added Link Here

(-)src/org/eclipse/team/internal/ccvs/ui/tags/BranchFromRemoteDialog.java (+174 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.team.internal.ccvs.ui.tags;
12
13	import org.eclipse.core.runtime.IStatus;
14	import org.eclipse.jface.dialogs.IDialogConstants;
15	import org.eclipse.jface.util.IPropertyChangeListener;
16	import org.eclipse.jface.util.PropertyChangeEvent;
17	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.events.*;
19	import org.eclipse.swt.layout.GridData;
20	import org.eclipse.swt.widgets.*;
21	import org.eclipse.team.internal.ccvs.core.CVSTag;
22	import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
23	import org.eclipse.team.internal.ccvs.ui.IHelpContextIds;
24	import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation;
25	import org.eclipse.team.internal.ui.PixelConverter;
26	import org.eclipse.team.internal.ui.SWTUtils;
27	import org.eclipse.team.internal.ui.dialogs.DetailsDialog;
28
29	public class BranchFromRemoteDialog extends DetailsDialog {
30
31	private static final int TAG_AREA_HEIGHT_HINT = 200;
32
33	private ITagOperation operation;
34
35	private Text tagText;
36	private Button moveTagButton;
37
38	private String tagName = ""; //$NON-NLS-1$
39	private boolean moveTag = false;
40
41	private TagSource tagSource;
42
43	private TagSelectionArea tagArea;
44
45	public BranchFromRemoteDialog(Shell parentShell, String title, ITagOperation operation) {
46	super(parentShell, title);
47	this.tagSource = operation.getTagSource();
48	this.operation = operation;
49	}
50
51	/**
52	* @see DetailsDialog#createMainDialogArea(Composite)
53	*/
54	protected void createMainDialogArea(Composite parent) {
55
56	final int width= convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH + 50);
57
58	final Label label = SWTUtils.createLabel(parent, "Please enter a branch name");
59	label.setLayoutData(SWTUtils.createGridData(width, SWT.DEFAULT, true, false));
60
61	tagText = new Text(parent, SWT.SINGLE \| SWT.BORDER);
62	tagText.setLayoutData(SWTUtils.createHFillGridData());
63	tagText.addModifyListener(
64	new ModifyListener() {
65	public void modifyText(ModifyEvent e) {
66	tagName = tagText.getText();
67	updateEnablements();
68	}
69	}
70	);
71
72	moveTagButton= SWTUtils.createCheckBox(parent, CVSUIMessages.TagAction_moveTag);
73	moveTagButton.addSelectionListener(new SelectionAdapter() {
74	public void widgetSelected(SelectionEvent e) {
75	moveTag = moveTagButton.getSelection();
76	}
77	});
78
79	}
80
81	/* (non-Javadoc)
82	* @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#getHelpContextId()
83	*/
84	protected String getHelpContextId() {
85	return IHelpContextIds.TAG_AS_VERSION_DIALOG;
86	}
87
88	public boolean shouldMoveTag() {
89	return moveTag;
90	}
91
92	/**
93	* @see DetailsDialog#createDropDownDialogArea(Composite)
94	*/
95	protected Composite createDropDownDialogArea(Composite parent) {
96
97	final PixelConverter converter= SWTUtils.createDialogPixelConverter(parent);
98
99	final Composite composite = new Composite(parent, SWT.NONE);
100	composite.setLayout(SWTUtils.createGridLayout(1, converter, SWTUtils.MARGINS_DIALOG));
101
102	final GridData gridData = new GridData(GridData.FILL_BOTH);
103	gridData.heightHint = TAG_AREA_HEIGHT_HINT;
104	composite.setLayoutData(gridData);
105
106	tagArea = new TagSelectionArea(getShell(), tagSource, TagSelectionArea.INCLUDE_BRANCHES, null);
107	tagArea.setTagAreaLabel(CVSUIMessages.TagAction_existingVersions);
108	tagArea.setIncludeFilterInputArea(false);
109	tagArea.createArea(composite);
110	tagArea.addPropertyChangeListener(new IPropertyChangeListener() {
111	public void propertyChange(PropertyChangeEvent event) {
112	if (event.getProperty().equals(TagSelectionArea.SELECTED_TAG)) {
113	CVSTag tag = tagArea.getSelection();
114	if (tag != null) {
115	tagText.setText(tag.getName());
116	}
117	} else if (event.getProperty().equals(TagSelectionArea.OPEN_SELECTED_TAG)) {
118	CVSTag tag = tagArea.getSelection();
119	if (tag != null) {
120	tagText.setText(tag.getName());
121	okPressed();
122	}
123	}
124	}
125	});
126	return composite;
127	}
128
129	/**
130	* Validates tag name
131	*/
132	protected void updateEnablements() {
133	String message = null;
134	if(tagName.length() == 0) {
135	message = ""; //$NON-NLS-1$
136	} else {
137	IStatus status = CVSTag.validateTagName(tagName);
138	if (!status.isOK()) {
139	message = status.getMessage();
140	}
141	}
142	setPageComplete(message == null);
143	setErrorMessage(message);
144	if (tagArea != null) {
145	tagArea.setFilter(tagName);
146	}
147	}
148
149	/**
150	* Returns the tag name entered into this dialog
151	*/
152	public String getTagName() {
153	return tagName;
154	}
155
156	/**
157	* @return
158	*/
159	public ITagOperation getOperation() {
160	operation.setTag(new CVSTag(tagName, CVSTag.BRANCH));
161	if (moveTag) {
162	operation.moveTag();
163	}
164	return operation;
165	}
166
167	/* (non-Javadoc)
168	* @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#isMainGrabVertical()
169	*/
170	protected boolean isMainGrabVertical() {
171	return false;
172	}
173
174	}