Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2012-02-29 10:25:42 -0500
committerSteffen Pingel2012-02-29 10:25:42 -0500
commit09cf426897289e062c07a4bc9472441467cd3797 (patch)
tree3dd3539c6fe827ea85878081c4b24480e5898082 /org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data
parentb451ffd6631fb352f618eb3a77fecf8fb89ac21f (diff)
downloadorg.eclipse.mylyn.tasks-09cf426897289e062c07a4bc9472441467cd3797.tar.gz
org.eclipse.mylyn.tasks-09cf426897289e062c07a4bc9472441467cd3797.tar.xz
org.eclipse.mylyn.tasks-09cf426897289e062c07a4bc9472441467cd3797.zip
NEW - bug 372838: [regression] IllegalArgumentException when opening
Gerrit editor https://bugs.eclipse.org/bugs/show_bug.cgi?id=372838
Diffstat (limited to 'org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data')
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/AbstractTaskSchema.java16
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/DefaultTaskSchema.java2
2 files changed, 8 insertions, 10 deletions
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/AbstractTaskSchema.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/AbstractTaskSchema.java
index 580e45ebb..a70db57ff 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/AbstractTaskSchema.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/AbstractTaskSchema.java
@@ -42,7 +42,7 @@ public abstract class AbstractTaskSchema {
private final String indexKey;
protected Field(String key, String label, String type) {
- this(key, label, type, (Flag[]) null);
+ this(key, label, type, null, (Flag[]) null);
}
protected Field(String key, String label, String type, Flag... flags) {
@@ -65,13 +65,13 @@ public abstract class AbstractTaskSchema {
* @since 3.7
*/
public Field(String key, String label, String type, String indexKey, Flag... flags) {
- this.indexKey = indexKey;
Assert.isNotNull(key);
Assert.isNotNull(label);
Assert.isNotNull(type);
this.key = key;
this.label = label;
this.type = type;
+ this.indexKey = indexKey;
if (flags == null || flags.length == 0) {
this.flags = EnumSet.noneOf(Flag.class);
} else {
@@ -259,7 +259,11 @@ public abstract class AbstractTaskSchema {
}
protected Field createField(String key, String label, String type) {
- return createField(key, label, type, (Flag[]) null);
+ return createField(key, label, type, null, (Flag[]) null);
+ }
+
+ protected Field createField(String key, String label, String type, Flag... flags) {
+ return createField(key, label, type, null, flags);
}
/**
@@ -272,12 +276,6 @@ public abstract class AbstractTaskSchema {
return field;
}
- protected Field createField(String key, String label, String type, Flag... flags) {
- Field field = new Field(key, label, type, flags);
- fieldByKey.put(key, field);
- return field;
- }
-
protected FieldFactory inheritFrom(Field source) {
return new FieldFactory(source);
}
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/DefaultTaskSchema.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/DefaultTaskSchema.java
index 4033cfc0f..c66f0bd1e 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/DefaultTaskSchema.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/DefaultTaskSchema.java
@@ -110,7 +110,7 @@ public final class DefaultTaskSchema extends AbstractTaskSchema {
Messages.DefaultTaskSchema_Modified_Label, TaskAttribute.TYPE_DATE, "modification_date", Flag.READ_ONLY); //$NON-NLS-1$
public final Field DESCRIPTION = createField(TaskAttribute.DESCRIPTION,
- Messages.DefaultTaskSchema_Description_Label, "description", TaskAttribute.TYPE_LONG_RICH_TEXT); //$NON-NLS-1$
+ Messages.DefaultTaskSchema_Description_Label, TaskAttribute.TYPE_LONG_RICH_TEXT, "description"); //$NON-NLS-1$
public final Field KEYWORDS = createField(TaskAttribute.KEYWORDS, Messages.DefaultTaskSchema_Keywords_Label,
TaskAttribute.TYPE_MULTI_SELECT, "keywords", Flag.ATTRIBUTE); //$NON-NLS-1$

Back to the top