[JENKINS-31162] Constants as identifiers of the categories

jenkinsci · Mar 21, 2016 · ad2ae9d · ad2ae9d
1 parent 60803d4
commit ad2ae9d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/core/src/main/java/hudson/model/FreeStyleProject.java b/core/src/main/java/hudson/model/FreeStyleProject.java
@@ -25,6 +25,7 @@
 
 import hudson.Extension;
 import jenkins.model.Jenkins;
+import jenkins.model.item_category.StandaloneProjectsCategory;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -81,7 +82,7 @@ public String getDescription() {
 
         @Override
         public String getCategoryId() {
-            return "standaloneprojects";
+            return StandaloneProjectsCategory.ID;
         }
 
         @Override

diff --git a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
@@ -174,7 +174,7 @@ public String getDescription() {
      */
     @Nonnull
     public String getCategoryId() {
-        return new ItemCategory.UncategorizedCategory().getId();
+        return ItemCategory.UncategorizedCategory.ID;
     }
 
     /**

diff --git a/core/src/main/java/jenkins/model/item_category/ItemCategory.java b/core/src/main/java/jenkins/model/item_category/ItemCategory.java
@@ -82,9 +82,11 @@ public static ItemCategory getCategory(TopLevelItemDescriptor descriptor) {
     @Extension(ordinal = Integer.MIN_VALUE)
     public static final class UncategorizedCategory extends ItemCategory {
 
+        public static final String ID = "uncategorized";
+
         @Override
         public String getId() {
-            return "uncategorized";
+            return ID;
         }
 
         @Override

diff --git a/core/src/main/java/jenkins/model/item_category/StandaloneProjectsCategory.java b/core/src/main/java/jenkins/model/item_category/StandaloneProjectsCategory.java
@@ -9,9 +9,11 @@
 @Extension(ordinal = Integer.MIN_VALUE + 1)
 public class StandaloneProjectsCategory extends ItemCategory {
 
+    public static final String ID = "standaloneprojects";
+
     @Override
     public String getId() {
-        return "standaloneprojects";
+        return ID;
     }
 
     @Override