Attachment 116181 Details for Bug 215116 – org.eclipse.mylyn.team.cvs.patch

[patch] org.eclipse.mylyn.team.cvs.patch

org.eclipse.mylyn.team.cvs.patch (text/plain), 7.96 KB, created by Hiroyuki

on 2008-10-27 10:02:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Hiroyuki

Created: 2008-10-27 10:02:11 EDT

Size: 7.96 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn
>Index: org.eclipse.mylyn.team.cvs/build.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.team.cvs/build.properties,v
>retrieving revision 1.5
>diff -u -r1.5 build.properties
>--- org.eclipse.mylyn.team.cvs/build.properties	17 Sep 2008 15:43:52 -0000	1.5
>+++ org.eclipse.mylyn.team.cvs/build.properties	26 Oct 2008 11:00:36 -0000
>@@ -11,5 +11,6 @@
> bin.includes = META-INF/,\
>                .,\
>                plugin.xml,\
>-               about.html
>+               about.html,\
>+               plugin.properties
> src.includes = about.html
>Index: org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsCommitWorkflowProvider.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsCommitWorkflowProvider.java,v
>retrieving revision 1.6
>diff -u -r1.6 CvsCommitWorkflowProvider.java
>--- org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsCommitWorkflowProvider.java	20 May 2008 19:50:31 -0000	1.6
>+++ org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsCommitWorkflowProvider.java	26 Oct 2008 11:00:37 -0000
>@@ -24,7 +24,7 @@
> @SuppressWarnings( { "deprecation", "restriction" })
> public class CvsCommitWorkflowProvider extends AbstractCommitWorkflowProvider {
> 
>-	private static final String WIZARD_LABEL = "Commit Resources in Task Context";
>+	private static final String WIZARD_LABEL = Messages.CvsCommitWorkflowProvider_COMMIT_RESOURCES_IN_TASK_CONTEXT;
> 
> 	@Override
> 	public boolean hasOutgoingChanges(IResource[] resources) {
>Index: org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsContextChangeSet.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsContextChangeSet.java,v
>retrieving revision 1.3
>diff -u -r1.3 CvsContextChangeSet.java
>--- org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsContextChangeSet.java	16 Aug 2008 12:08:56 -0000	1.3
>+++ org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/CvsContextChangeSet.java	26 Oct 2008 11:00:37 -0000
>@@ -53,9 +53,9 @@
> public class CvsContextChangeSet extends CVSActiveChangeSet implements IAdaptable, IContextChangeSet {
> 
> 	// HACK: copied from super
>-	private static final String CTX_TITLE = "title";
>+	private static final String CTX_TITLE = "title"; //$NON-NLS-1$
> 
>-	public static final String SOURCE_ID = "org.eclipse.mylyn.java.context.changeset.add";
>+	public static final String SOURCE_ID = "org.eclipse.mylyn.java.context.changeset.add"; //$NON-NLS-1$
> 
> 	private boolean suppressInterestContribution = false;
> 
>@@ -87,7 +87,7 @@
> 	}
> 
> 	private String getTitleForPersistance() {
>-		return getTitle() + " (" + task.getHandleIdentifier() + ")";
>+		return getTitle() + " (" + task.getHandleIdentifier() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
> 	}
> 
> 	public static String getHandleFromPersistedTitle(String title) {
>@@ -137,8 +137,8 @@
> 			if (unmatchedRepositoryFound) {
> 				proceed = MessageDialog.openQuestion(
> 						PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
>-						"Mylyn Change Set Management",
>-						"You are attempting to commit a resource which is not associated with the selected task repository.  Proceed with creating the commit message?");
>+						Messages.CvsContextChangeSet_MYLYN_CHANGE_SET_MANAGEMENT,
>+						Messages.CvsContextChangeSet_ATTEMPTING_TO_COMMIT_RESOURCE);
> 			}
> 		}
> 
>@@ -149,7 +149,7 @@
> 			}
> 			return FocusedTeamUiPlugin.getDefault().getCommitTemplateManager().generateComment(task, template);
> 		} else {
>-			return "";
>+			return ""; //$NON-NLS-1$
> 		}
> 	}
> 
>Index: org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF,v
>retrieving revision 1.59
>diff -u -r1.59 MANIFEST.MF
>--- org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF	3 Aug 2008 05:52:28 -0000	1.59
>+++ org.eclipse.mylyn.team.cvs/META-INF/MANIFEST.MF	26 Oct 2008 11:00:36 -0000
>@@ -1,9 +1,9 @@
> Manifest-Version: 1.0
> Bundle-ManifestVersion: 2
>-Bundle-Name: Mylyn CVS Extensions
>+Bundle-Name: %Bundle-Name
> Bundle-SymbolicName: org.eclipse.mylyn.team.cvs;singleton:=true
> Bundle-Version: 3.0.2.qualifier
>-Bundle-Vendor: Eclipse.org
>+Bundle-Vendor: %Bundle-Vendor
> Require-Bundle: org.eclipse.team.ui,
>  org.eclipse.team.core,
>  org.eclipse.team.cvs.ui,
>@@ -21,3 +21,4 @@
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Bundle-ClassPath: .
> Export-Package: org.eclipse.mylyn.internal.team.ccvs;x-internal:=true
>+Bundle-Localization: plugin
>Index: org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/Messages.java
>===================================================================
>RCS file: org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/Messages.java
>diff -N org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/Messages.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/Messages.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,32 @@
>+/*******************************************************************************
>+ * Copyright (c) 2004, 2008 Tasktop Technologies 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:
>+ *     Tasktop Technologies - initial API and implementation
>+ *******************************************************************************/
>+
>+package org.eclipse.mylyn.internal.team.ccvs;
>+
>+import org.eclipse.osgi.util.NLS;
>+
>+public class Messages extends NLS {
>+	private static final String BUNDLE_NAME = "org.eclipse.mylyn.internal.team.ccvs.messages"; //$NON-NLS-1$
>+
>+	static {
>+		// load message values from bundle file
>+		reloadMessages();
>+	}
>+
>+	public static void reloadMessages() {
>+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
>+	}
>+
>+	public static String CvsCommitWorkflowProvider_COMMIT_RESOURCES_IN_TASK_CONTEXT;
>+
>+	public static String CvsContextChangeSet_ATTEMPTING_TO_COMMIT_RESOURCE;
>+	public static String CvsContextChangeSet_MYLYN_CHANGE_SET_MANAGEMENT;
>+}
>Index: org.eclipse.mylyn.team.cvs/plugin.properties
>===================================================================
>RCS file: org.eclipse.mylyn.team.cvs/plugin.properties
>diff -N org.eclipse.mylyn.team.cvs/plugin.properties
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ org.eclipse.mylyn.team.cvs/plugin.properties	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,3 @@
>+#Properties file for org.eclipse.mylyn.team.cvs
>+Bundle-Vendor = Eclipse.org
>+Bundle-Name = Mylyn CVS Extensions
>Index: org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/messages.properties
>===================================================================
>RCS file: org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/messages.properties
>diff -N org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/messages.properties
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ org.eclipse.mylyn.team.cvs/src/org/eclipse/mylyn/internal/team/ccvs/messages.properties	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,4 @@
>+CvsCommitWorkflowProvider_COMMIT_RESOURCES_IN_TASK_CONTEXT=Commit Resources in Task Context
>+
>+CvsContextChangeSet_ATTEMPTING_TO_COMMIT_RESOURCE=You are attempting to commit a resource which is not associated with the selected task repository.  Proceed with creating the commit message?
>+CvsContextChangeSet_MYLYN_CHANGE_SET_MANAGEMENT=Mylyn Change Set Management

Actions: View | Diff

Attachments on bug 215116: 94773 | 94774 | 115934 | 116181