Attachment 182409 Details for Bug 318045 – patch v2

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch v2

clipboard.txt (text/plain), 4.74 KB, created by Thomas Ehrnhoefer

on 2010-11-04 14:42:38 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Ehrnhoefer

Created: 2010-11-04 14:42:38 EDT

Size: 4.74 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.core
>Index: src/org/eclipse/mylyn/internal/provisional/tasks/core/TasksUtil.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/provisional/tasks/core/TasksUtil.java,v
>retrieving revision 1.4
>diff -u -r1.4 TasksUtil.java
>--- src/org/eclipse/mylyn/internal/provisional/tasks/core/TasksUtil.java	7 Dec 2008 05:07:52 -0000	1.4
>+++ src/org/eclipse/mylyn/internal/provisional/tasks/core/TasksUtil.java	4 Nov 2010 18:40:07 -0000
>@@ -64,4 +64,25 @@
> 		return sb.toString();
> 	}
> 
>+	/**
>+	 * Trim a search string outside of quotes and remove existing quotes if not escaped
>+	 * 
>+	 * @param toTrim
>+	 * @return
>+	 */
>+	public static String trimAndCleanFilterString(String toTrim) {
>+		if (toTrim != null) {
>+			//trim string, then remove quotes
>+			toTrim = toTrim.trim();
>+			String quote = "\""; //$NON-NLS-1$
>+			String escapedQuote = "\\\""; //$NON-NLS-1$
>+			if (toTrim.startsWith(quote) && toTrim.endsWith(quote)) {
>+				toTrim = toTrim.substring(1, toTrim.length() - 1);
>+			} else if (toTrim.startsWith(escapedQuote) && toTrim.endsWith(escapedQuote)) {
>+				//check if quotes were escaped, and remove the escape character then
>+				toTrim = toTrim.substring(1, toTrim.length() - 2) + quote;
>+			}
>+		}
>+		return toTrim;
>+	}
> }
>#P org.eclipse.mylyn.tasks.tests
>Index: src/org/eclipse/mylyn/tasks/tests/TasksUtilTest.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TasksUtilTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 TasksUtilTest.java
>--- src/org/eclipse/mylyn/tasks/tests/TasksUtilTest.java	5 Dec 2008 23:20:29 -0000	1.2
>+++ src/org/eclipse/mylyn/tasks/tests/TasksUtilTest.java	4 Nov 2010 18:40:13 -0000
>@@ -44,4 +44,22 @@
> 		assertEquals("abc-123", TasksUtil.decode(TasksUtil.decode(TasksUtil.encode(TasksUtil.encode("abc-123")))));
> 	}
> 
>+	public void testTrimAndCleanFilterString() {
>+		assertEquals("Test", TasksUtil.trimAndCleanFilterString("\"Test\""));
>+		assertEquals("Test", TasksUtil.trimAndCleanFilterString(" \"Test\""));
>+		assertEquals("Test", TasksUtil.trimAndCleanFilterString("\"Test\" "));
>+		assertEquals(" Test", TasksUtil.trimAndCleanFilterString("\" Test\""));
>+		assertEquals("Test ", TasksUtil.trimAndCleanFilterString("\"Test \""));
>+		assertEquals("Tes t", TasksUtil.trimAndCleanFilterString("\"Tes t\""));
>+		assertEquals("\"Test\"", TasksUtil.trimAndCleanFilterString("\\" + "\"Test\\" + "\""));
>+		assertEquals("\" Test\"", TasksUtil.trimAndCleanFilterString("\\\" Test\\\""));
>+		assertEquals("\"Test \"", TasksUtil.trimAndCleanFilterString("\\\"Test \\\""));
>+		assertEquals("\"Test", TasksUtil.trimAndCleanFilterString("\"\"Test\""));
>+		assertEquals("Te\"st\"", TasksUtil.trimAndCleanFilterString(" \"Te\"st\"\""));
>+		assertEquals("T\"est\"", TasksUtil.trimAndCleanFilterString("T\"est\""));
>+		assertEquals("T\"est\"", TasksUtil.trimAndCleanFilterString(" T\"est\""));
>+		assertEquals("T\"est\"", TasksUtil.trimAndCleanFilterString(" T\"est\" "));
>+		assertEquals(null, TasksUtil.trimAndCleanFilterString(null));
>+		assertEquals("", TasksUtil.trimAndCleanFilterString(""));
>+	}
> }
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java,v
>retrieving revision 1.125
>diff -u -r1.125 TaskListFilteredTree.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java	15 Jun 2010 18:12:25 -0000	1.125
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java	4 Nov 2010 18:40:19 -0000
>@@ -29,6 +29,7 @@
> import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
> import org.eclipse.mylyn.internal.provisional.commons.ui.SearchHistoryPopUpDialog;
> import org.eclipse.mylyn.internal.provisional.commons.ui.SelectionProviderAdapter;
>+import org.eclipse.mylyn.internal.provisional.tasks.core.TasksUtil;
> import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
> import org.eclipse.mylyn.internal.tasks.core.ITaskListChangeListener;
> import org.eclipse.mylyn.internal.tasks.core.TaskContainerDelta;
>@@ -556,7 +557,7 @@
> 	@Override
> 	protected String getFilterString() {
> 		String text = super.getFilterString();
>-		return (text != null) ? text.trim() : null;
>+		return (text != null) ? TasksUtil.trimAndCleanFilterString(text) : null;
> 	}
> 
> 	public TaskWorkingSetFilter getWorkingSetFilter() {

Flags:

thomas.ehrnhoefer: review?

Actions: View | Diff

Attachments on bug 318045: 172824 | 172825 | 182409 | 182410