diff options
| author | David Green | 2012-02-08 22:37:34 +0000 |
|---|---|---|
| committer | David Green | 2012-02-08 22:37:34 +0000 |
| commit | cfcb5a504b3a6422cf53c8a8a4d46615e1af9a6d (patch) | |
| tree | 92d2376a16fe372b2fbe470b4bc05e87e982aefe /org.eclipse.mylyn.tasks.core | |
| parent | 829aa2877b332f9547a816e91b3fdf899304b497 (diff) | |
| parent | 4e6761cb77b94173165f8e1a3d3766e354982e3a (diff) | |
| download | org.eclipse.mylyn.tasks-cfcb5a504b3a6422cf53c8a8a4d46615e1af9a6d.tar.gz org.eclipse.mylyn.tasks-cfcb5a504b3a6422cf53c8a8a4d46615e1af9a6d.tar.xz org.eclipse.mylyn.tasks-cfcb5a504b3a6422cf53c8a8a4d46615e1af9a6d.zip | |
191522: provide full text search functionality over task comments
https://bugs.eclipse.org/bugs/show_bug.cgi?id=191522
Change-Id: I93be38a91d657ea1df488dd56cad43c4c5505e3e
Diffstat (limited to 'org.eclipse.mylyn.tasks.core')
4 files changed, 4 insertions, 5 deletions
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/Messages.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/Messages.java index 69806866c..d23fb723b 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/Messages.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/Messages.java @@ -61,8 +61,6 @@ public class Messages extends NLS { public static String PriorityLevel_Very_Low; - public static String ScheduledTaskContainer_Dash_Pattern; - public static String ScheduledTaskContainer_Next_Day; public static String TaskJobFactory_Refreshing_repository_configuration; diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataStore.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataStore.java index 66dd96a81..20ec91a39 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataStore.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataStore.java @@ -136,7 +136,8 @@ public class TaskDataStore { return readStateInternal(file, false); } catch (SAXException e) { // bug 268456: if reading fails, try again using a different XML version - if (e.getMessage() != null && e.getMessage().contains("invalid XML character")) { //$NON-NLS-1$ + if (e.getMessage() != null + && (e.getMessage().contains("invalid XML character") || e.getMessage().contains("Character reference \"&#"))) { //$NON-NLS-1$ //$NON-NLS-2$ return readStateInternal(file, true); } else { throw e; diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/messages.properties b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/messages.properties index d64e1e329..57899bcd5 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/messages.properties +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/messages.properties @@ -34,7 +34,6 @@ PriorityLevel_Low=Low PriorityLevel_Normal=Normal PriorityLevel_Very_High=Very High PriorityLevel_Very_Low=Very Low -ScheduledTaskContainer_Dash_Pattern={0} - {1} ScheduledTaskContainer_Next_Day=Next {0} TaskJobFactory_Refreshing_repository_configuration=Refreshing repository configuration diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskMapper.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskMapper.java index 3121b763e..2ea0dce26 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskMapper.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskMapper.java @@ -86,7 +86,8 @@ public class TaskMapper implements ITaskMapping { } private String getPriorityLevelString() { - return (getPriorityLevel() != null) ? getPriorityLevel().toString() : PriorityLevel.getDefault().toString(); + PriorityLevel priorityLevel = getPriorityLevel(); + return (priorityLevel != null) ? priorityLevel.toString() : PriorityLevel.getDefault().toString(); } private boolean hasChanges(Object existingValue, Object newValue, String attributeId) { |