Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2002-04-15 10:41:46 -0400
committerJean Michel-Lemieux2002-04-15 10:41:46 -0400
commiteba72574cf82f05a5a646c554a7ddc23008fd8fe (patch)
treeb3045d894eb0751df0006ba5e7dbddc19b1f9e50
parent0c39e3d206a9cf29b8ef3adebbbf42a49755951a (diff)
downloadeclipse.platform.team-eba72574cf82f05a5a646c554a7ddc23008fd8fe.tar.gz
eclipse.platform.team-eba72574cf82f05a5a646c554a7ddc23008fd8fe.tar.xz
eclipse.platform.team-eba72574cf82f05a5a646c554a7ddc23008fd8fe.zip
Bug 13656: Select a Tag dialog initially has no tags
- added action specific title to selection dialog - renamed refresh to refresh from repository
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java14
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties19
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java2
5 files changed, 25 insertions, 21 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
index 9780fb5f4..54b76176c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagSelectionDialog.java
@@ -42,6 +42,10 @@ public class TagSelectionDialog extends Dialog {
private TreeViewer tagTree;
private Button okButton;
+ // dialog title, should indicate the action in which the tag selection
+ // dialog is being shown
+ private String title;
+
// constants
private static final int SIZING_DIALOG_WIDTH = 400;
private static final int SIZING_DIALOG_HEIGHT = 250;
@@ -50,9 +54,10 @@ public class TagSelectionDialog extends Dialog {
* Creates a new TagSelectionDialog.
* @param resource The resource to select a version for.
*/
- public TagSelectionDialog(Shell parentShell, IProject[] projects) {
+ public TagSelectionDialog(Shell parentShell, IProject[] projects, String title) {
super(parentShell);
this.projects = projects;
+ this.title = title;
setShellStyle(getShellStyle() | SWT.RESIZE);
}
@@ -61,9 +66,7 @@ public class TagSelectionDialog extends Dialog {
*/
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText(Policy.bind("TagSelectionDialog.Select_a_Tag_1")); //$NON-NLS-1$
- // set F1 help
- //WorkbenchHelp.setHelp(newShell, new Object[] {IVCMHelpContextIds.VERSION_SELECTION_DIALOG});
+ newShell.setText(title);
}
/**
@@ -119,6 +122,9 @@ public class TagSelectionDialog extends Dialog {
GridLayout layout = new GridLayout();
inner.setLayout(layout);
+ Label l = new Label (inner, SWT.NONE);
+ l.setText(Policy.bind("TagSelectionDialog.Select_a_Tag_1")); //$NON-NLS-1$
+
tagTree = createTree(inner);
tagTree.setInput(new ProjectElement(CVSWorkspaceRoot.getCVSFolderFor(projects[0]), true /*show HEAD tag*/));
Runnable refresh = new Runnable() {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
index 6d2a4fad5..d39cd68de 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
@@ -50,7 +50,7 @@ public class CompareWithTagAction extends TeamAction {
for (int i = 0; i < resources.length; i++) {
projects[i] = resources[i].getProject();
}
- TagSelectionDialog dialog = new TagSelectionDialog(getShell(), projects);
+ TagSelectionDialog dialog = new TagSelectionDialog(getShell(), projects, Policy.bind("CompareWithTagAction.message")); //$NON-NLS-1$
dialog.setBlockOnOpen(true);
int result = dialog.open();
if (result == Dialog.CANCEL || dialog.getResult() == null) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java
index b123ab31a..de5a9e7c1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java
@@ -26,6 +26,7 @@ import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
import org.eclipse.team.internal.ccvs.core.CVSTag;
import org.eclipse.team.internal.ccvs.core.CVSTeamProvider;
+import org.eclipse.team.internal.ccvs.core.ICVSFolder;
import org.eclipse.team.internal.ccvs.core.ICVSResource;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.ui.Policy;
@@ -73,7 +74,7 @@ public class ReplaceWithTagAction extends ReplaceWithAction {
for (int i = 0; i < resources.length; i++) {
projects[i] = resources[i].getProject();
}
- TagSelectionDialog dialog = new TagSelectionDialog(getShell(), projects);
+ TagSelectionDialog dialog = new TagSelectionDialog(getShell(), projects, Policy.bind("ReplaceWithTagAction.message")); //$NON-NLS-1$
dialog.setBlockOnOpen(true);
if (dialog.open() == Dialog.CANCEL) {
return;
@@ -150,7 +151,11 @@ public class ReplaceWithTagAction extends ReplaceWithAction {
}
type = resource.getType();
ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
- if ( ! cvsResource.isManaged()) return false;
+ if(cvsResource.isFolder()) {
+ if( ! ((ICVSFolder)cvsResource).isCVSFolder()) return false;
+ } else {
+ if( ! cvsResource.isManaged()) return false;
+ }
}
return true;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index c21cb10d4..cff32cbb2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -211,6 +211,7 @@ CompareWithRevisionAction.noRevisions=No Revisions
CompareWithRevisionAction.noRevisionsLong=The selected resource has no revisions to compare with.
CompareWithRevisionAction.fetching=Fetching revisions from repository...
+CompareWithTagAction.message=Compare with Tag
CompareWithTagAction.replace=Error Comparing With Tag
CompareWithTagAction.noRemote=No Remote Resource
CompareWithTagAction.noRemoteLong=The selected tag has no remote resource to compare with.
@@ -356,6 +357,7 @@ RemoveRootAction.removeRoot=Error Discarding Location
RemoveBranchTagAction.removeTag=Discard Branch
RemoveModuleVersionAction.removeTag=Discard Version
+ReplaceWithTagAction.message=Replace with Tag
ReplaceWithTagAction.replace=Error Replacing With Tag
ReplaceWithTagAction.replacing=Replacing with tag {0}
ReplaceWithTagAction.mixingTags=You are mixing tags within a project. \
@@ -549,16 +551,7 @@ Run_update_4=Run update
Do_nothing_5=Do nothing
Validate_Connection_on_Finish_7=Validate Location on Finish
-TagSelectionDialog.Select_a_Tag_1=Select a Tag
-TagSelectionDialog.Use_Defined_Tag__2=Use Defined Tag:
-TagSelectionDialog.Use_User-Specified_Tag__3=Use User-Specified Tag:
-TagSelectionDialog.Tag_name__4=Tag name:
-TagSelectionDialog.Tag_type__5=Tag type:
-TagSelectionDialog.Version_6=Version
-TagSelectionDialog.Branch_7=Branch
-TagSelectionDialog.Please_select_a_tag_9=Please select a tag
-TagSelectionDialog.preparing=Preparing to fetch tags
-TagSelectionDialog.fetching=Fetching tags
+TagSelectionDialog.Select_a_Tag_1=Select a Tag:
UpdateSyncAction.Conflicting_changes_found_1=Conflicting changes found
UpdateSyncAction.You_have_local_changes_you_are_about_to_overwrite_2=You have local changes you are about to overwrite
@@ -640,8 +633,8 @@ CVSPreferencePage.level9=9 (highest compression)
TagConfigurationDialog.1=Tag Configuration for {0}
TagConfigurationDialog.2=Tag Configuration for {0} projects
-TagConfigurationDialog.4=Use this dialog to configure the branch and version tags you will see in the workbench for these projects. Browse the CVS files and select the tags that you want remembered. In addition, you can configure which files are automatically examined for new tags when tag lists are refreshed
-TagConfigurationDialog.5=Browse and select files in which to look for tags:
+TagConfigurationDialog.4=Use this dialog to configure the branch and version tags you will see in the workbench for these projects. Browse the CVS files and select the tags that you want remembered. In addition, you can configure which files are automatically examined for new tags when tag lists are refreshed.
+TagConfigurationDialog.5=Browse files for tags:
TagConfigurationDialog.6=New tags found in the selected files:
TagConfigurationDialog.7=Remembered tags for these projects:
TagConfigurationDialog.8=&Add Checked Tags
@@ -653,7 +646,7 @@ TagConfigurationDialog.13=&Remove
TagConfigurationDialog.14=Error fetching tags from remote CVS files
TagConfigurationDialog.15=This will fetch tags from the repository that are defined on the following files:
TagConfigurationDialog.19=If expected tags do not appear try using the configure tags dialogs to customize the tags associated with this project
-TagConfigurationDialog.20=&Refresh
+TagConfigurationDialog.20=&Refresh from Repository
TagConfigurationDialog.21=&Configure Tags
ChangeListener.Deleting_CVS_folders_1=Deleting CVS folders
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
index ce742edd6..87f8f449e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
@@ -89,7 +89,7 @@ public class SharingWizard extends Wizard implements IConfigurationWizard {
createLocationPage.setDialogSettings(getDialogSettings());
modulePage = new ModuleSelectionPage("modulePage", Policy.bind("SharingWizard.enterModuleName"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
addPage(modulePage);
- finishPage = new SharingWizardFinishPage("finishPage", Policy.bind("SharingWizard.readyToFinish"), sharingImage); //$NON-NLS-1$
+ finishPage = new SharingWizardFinishPage("finishPage", Policy.bind("SharingWizard.readyToFinish"), sharingImage); //$NON-NLS-1$ //$NON-NLS-2$
addPage(finishPage);
}
}

Back to the top