From c0bf2dee3708a4e5ddee0f80dfdf0c2fe45c8815 Mon Sep 17 00:00:00 2001 From: recena Date: Tue, 15 Mar 2016 13:04:17 +0100 Subject: [PATCH] [JENKINS-31162] @jglick's comment was addressed. A getEffectiveClazzFor() method was added to determine effective clazz of CustomOrganizationFolderDescriptor --- .../java/hudson/model/ItemGroupMixIn.java | 7 ++-- .../ItemCategoryConfigurator.java | 38 ++++++++++++++++++- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java index 96913f748b..79c19daeac 100644 --- a/core/src/main/java/hudson/model/ItemGroupMixIn.java +++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java @@ -344,13 +344,14 @@ public abstract class ItemGroupMixIn { */ public static Categories getCategories(Authentication a, ItemGroup c) { Categories categories = new Categories(); - for (TopLevelItemDescriptor descriptor : Items.all(a, c)) { + for (TopLevelItemDescriptor descriptor : DescriptorVisibilityFilter.apply(c, Items.all(a, c))) { + String effectiveClazz = ItemCategoryConfigurator.getEffectiveClazz(descriptor); ItemCategory ic = ItemCategoryConfigurator.getCategory(descriptor); Map metadata = new HashMap(); // Information about Item. - metadata.put("class", descriptor.clazz.getName()); - metadata.put("iconClassName", "item-icon-" + descriptor.clazz.getName().substring(descriptor.clazz.getName().lastIndexOf(".") + 1).toLowerCase()); + metadata.put("class", effectiveClazz); + metadata.put("iconClassName", "item-icon-" + effectiveClazz.substring(descriptor.clazz.getName().lastIndexOf(".") + 1).toLowerCase()); metadata.put("weight", ItemCategoryConfigurator.getWeight(descriptor)); metadata.put("name", descriptor.getDisplayName()); metadata.put("description", ItemCategoryConfigurator.getDescription(descriptor)); diff --git a/core/src/main/java/jenkins/model/item_category/ItemCategoryConfigurator.java b/core/src/main/java/jenkins/model/item_category/ItemCategoryConfigurator.java index f15e863f89..9149c9193e 100644 --- a/core/src/main/java/jenkins/model/item_category/ItemCategoryConfigurator.java +++ b/core/src/main/java/jenkins/model/item_category/ItemCategoryConfigurator.java @@ -85,7 +85,7 @@ public abstract class ItemCategoryConfigurator implements ExtensionPoint { protected abstract String getDescriptionFor(@Nonnull TopLevelItemDescriptor descriptor); /** - * Finds the weight specified by the first configurator. + * Finds the description specified by the first configurator. * If none can be found a empty string is returned. {@see DefaultConfigurator#getDescriptionFor}. * * @param descriptor the item to categorize. @@ -103,12 +103,41 @@ public abstract class ItemCategoryConfigurator implements ExtensionPoint { throw new IllegalStateException("At least, a default value must exist for description field"); } + /** + * Provides the effective clazz for the requested item or null if this configurator doesn't have one. + * + * @param descriptor the item to categorize + * + * @return A string or null + */ + @CheckForNull + protected abstract String getEffectiveClazzFor(@Nonnull TopLevelItemDescriptor descriptor); + + /** + * Finds the weight specified by the first configurator. + * If none can be found a empty string with {@code descriptor.clazz.getName();} is returned. {@see DefaultConfigurator#getEffectiveClazzFor}. + * + * @param descriptor the item to categorize. + * + * @return A {@link ItemCategory} + */ + @Nonnull + public static String getEffectiveClazz(@Nonnull TopLevelItemDescriptor descriptor) { + for (ItemCategoryConfigurator m : all()) { + String clazz = m.getEffectiveClazzFor(descriptor); + if (clazz != null) { + return clazz; + } + } + throw new IllegalStateException("At least, a default value must exist for clazz field"); + } + public static Collection all() { return ExtensionList.lookup(ItemCategoryConfigurator.class); } /** - * Default configurator with the lowest ordinal that simply returns {@link ItemCategory.BasicProjects}. + * Default configurator with the lowest ordinal that simply returns default values. */ @Extension(ordinal = Integer.MIN_VALUE) public static final class DefaultConfigurator extends ItemCategoryConfigurator { @@ -131,5 +160,10 @@ public abstract class ItemCategoryConfigurator implements ExtensionPoint { return ""; } + @Nonnull + @Override + public String getEffectiveClazzFor(@Nonnull TopLevelItemDescriptor descriptor) { + return descriptor.clazz.getName(); + } } }