Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-03-06 19:06:34 +0000
committerMichael Valenta2002-03-06 19:06:34 +0000
commit335283507f5477b5375c4e2e9450e58d69c9b800 (patch)
tree51e6f590cb28d94976147b702e9eb246c8462983
parent73062cab7185a62f8e4f9494f6b9603b5ee9d803 (diff)
downloadeclipse.platform.team-335283507f5477b5375c4e2e9450e58d69c9b800.tar.gz
eclipse.platform.team-335283507f5477b5375c4e2e9450e58d69c9b800.tar.xz
eclipse.platform.team-335283507f5477b5375c4e2e9450e58d69c9b800.zip
10769: Tagging errors not shown to user
-rw-r--r--bundles/org.eclipse.team.cvs.core/plugin.xml38
-rw-r--r--bundles/org.eclipse.team.cvs.core/plugin.xml.off59
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java1
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java10
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Tag.java11
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java48
-rw-r--r--bundles/org.eclipse.team.cvs.ui/plugin.xml356
-rw-r--r--bundles/org.eclipse.team.cvs.ui/plugin.xml.off378
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java46
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties6
10 files changed, 506 insertions, 447 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/plugin.xml b/bundles/org.eclipse.team.cvs.core/plugin.xml
index 219587b21..4148be8c2 100644
--- a/bundles/org.eclipse.team.cvs.core/plugin.xml
+++ b/bundles/org.eclipse.team.cvs.core/plugin.xml
@@ -18,4 +18,42 @@
</library>
</runtime>
+ <!-- *************** Extension Points **************** -->
+ <extension-point name="Authenticator" id="authenticator"/>
+ <extension-point name="ConnectionMethods" id="connectionmethods"/>
+
+ <!-- *************** Conection Methods **************** -->
+ <extension id="pserver" point="org.eclipse.team.cvs.core.connectionmethods">
+ <adapter>
+ <run class="org.eclipse.team.internal.ccvs.core.connection.PServerConnectionMethod">
+ <parameter name="trace" value="false" />
+ </run>
+ </adapter>
+ </extension>
+
+ <extension id="ext" point="org.eclipse.team.cvs.core.connectionmethods">
+ <adapter>
+ <run class="org.eclipse.team.internal.ccvs.core.connection.ExtConnectionMethod">
+ <parameter name="trace" value="false" />
+ </run>
+ </adapter>
+ </extension>
+
+ <!-- *************** Team Provider **************** -->
+ <extension id="CVSProvider" point="org.eclipse.team.core.providers">
+ <providers natureId="org.eclipse.team.cvs.core.cvsnature"/>
+ </extension>
+
+ <!-- *************** Project Nature **************** -->
+ <extension point="org.eclipse.core.resources.natures" id="cvsnature" name="%cvsNature">
+ <runtime>
+ <run class="org.eclipse.team.ccvs.core.CVSTeamProvider"/>
+ </runtime>
+ </extension>
+
+ <!-- *************** Resource patterns ignored by CVS **************** -->
+ <extension point="org.eclipse.team.core.ignore">
+ <ignore pattern = ".#*" selected = "true"/>
+ </extension>
+
</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.core/plugin.xml.off b/bundles/org.eclipse.team.cvs.core/plugin.xml.off
deleted file mode 100644
index 94296332d..000000000
--- a/bundles/org.eclipse.team.cvs.core/plugin.xml.off
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
- name="%pluginName"
- id="org.eclipse.team.cvs.core"
- version="2.0.0"
- class="org.eclipse.team.ccvs.core.CVSProviderPlugin"
- provider-name="Object Technology International, Inc.">
-
- <requires>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.team.core"/>
- <import plugin="org.apache.xerces"/>
- </requires>
-
- <runtime>
- <library name="cvs.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <!-- *************** Extension Points **************** -->
- <extension-point name="Authenticator" id="authenticator"/>
- <extension-point name="ConnectionMethods" id="connectionmethods"/>
-
- <!-- *************** Conection Methods **************** -->
- <extension id="pserver" point="org.eclipse.team.cvs.core.connectionmethods">
- <adapter>
- <run class="org.eclipse.team.internal.ccvs.core.connection.PServerConnectionMethod">
- <parameter name="trace" value="false" />
- </run>
- </adapter>
- </extension>
-
- <extension id="ext" point="org.eclipse.team.cvs.core.connectionmethods">
- <adapter>
- <run class="org.eclipse.team.internal.ccvs.core.connection.ExtConnectionMethod">
- <parameter name="trace" value="false" />
- </run>
- </adapter>
- </extension>
-
- <!-- *************** Team Provider **************** -->
- <extension id="CVSProvider" point="org.eclipse.team.core.providers">
- <providers natureId="org.eclipse.team.cvs.core.cvsnature"/>
- </extension>
-
- <!-- *************** Project Nature **************** -->
- <extension point="org.eclipse.core.resources.natures" id="cvsnature" name="%cvsNature">
- <runtime>
- <run class="org.eclipse.team.ccvs.core.CVSTeamProvider"/>
- </runtime>
- </extension>
-
- <!-- *************** Resource patterns ignored by CVS **************** -->
- <extension point="org.eclipse.team.core.ignore">
- <ignore pattern = ".#*" selected = "true"/>
- </extension>
-
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
index ffdf18529..8e6c2ee2b 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
@@ -19,6 +19,7 @@ public class CVSStatus extends Status {
public static final int NO_SUCH_TAG = -11;
public static final int CONFLICT = -12;
public static final int ERROR_LINE = -14; // generic uninterpreted E line from the server
+ public static final int TAG_ALREADY_EXISTS = -15;
// Path for resource related status
private IPath path;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
index 74ca3cf4c..4fe5420b3 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
@@ -960,8 +960,15 @@ public class CVSTeamProvider implements ITeamNature, ITeamProvider {
/**
* Tag the resources in the CVS repository with the given tag.
+ *
+ * The returned IStatus will be a status containing any errors or warnings.
+ * If the returned IStatus is a multi-status, the code indicates the severity.
+ * Possible codes are:
+ * CVSStatus.OK - Nothing to report
+ * CVSStatus.SERVER_ERROR - The server reported an error
+ * any other code - warning messages received from the server
*/
- public void tag(IResource[] resources, int depth, CVSTag tag, IProgressMonitor progress) throws TeamException {
+ public IStatus tag(IResource[] resources, int depth, CVSTag tag, IProgressMonitor progress) throws TeamException {
// Build the local options
List localOptions = new ArrayList();
@@ -993,6 +1000,7 @@ public class CVSTeamProvider implements ITeamNature, ITeamProvider {
if (status.getCode() == CVSStatus.SERVER_ERROR) {
throw new CVSServerException(status);
}
+ return status;
}
/**
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Tag.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Tag.java
index cccc97108..96257a379 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Tag.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Tag.java
@@ -14,13 +14,16 @@ import org.eclipse.team.internal.ccvs.core.Policy;
import org.eclipse.team.internal.ccvs.core.client.Command.GlobalOption;
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
import org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener;
+import org.eclipse.team.internal.ccvs.core.client.listeners.TagListener;
import org.eclipse.team.internal.ccvs.core.resources.ICVSResource;
-import org.eclipse.team.internal.ccvs.core.util.Assert;
public class Tag extends Command {
/*** Local options: specific to tag ***/
public static final LocalOption CREATE_BRANCH = new LocalOption("-b", null); //$NON-NLS-1$
+ /*** Default command output listener ***/
+ private static final ICommandOutputListener DEFAULT_OUTPUT_LISTENER = new TagListener();
+
// handle added and removed resources in a special way
private boolean customBehaviorEnabled;
@@ -70,7 +73,11 @@ public class Tag extends Command {
return execute(session, globalOptions, localOptions, newArguments, listener, monitor);
}
-
+
+ protected ICommandOutputListener getDefaultCommandOutputListener() {
+ return DEFAULT_OUTPUT_LISTENER;
+ }
+
protected void sendLocalResourceState(Session session, GlobalOption[] globalOptions,
LocalOption[] localOptions, ICVSResource[] resources, IProgressMonitor monitor)
throws CVSException {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java
new file mode 100644
index 000000000..559f9973d
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java
@@ -0,0 +1,48 @@
+package org.eclipse.team.internal.ccvs.core.client.listeners;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2002.
+ * All Rights Reserved.
+ */
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.team.ccvs.core.CVSStatus;
+import org.eclipse.team.internal.ccvs.core.resources.ICVSFolder;
+
+public class TagListener implements ICommandOutputListener {
+
+ /*
+ * @see ICommandOutputListener#messageLine(String, ICVSFolder, IProgressMonitor)
+ */
+ public IStatus messageLine(
+ String line,
+ ICVSFolder commandRoot,
+ IProgressMonitor monitor) {
+
+ // Received a warning in the form:
+ // W folder/file : v1 already exists on version 1.2 : NOT MOVING tag to version 1.3
+ if( line.charAt(0) == 'W' ) {
+ return new CVSStatus(CVSStatus.WARNING, CVSStatus.TAG_ALREADY_EXISTS, line.substring(2));
+ }
+
+ return OK;
+ }
+
+ /*
+ * @see ICommandOutputListener#errorLine(String, ICVSFolder, IProgressMonitor)
+ */
+ public IStatus errorLine(
+ String line,
+ ICVSFolder commandRoot,
+ IProgressMonitor monitor) {
+
+ // Ignore the lines: Tagging folder1/folder2
+ if( line.startsWith("cvs server: Tagging") ) {
+ return OK;
+ }
+
+ return new CVSStatus(CVSStatus.ERROR, CVSStatus.ERROR_LINE, line);
+ }
+
+}
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.xml b/bundles/org.eclipse.team.cvs.ui/plugin.xml
index eaef97ba0..11d7679a0 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.xml
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.xml
@@ -19,4 +19,360 @@
<runtime>
<library name="teamcvsui.jar"/>
</runtime>
+
+ <!-- *************** Authenticator **************** -->
+ <extension point="org.eclipse.team.cvs.core.authenticator">
+ <authenticator>
+ <run class="org.eclipse.team.internal.ccvs.ui.WorkbenchUserAuthenticator"/>
+ </authenticator>
+ </extension>
+
+ <!-- ******************* Wizards ****************** -->
+ <extension point="org.eclipse.team.ui.configurationWizards">
+ <wizard
+ name="%SharingWizard.name"
+ icon="icons/full/wizards/newconnect_wiz.gif"
+ class="org.eclipse.team.internal.ccvs.ui.wizards.SharingWizard"
+ id="org.eclipse.team.ccvs.ui.SharingWizard">
+ </wizard>
+ </extension>
+
+ <!-- ************** Property Pages *************** -->
+ <extension point="org.eclipse.ui.propertyPages">
+ <page name="%CVS" id="org.eclipse.team.ccvs.ui.propertyPages.CVSFilePropertiesPage"
+ objectClass="org.eclipse.core.resources.IFile"
+ class="org.eclipse.team.internal.ccvs.ui.CVSFilePropertiesPage" adaptable="true">
+ <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
+ </page>
+ <page name="%CVS" id="org.eclipse.team.ccvs.ui.propertyPages.CVSPropertiesPage"
+ objectClass="org.eclipse.core.resources.IProject"
+ class="org.eclipse.team.internal.ccvs.ui.CVSPropertiesPage" adaptable="true">
+ <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
+ </page>
+ </extension>
+
+ <!-- ******************* Menus ******************** -->
+ <extension point="org.eclipse.ui.popupMenus">
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.ResourceContributions"
+ objectClass="org.eclipse.core.resources.IResource" adaptable="true">
+ <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.tag"
+ label="%TagAction.label"
+ tooltip="%TagAction.tooltip"
+ menubarPath="team.main/group2"
+ class="org.eclipse.team.internal.ccvs.ui.actions.TagAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.add"
+ label="%AddAction.label"
+ tooltip="%AddAction.tooltip"
+ menubarPath="team.main/group2"
+ class="org.eclipse.team.internal.ccvs.ui.actions.AddAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.compareWithRemote"
+ label="%CompareWithRemoteAction.label"
+ tooltip="%CompareWithRemoteAction.tooltip"
+ menubarPath="compareWithMenu/compareWithGroup"
+ class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithRemoteAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.update"
+ label="%UpdateAction.label"
+ tooltip="%UpdateAction.tooltip"
+ menubarPath="team.main/group2"
+ class="org.eclipse.team.internal.ccvs.ui.actions.UpdateAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.replace"
+ label="%ReplaceWithAction.label"
+ tooltip="%ReplaceWithAction.tooltip"
+ menubarPath="replaceWithMenu/replaceWithGroup"
+ class="org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithRemoteAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.commit"
+ label="%CommitAction.label"
+ tooltip="%CommitAction.tooltip"
+ menubarPath="team.main/group2"
+ class="org.eclipse.team.internal.ccvs.ui.actions.CommitAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.ignore"
+ label="%IgnoreAction.label"
+ tooltip="%IgnoreAction.tooltip"
+ menubarPath="team.main/group1"
+ class="org.eclipse.team.internal.ccvs.ui.actions.IgnoreAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.GenerateDiff"
+ label="%GenerateDiff.label"
+ tooltip="%GenerateDiff.tooltip"
+ menubarPath="team.main/group1"
+ class="org.eclipse.team.internal.ccvs.ui.actions.GenerateDiffFileAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.showHistory"
+ label="%ShowHistoryAction.label"
+ tooltip="%ShowHistoryAction.tooltip"
+ menubarPath="team.main/group1"
+ class="org.eclipse.team.internal.ccvs.ui.actions.ShowResourceInHistoryAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.sync"
+ label="%Synchronize.label"
+ tooltip="%Synchronize.tooltip"
+ menubarPath="team.main/group1"
+ class="org.eclipse.team.internal.ccvs.ui.actions.SyncAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.IProjectContributions"
+ objectClass="org.eclipse.core.resources.IProject" adaptable="true">
+ <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.compareWithTag"
+ label="%CompareWithTagAction.label"
+ tooltip="%CompareWithTagAction.tooltip"
+ menubarPath="compareWithMenu/compareWithGroup"
+ class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithTagAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.merge"
+ label="%MergeAction.label"
+ tooltip="%MergeAction.tooltip"
+ menubarPath="team.main/group1"
+ class="org.eclipse.team.internal.ccvs.ui.actions.MergeAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.branch"
+ label="%BranchAction.label"
+ tooltip="%BranchAction.tooltip"
+ menubarPath="team.main/group1"
+ class="org.eclipse.team.internal.ccvs.ui.actions.BranchAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.IContainerContributions"
+ objectClass="org.eclipse.core.resources.IContainer" adaptable="true">
+ <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.replaceWithTag"
+ label="%ReplaceWithTagAction.label"
+ tooltip="%ReplaceWithTagAction.tooltip"
+ menubarPath="replaceWithMenu/replaceWithGroup"
+ class="org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithTagAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.unmanage"
+ label="%UnmanageFolder.label"
+ tooltip="%UnmanageFolder.tooltip"
+ menubarPath="team.main/projectGroup"
+ class="org.eclipse.team.internal.ccvs.ui.actions.UnmanageAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.IFileContributions"
+ objectClass="org.eclipse.core.resources.IFile" adaptable="true">
+ <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.compareWithRevision"
+ label="%CompareWithRevisionAction.label"
+ tooltip="%CompareWithRevisionAction.tooltip"
+ menubarPath="compareWithMenu/compareWithGroup"
+ class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithRevisionAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.replaceWithRevision"
+ label="%ReplaceWithRevisionAction.label"
+ tooltip="%ReplaceWithRevisionAction.tooltip"
+ menubarPath="replaceWithMenu/replaceWithGroup"
+ class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithRevisionAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.RemoteFolderContributions"
+ objectClass="org.eclipse.team.ccvs.core.ICVSRemoteFolder">
+ <action
+ id="org.eclipse.team.ccvs.ui.checkoutAs"
+ label="%CheckoutAsAction.label"
+ tooltip="%CheckoutAsAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.CheckoutAsAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.addToWorkspace"
+ label="%AddToWorkspaceAction.label"
+ tooltip="%AddToWorkspaceAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.AddToWorkspaceAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.removeTag"
+ label="%RemoveModuleVersionAction.label"
+ tooltip="%RemoveModuleVersionAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.RemoveModuleVersionAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.RemoteFileContributions"
+ objectClass="org.eclipse.team.ccvs.core.ICVSRemoteFile">
+ <action
+ id="org.eclipse.team.ccvs.ui.openRemoteFile"
+ label="%OpenRemoteFileAction.label"
+ tooltip="%OpenRemoteFileAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.OpenRemoteFileAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.showHistory"
+ label="%ShowHistoryAction.label"
+ tooltip="%ShowHistoryAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.ShowHistoryAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.autoDefine"
+ label="%AutoDefineTagsAction.label"
+ tooltip="%AutoDefineTagsAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.AutoDefineTagsAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.LogEntryContributions"
+ objectClass="org.eclipse.team.ccvs.core.ILogEntry">
+ <action
+ id="org.eclipse.team.ccvs.ui.openLogEntry"
+ label="%OpenLogEntryAction.label"
+ tooltip="%OpenLogEntryAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.OpenLogEntryAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.compareLogEntries"
+ label="%CompareRemoteResourcesAction.label"
+ tooltip="%CompareRemoteResourcesAction.tooltip"
+ enablesFor="2"
+ class="org.eclipse.team.internal.ccvs.ui.actions.CompareRemoteResourcesAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.VersionCategoryContributions"
+ objectClass="org.eclipse.team.internal.ccvs.ui.model.RemoteModule">
+ <action
+ id="org.eclipse.team.ccvs.ui.defineVersion"
+ label="%DefineVersionAction.label"
+ tooltip="%DefineVersionAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.DefineVersionAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.ProjectVersionContributions"
+ objectClass="org.eclipse.team.internal.ccvs.ui.model.ProjectVersion">
+ <action
+ id="org.eclipse.team.ccvs.ui.defineVersion"
+ label="%DefineVersionAction.label"
+ tooltip="%DefineVersionAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.DefineVersionAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.RemoteRootContributions"
+ objectClass="org.eclipse.team.ccvs.core.ICVSRepositoryLocation">
+ <action
+ id="org.eclipse.team.ccvs.ui.copyNames"
+ label="%CopyRepositoryNameAction.label"
+ tooltip="%CopyRepositoryNameAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.CopyRepositoryNameAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.removeRoot"
+ label="%RemoveRootAction.label"
+ tooltip="%RemoveRootAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.RemoveRootAction"/>
+ <action
+ id="org.eclipse.team.ccvs.ui.defineBranch"
+ label="%DefineBranchAction.label"
+ icon="icons/full/clcl16/newstream_wiz.gif"
+ tooltip="%DefineBranchAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.DefineBranchAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.BranchCategoryContributions"
+ objectClass="org.eclipse.team.internal.ccvs.ui.model.BranchCategory">
+ <action
+ id="org.eclipse.team.ccvs.ui.defineBranch"
+ label="%DefineBranchAction.label"
+ tooltip="%DefineBranchAction.tooltip"
+ icon="icons/full/clcl16/newstream_wiz.gif"
+ class="org.eclipse.team.internal.ccvs.ui.actions.DefineBranchAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.BranchTagContributions"
+ objectClass="org.eclipse.team.internal.ccvs.ui.model.BranchTag">
+ <action
+ id="org.eclipse.team.ccvs.ui.removeBranchTag"
+ label="%RemoveBranchTagAction.label"
+ tooltip="%RemoveBranchTagAction.tooltip"
+ class="org.eclipse.team.internal.ccvs.ui.actions.RemoveBranchTagAction"/>
+ </objectContribution>
+ <objectContribution
+ id="org.eclipse.team.ccvs.ui.RemoteResourceContributions"
+ objectClass="org.eclipse.team.ccvs.core.ICVSRemoteResource">
+ <action
+ id="org.eclipse.team.ccvs.ui.compareRemoteResources"
+ label="%CompareRemoteResourcesAction.label"
+ tooltip="%CompareRemoteResourcesAction.tooltip"
+ enablesFor="2"
+ class="org.eclipse.team.internal.ccvs.ui.actions.CompareRemoteResourcesAction"/>
+ </objectContribution>
+ </extension>
+
+ <!-- ************** Views ********************** -->
+ <extension point="org.eclipse.ui.views">
+ <category
+ id="org.eclipse.team.ccvs.ui"
+ name="%viewCategory">
+ </category>
+ <view
+ name="%Console.name"
+ category="org.eclipse.team.ccvs.ui"
+ class="org.eclipse.team.internal.ccvs.ui.Console"
+ id="org.eclipse.team.ccvs.ui.console"
+ icon="icons/full/cview16/console_view.gif">
+ </view>
+ <view
+ id="org.eclipse.team.ccvs.ui.RepositoriesView"
+ icon="icons/full/cview16/repo_rep.gif"
+ name="%RepositoriesView.name"
+ category="org.eclipse.team.ccvs.ui"
+ class="org.eclipse.team.internal.ccvs.ui.RepositoriesView">
+ </view>
+ <view
+ id="org.eclipse.team.ccvs.ui.HistoryView"
+ icon="icons/full/cview16/history_view.gif"
+ name="%HistoryView.name"
+ category="org.eclipse.team.ccvs.ui"
+ class="org.eclipse.team.internal.ccvs.ui.HistoryView">
+ </view>
+ </extension>
+
+ <extension point="org.eclipse.ui.resourceFilters">
+ <filter pattern="CVS" selected="true"/>
+ </extension>
+
+ <!-- ** Temporary Filter ** -->
+ <extension point="org.eclipse.jdt.ui.javaElementFilters">
+ <filter pattern="CVS" selected="true"/>
+ <filter pattern="*.CVS" selected="true"/>
+ </extension>
+
+
+ <!-- **************** PREFERENCES ******************* -->
+ <extension
+ point = "org.eclipse.ui.preferencePages">
+ <page id="org.eclipse.team.cvs.ui.CVSPreferences"
+ class="org.eclipse.team.internal.ccvs.ui.CVSPreferencesPage"
+ name="%PreferencePage.name">
+ </page>
+ </extension>
+
+ <extension
+ point = "org.eclipse.ui.preferencePages">
+ <page id="org.eclipse.team.cvs.ui.CVSDecoratorPreferences"
+ class="org.eclipse.team.internal.ccvs.ui.CVSDecoratorPreferencesPage"
+ name="%DecoratorPreferencePage.name"
+ category="org.eclipse.team.cvs.ui.CVSPreferences">
+ </page>
+ </extension>
+
+ <extension
+ point = "org.eclipse.ui.preferencePages">
+ <page id="org.eclipse.team.cvs.ui.ExtMethodPreferencePage"
+ class="org.eclipse.team.internal.ccvs.ui.ExtMethodPreferencePage"
+ name="%ExtMethodPreferencePage.name"
+ category="org.eclipse.team.cvs.ui.CVSPreferences">
+ </page>
+ </extension>
+
+ <!-- **************** DECORATOR ******************* -->
+ <extension point="org.eclipse.ui.decorators">
+ <decorator
+ id="org.eclipse.team.cvs.ui.decorator"
+ label="%DecoratorStandard.name"
+ state="false"
+ class="org.eclipse.team.internal.ccvs.ui.CVSDecorator"
+ objectClass="org.eclipse.core.resources.IResource"
+ adaptable="true">
+ </decorator>
+ </extension>
</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.xml.off b/bundles/org.eclipse.team.cvs.ui/plugin.xml.off
deleted file mode 100644
index 2edf67a19..000000000
--- a/bundles/org.eclipse.team.cvs.ui/plugin.xml.off
+++ /dev/null
@@ -1,378 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
- name="%pluginName"
- id="org.eclipse.team.cvs.ui"
- version="2.0.0"
- provider-name="Object Technology International, Inc."
- class="org.eclipse.team.internal.ccvs.ui.CVSUIPlugin">
-
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.team.core"/>
- <import plugin="org.eclipse.team.ui"/>
- <import plugin="org.eclipse.team.cvs.core"/>
- <import plugin="org.eclipse.compare"/>
- </requires>
-
- <runtime>
- <library name="teamcvsui.jar"/>
- </runtime>
-
- <!-- *************** Authenticator **************** -->
- <extension point="org.eclipse.team.cvs.core.authenticator">
- <authenticator>
- <run class="org.eclipse.team.internal.ccvs.ui.WorkbenchUserAuthenticator"/>
- </authenticator>
- </extension>
-
- <!-- ******************* Wizards ****************** -->
- <extension point="org.eclipse.team.ui.configurationWizards">
- <wizard
- name="%SharingWizard.name"
- icon="icons/full/wizards/newconnect_wiz.gif"
- class="org.eclipse.team.internal.ccvs.ui.wizards.SharingWizard"
- id="org.eclipse.team.ccvs.ui.SharingWizard">
- </wizard>
- </extension>
-
- <!-- ************** Property Pages *************** -->
- <extension point="org.eclipse.ui.propertyPages">
- <page name="%CVS" id="org.eclipse.team.ccvs.ui.propertyPages.CVSFilePropertiesPage"
- objectClass="org.eclipse.core.resources.IFile"
- class="org.eclipse.team.internal.ccvs.ui.CVSFilePropertiesPage" adaptable="true">
- <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
- </page>
- <page name="%CVS" id="org.eclipse.team.ccvs.ui.propertyPages.CVSPropertiesPage"
- objectClass="org.eclipse.core.resources.IProject"
- class="org.eclipse.team.internal.ccvs.ui.CVSPropertiesPage" adaptable="true">
- <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
- </page>
- </extension>
-
- <!-- ******************* Menus ******************** -->
- <extension point="org.eclipse.ui.popupMenus">
- <objectContribution
- id="org.eclipse.team.ccvs.ui.ResourceContributions"
- objectClass="org.eclipse.core.resources.IResource" adaptable="true">
- <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
- <action
- id="org.eclipse.team.ccvs.ui.tag"
- label="%TagAction.label"
- tooltip="%TagAction.tooltip"
- menubarPath="team.main/group2"
- class="org.eclipse.team.internal.ccvs.ui.actions.TagAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.add"
- label="%AddAction.label"
- tooltip="%AddAction.tooltip"
- menubarPath="team.main/group2"
- class="org.eclipse.team.internal.ccvs.ui.actions.AddAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.compareWithRemote"
- label="%CompareWithRemoteAction.label"
- tooltip="%CompareWithRemoteAction.tooltip"
- menubarPath="compareWithMenu/compareWithGroup"
- class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithRemoteAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.update"
- label="%UpdateAction.label"
- tooltip="%UpdateAction.tooltip"
- menubarPath="team.main/group2"
- class="org.eclipse.team.internal.ccvs.ui.actions.UpdateAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.replace"
- label="%ReplaceWithAction.label"
- tooltip="%ReplaceWithAction.tooltip"
- menubarPath="replaceWithMenu/replaceWithGroup"
- class="org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithRemoteAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.commit"
- label="%CommitAction.label"
- tooltip="%CommitAction.tooltip"
- menubarPath="team.main/group2"
- class="org.eclipse.team.internal.ccvs.ui.actions.CommitAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.ignore"
- label="%IgnoreAction.label"
- tooltip="%IgnoreAction.tooltip"
- menubarPath="team.main/group1"
- class="org.eclipse.team.internal.ccvs.ui.actions.IgnoreAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.GenerateDiff"
- label="%GenerateDiff.label"
- tooltip="%GenerateDiff.tooltip"
- menubarPath="team.main/group1"
- class="org.eclipse.team.internal.ccvs.ui.actions.GenerateDiffFileAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.showHistory"
- label="%ShowHistoryAction.label"
- tooltip="%ShowHistoryAction.tooltip"
- menubarPath="team.main/group1"
- class="org.eclipse.team.internal.ccvs.ui.actions.ShowResourceInHistoryAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.sync"
- label="%Synchronize.label"
- tooltip="%Synchronize.tooltip"
- menubarPath="team.main/group1"
- class="org.eclipse.team.internal.ccvs.ui.actions.SyncAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.IProjectContributions"
- objectClass="org.eclipse.core.resources.IProject" adaptable="true">
- <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
- <action
- id="org.eclipse.team.ccvs.ui.compareWithTag"
- label="%CompareWithTagAction.label"
- tooltip="%CompareWithTagAction.tooltip"
- menubarPath="compareWithMenu/compareWithGroup"
- class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithTagAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.merge"
- label="%MergeAction.label"
- tooltip="%MergeAction.tooltip"
- menubarPath="team.main/group1"
- class="org.eclipse.team.internal.ccvs.ui.actions.MergeAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.branch"
- label="%BranchAction.label"
- tooltip="%BranchAction.tooltip"
- menubarPath="team.main/group1"
- class="org.eclipse.team.internal.ccvs.ui.actions.BranchAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.IContainerContributions"
- objectClass="org.eclipse.core.resources.IContainer" adaptable="true">
- <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
- <action
- id="org.eclipse.team.ccvs.ui.replaceWithTag"
- label="%ReplaceWithTagAction.label"
- tooltip="%ReplaceWithTagAction.tooltip"
- menubarPath="replaceWithMenu/replaceWithGroup"
- class="org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithTagAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.unmanage"
- label="%UnmanageFolder.label"
- tooltip="%UnmanageFolder.tooltip"
- menubarPath="team.main/projectGroup"
- class="org.eclipse.team.internal.ccvs.ui.actions.UnmanageAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.IFileContributions"
- objectClass="org.eclipse.core.resources.IFile" adaptable="true">
- <filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
- <action
- id="org.eclipse.team.ccvs.ui.compareWithRevision"
- label="%CompareWithRevisionAction.label"
- tooltip="%CompareWithRevisionAction.tooltip"
- menubarPath="compareWithMenu/compareWithGroup"
- class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithRevisionAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.replaceWithRevision"
- label="%ReplaceWithRevisionAction.label"
- tooltip="%ReplaceWithRevisionAction.tooltip"
- menubarPath="replaceWithMenu/replaceWithGroup"
- class="org.eclipse.team.internal.ccvs.ui.actions.CompareWithRevisionAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.RemoteFolderContributions"
- objectClass="org.eclipse.team.ccvs.core.ICVSRemoteFolder">
- <action
- id="org.eclipse.team.ccvs.ui.checkoutAs"
- label="%CheckoutAsAction.label"
- tooltip="%CheckoutAsAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.CheckoutAsAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.addToWorkspace"
- label="%AddToWorkspaceAction.label"
- tooltip="%AddToWorkspaceAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.AddToWorkspaceAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.removeTag"
- label="%RemoveModuleVersionAction.label"
- tooltip="%RemoveModuleVersionAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.RemoveModuleVersionAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.RemoteFileContributions"
- objectClass="org.eclipse.team.ccvs.core.ICVSRemoteFile">
- <action
- id="org.eclipse.team.ccvs.ui.openRemoteFile"
- label="%OpenRemoteFileAction.label"
- tooltip="%OpenRemoteFileAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.OpenRemoteFileAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.showHistory"
- label="%ShowHistoryAction.label"
- tooltip="%ShowHistoryAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.ShowHistoryAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.autoDefine"
- label="%AutoDefineTagsAction.label"
- tooltip="%AutoDefineTagsAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.AutoDefineTagsAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.LogEntryContributions"
- objectClass="org.eclipse.team.ccvs.core.ILogEntry">
- <action
- id="org.eclipse.team.ccvs.ui.openLogEntry"
- label="%OpenLogEntryAction.label"
- tooltip="%OpenLogEntryAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.OpenLogEntryAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.compareLogEntries"
- label="%CompareRemoteResourcesAction.label"
- tooltip="%CompareRemoteResourcesAction.tooltip"
- enablesFor="2"
- class="org.eclipse.team.internal.ccvs.ui.actions.CompareRemoteResourcesAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.VersionCategoryContributions"
- objectClass="org.eclipse.team.internal.ccvs.ui.model.RemoteModule">
- <action
- id="org.eclipse.team.ccvs.ui.defineVersion"
- label="%DefineVersionAction.label"
- tooltip="%DefineVersionAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.DefineVersionAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.ProjectVersionContributions"
- objectClass="org.eclipse.team.internal.ccvs.ui.model.ProjectVersion">
- <action
- id="org.eclipse.team.ccvs.ui.defineVersion"
- label="%DefineVersionAction.label"
- tooltip="%DefineVersionAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.DefineVersionAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.RemoteRootContributions"
- objectClass="org.eclipse.team.ccvs.core.ICVSRepositoryLocation">
- <action
- id="org.eclipse.team.ccvs.ui.copyNames"
- label="%CopyRepositoryNameAction.label"
- tooltip="%CopyRepositoryNameAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.CopyRepositoryNameAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.removeRoot"
- label="%RemoveRootAction.label"
- tooltip="%RemoveRootAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.RemoveRootAction"/>
- <action
- id="org.eclipse.team.ccvs.ui.defineBranch"
- label="%DefineBranchAction.label"
- icon="icons/full/clcl16/newstream_wiz.gif"
- tooltip="%DefineBranchAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.DefineBranchAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.BranchCategoryContributions"
- objectClass="org.eclipse.team.internal.ccvs.ui.model.BranchCategory">
- <action
- id="org.eclipse.team.ccvs.ui.defineBranch"
- label="%DefineBranchAction.label"
- tooltip="%DefineBranchAction.tooltip"
- icon="icons/full/clcl16/newstream_wiz.gif"
- class="org.eclipse.team.internal.ccvs.ui.actions.DefineBranchAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.BranchTagContributions"
- objectClass="org.eclipse.team.internal.ccvs.ui.model.BranchTag">
- <action
- id="org.eclipse.team.ccvs.ui.removeBranchTag"
- label="%RemoveBranchTagAction.label"
- tooltip="%RemoveBranchTagAction.tooltip"
- class="org.eclipse.team.internal.ccvs.ui.actions.RemoveBranchTagAction"/>
- </objectContribution>
- <objectContribution
- id="org.eclipse.team.ccvs.ui.RemoteResourceContributions"
- objectClass="org.eclipse.team.ccvs.core.ICVSRemoteResource">
- <action
- id="org.eclipse.team.ccvs.ui.compareRemoteResources"
- label="%CompareRemoteResourcesAction.label"
- tooltip="%CompareRemoteResourcesAction.tooltip"
- enablesFor="2"
- class="org.eclipse.team.internal.ccvs.ui.actions.CompareRemoteResourcesAction"/>
- </objectContribution>
- </extension>
-
- <!-- ************** Views ********************** -->
- <extension point="org.eclipse.ui.views">
- <category
- id="org.eclipse.team.ccvs.ui"
- name="%viewCategory">
- </category>
- <view
- name="%Console.name"
- category="org.eclipse.team.ccvs.ui"
- class="org.eclipse.team.internal.ccvs.ui.Console"
- id="org.eclipse.team.ccvs.ui.console"
- icon="icons/full/cview16/console_view.gif">
- </view>
- <view
- id="org.eclipse.team.ccvs.ui.RepositoriesView"
- icon="icons/full/cview16/repo_rep.gif"
- name="%RepositoriesView.name"
- category="org.eclipse.team.ccvs.ui"
- class="org.eclipse.team.internal.ccvs.ui.RepositoriesView">
- </view>
- <view
- id="org.eclipse.team.ccvs.ui.HistoryView"
- icon="icons/full/cview16/history_view.gif"
- name="%HistoryView.name"
- category="org.eclipse.team.ccvs.ui"
- class="org.eclipse.team.internal.ccvs.ui.HistoryView">
- </view>
- </extension>
-
- <extension point="org.eclipse.ui.resourceFilters">
- <filter pattern="CVS" selected="true"/>
- </extension>
-
- <!-- ** Temporary Filter ** -->
- <extension point="org.eclipse.jdt.ui.javaElementFilters">
- <filter pattern="CVS" selected="true"/>
- <filter pattern="*.CVS" selected="true"/>
- </extension>
-
-
- <!-- **************** PREFERENCES ******************* -->
- <extension
- point = "org.eclipse.ui.preferencePages">
- <page id="org.eclipse.team.cvs.ui.CVSPreferences"
- class="org.eclipse.team.internal.ccvs.ui.CVSPreferencesPage"
- name="%PreferencePage.name">
- </page>
- </extension>
-
- <extension
- point = "org.eclipse.ui.preferencePages">
- <page id="org.eclipse.team.cvs.ui.CVSDecoratorPreferences"
- class="org.eclipse.team.internal.ccvs.ui.CVSDecoratorPreferencesPage"
- name="%DecoratorPreferencePage.name"
- category="org.eclipse.team.cvs.ui.CVSPreferences">
- </page>
- </extension>
-
- <extension
- point = "org.eclipse.ui.preferencePages">
- <page id="org.eclipse.team.cvs.ui.ExtMethodPreferencePage"
- class="org.eclipse.team.internal.ccvs.ui.ExtMethodPreferencePage"
- name="%ExtMethodPreferencePage.name"
- category="org.eclipse.team.cvs.ui.CVSPreferences">
- </page>
- </extension>
-
- <!-- **************** DECORATOR ******************* -->
- <extension point="org.eclipse.ui.decorators">
- <decorator
- id="org.eclipse.team.cvs.ui.decorator"
- label="%DecoratorStandard.name"
- state="false"
- class="org.eclipse.team.internal.ccvs.ui.CVSDecorator"
- objectClass="org.eclipse.core.resources.IResource"
- adaptable="true">
- </decorator>
- </extension>
-</plugin> \ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java
index c82fdbd5d..b36973cb1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java
@@ -6,6 +6,7 @@ package org.eclipse.team.internal.ccvs.ui.actions;
*/
import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
@@ -15,12 +16,14 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IInputValidator;
import org.eclipse.jface.dialogs.InputDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.swt.widgets.Shell;
+import org.eclipse.team.ccvs.core.CVSStatus;
import org.eclipse.team.ccvs.core.CVSTag;
import org.eclipse.team.ccvs.core.CVSTeamProvider;
import org.eclipse.team.core.ITeamManager;
@@ -29,6 +32,7 @@ import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.TeamPlugin;
import org.eclipse.team.internal.ccvs.core.resources.ICVSResource;
import org.eclipse.team.internal.ccvs.core.resources.LocalFile;
+import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.ui.actions.TeamAction;
@@ -43,6 +47,7 @@ public class TagAction extends TeamAction {
* @see IActionDelegate#run(IAction)
*/
public void run(IAction action) {
+ final List messages = new ArrayList();
run(new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException {
try {
@@ -57,20 +62,51 @@ public class TagAction extends TeamAction {
Set keySet = table.keySet();
monitor.beginTask("", keySet.size() * 1000);
Iterator iterator = keySet.iterator();
+
while (iterator.hasNext()) {
IProgressMonitor subMonitor = new SubProgressMonitor(monitor, 1000);
CVSTeamProvider provider = (CVSTeamProvider)iterator.next();
List list = (List)table.get(provider);
IResource[] providerResources = (IResource[])list.toArray(new IResource[list.size()]);
- provider.tag(providerResources, IResource.DEPTH_INFINITE, new CVSTag(result[0], CVSTag.VERSION), subMonitor);
+ IStatus status = provider.tag(providerResources, IResource.DEPTH_INFINITE, new CVSTag(result[0], CVSTag.VERSION), subMonitor);
+ if (status.getCode() != CVSStatus.OK) {
+ messages.add(status);
+ }
}
- previousTag = result[0];
+ previousTag = result[0];
} catch (TeamException e) {
throw new InvocationTargetException(e);
}
}
- }, Policy.bind("TagAction.tag"), this.PROGRESS_DIALOG);
-
+ }, Policy.bind("TagAction.tagErrorTitle"), this.PROGRESS_DIALOG);
+
+ // Check for any status messages and display them
+ if ( ! messages.isEmpty()) {
+ boolean error = false;
+ MultiStatus combinedStatus = new MultiStatus(CVSUIPlugin.ID, 0, Policy.bind("TagAction.tagProblemsMessage"), null);
+ for (int i = 0; i < messages.size(); i++) {
+ IStatus status = (IStatus)messages.get(i);
+ if (status.getSeverity() == IStatus.ERROR || status.getCode() == CVSStatus.SERVER_ERROR) {
+ error = true;
+ }
+ combinedStatus.merge(status);
+ }
+ String message = null;
+ IStatus statusToDisplay;
+ if (combinedStatus.getChildren().length == 1) {
+ message = combinedStatus.getMessage();
+ statusToDisplay = combinedStatus.getChildren()[0];
+ } else {
+ statusToDisplay = combinedStatus;
+ }
+ String title;
+ if (error) {
+ title = Policy.bind("TagAction.tagErrorTitle");
+ } else {
+ title = Policy.bind("TagAction.tagWarningTitle");
+ }
+ ErrorDialog.openError(getShell(), title, message, statusToDisplay);
+ }
}
/*
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 2f3c94e27..a3e0d5a11 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
@@ -300,11 +300,13 @@ ShowHistoryAction.noHistoryLong=No resource history available for selected resou
SyncAction.sync=Synchronize
-TagAction.tag=Tag
+TagAction.tagErrorTitle=Errors Occurred
+TagAction.tagWarningTitle=Warnings Occured
+TagAction.tagProblemsMessage=Problems reported during tag operation
TagAction.tagResources=Tag Resources
TagAction.enterTag=Please enter a version tag:
-UpdateAction.update=Update
+UpdateAction.update=Problems encountered performing update
UpdateAction.updating=Updating...
UserValidationDialog.required=Password Required

Back to the top