diff options
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.core')
2 files changed, 4 insertions, 6 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttributeMapper.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttributeMapper.java index 0e8705236..9fab63822 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttributeMapper.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttributeMapper.java @@ -262,10 +262,8 @@ public class BugzillaAttributeMapper extends TaskAttributeMapper { options = configuration.getOptionValues(BugzillaAttribute.RESOLUTION, attributeProduct.getValue()); // DUPLICATE and MOVED have special meanings so do not show as resolution // TODO: COPIED FUNCTIONALITY from RepositoryConfiguration.addOperation() refactor. - if (options != null) { - options.remove("DUPLICATE"); //$NON-NLS-1$ - options.remove("MOVED"); //$NON-NLS-1$ - } + options.remove("DUPLICATE"); //$NON-NLS-1$ + options.remove("MOVED"); //$NON-NLS-1$ } Map<String, String> newOptions = new LinkedHashMap<String, String>(); for (String option : options) { @@ -292,7 +290,7 @@ public class BugzillaAttributeMapper extends TaskAttributeMapper { @Override public String getLabel(TaskAttribute taskAttribute) { if (taskAttribute.getId().startsWith(BugzillaCustomField.CUSTOM_FIELD_PREFIX)) { - return super.getLabel(taskAttribute) + ":"; + return super.getLabel(taskAttribute) + ":"; //$NON-NLS-1$ } else { return super.getLabel(taskAttribute); } diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java index a0bacede9..17d77fc2d 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java @@ -352,7 +352,7 @@ public class RepositoryConfiguration implements Serializable { case RESOLUTION: return getResolutions(); default: - return new ArrayList<String>(); + return Collections.emptyList(); } } |