[eclipse-mylyn] Patch for Eclipse bug 378230 added.
Krzysztof Daniel
kdaniel at fedoraproject.org
Mon May 7 09:54:53 UTC 2012
commit 9fa08629dd11f7e3a818fcccbae0e26e8aca5b76
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Mon May 7 11:54:43 2012 +0200
Patch for Eclipse bug 378230 added.
.gitignore | 1 +
...ug-378230-Submit-failed-invalide-severity.patch | 44 ++++++++++++++++++++
eclipse-mylyn.spec | 7 +++-
3 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86c76ef..c215c21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ eclipse-mylyn-R_3_6_4-fetched-src.tar.bz2
eclipse-mylyn-R_3_7_0-fetched-src.tar.bz2
/eclipse-mylyn-R_3_7_0-fetched-src
/noarch
+/.project
diff --git a/0001-REOPENED-bug-378230-Submit-failed-invalide-severity.patch b/0001-REOPENED-bug-378230-Submit-failed-invalide-severity.patch
new file mode 100644
index 0000000..174da8d
--- /dev/null
+++ b/0001-REOPENED-bug-378230-Submit-failed-invalide-severity.patch
@@ -0,0 +1,44 @@
+diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/AttributeTaskMapper.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/AttributeTaskMapper.java
+index a2df487..68bdd42 100644
+--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/AttributeTaskMapper.java
++++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/AttributeTaskMapper.java
+@@ -104,7 +104,7 @@ public class AttributeTaskMapper implements ITaskContribution, ISupportResponse
+ attributes.put(name, value);
+ }
+
+- void setTaskData(TaskData taskData) {
++ public void setTaskData(TaskData taskData) {
+ this.taskData = taskData;
+ }
+
+diff --git a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/DefaultSupportHandler.java b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/DefaultSupportHandler.java
+index b9f462d..6566fa8 100644
+--- a/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/DefaultSupportHandler.java
++++ b/org.eclipse.mylyn.tasks.bugs/src/org/eclipse/mylyn/internal/tasks/bugs/DefaultSupportHandler.java
+@@ -65,14 +65,18 @@ public class DefaultSupportHandler extends AbstractSupportHandler {
+ IStatus contribution = response.getStatus();
+ TaskData taskData = response.getTaskData();
+ if (contribution instanceof ProductStatus) {
+- AbstractRepositoryConnector connector = TasksUi.getRepositoryConnector(taskData.getConnectorKind());
+- ITaskMapping mapping = connector.getTaskMapping(taskData);
+- mapping.merge(new TaskMapping() {
+- @Override
+- public String getSeverity() {
+- return "enhancement"; //$NON-NLS-1$
++ if (response instanceof AttributeTaskMapper) {
++ if (((AttributeTaskMapper) response).getAttribute("severity") == null) {
++ AbstractRepositoryConnector connector = TasksUi.getRepositoryConnector(taskData.getConnectorKind());
++ ITaskMapping mapping = connector.getTaskMapping(taskData);
++ mapping.merge(new TaskMapping() {
++ @Override
++ public String getSeverity() {
++ return "enhancement"; //$NON-NLS-1$
++ }
++ });
+ }
+- });
++ }
+ }
+ if (response.getProduct() != null) {
+ IBundleGroup bundleGroup = ((SupportProduct) response.getProduct()).getBundleGroup();
+
diff --git a/eclipse-mylyn.spec b/eclipse-mylyn.spec
index fe58f87..c7b4088 100644
--- a/eclipse-mylyn.spec
+++ b/eclipse-mylyn.spec
@@ -7,7 +7,7 @@
Name: eclipse-mylyn
Summary: Eclipse Mylyn main feature.
Version: 3.7.0
-Release: 4%{?dist}
+Release: 5%{?dist}
License: EPL
URL: http://www.eclipse.org/mylyn
@@ -15,6 +15,7 @@ URL: http://www.eclipse.org/mylyn
Source0: %{name}-R_%{tag}-fetched-src.tar.bz2
Patch0: %{name}-include-schema-for-tasks-core.patch
+Patch1: 0001-REOPENED-bug-378230-Submit-failed-invalide-severity.patch
%if 0%{?rhel} >= 6
ExclusiveArch: %{ix86} x86_64
@@ -47,6 +48,7 @@ information that is not relevant to the current task.
%prep
%setup -q -n eclipse-mylyn-R_%{tag}-fetched-src
%patch0
+%patch1 -p1
rm -rf orbitDeps
mkdir orbitDeps
pushd orbitDeps
@@ -79,6 +81,9 @@ unzip -q -o -d %{buildroot}%{install_loc}/mylyn \
%doc org.eclipse.mylyn-feature/license.html
%changelog
+* Mon May 7 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-5
+- Patch for bug 378230 added.
+
* Mon Apr 30 2012 Krzysztof Daniel <kdaniel at redhat.com> 3.7.0-4
- Include schema description.
More information about the scm-commits
mailing list