[JENKINS-31162] Polish before RC

jenkinsci · Apr 5, 2016 · 770a8b2 · 770a8b2
1 parent 9920b9c
commit 770a8b2
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 30 deletions.
diff --git a/core/src/main/java/hudson/model/FreeStyleProject.java b/core/src/main/java/hudson/model/FreeStyleProject.java
@@ -25,7 +25,7 @@
 
 import hudson.Extension;
 import jenkins.model.Jenkins;
-import jenkins.model.item_category.StandaloneProjectsCategory;
+import jenkins.model.ItemCategory.StandaloneProjectsCategory;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 

diff --git a/core/src/main/java/hudson/model/TopLevelItemDescriptor.java b/core/src/main/java/hudson/model/TopLevelItemDescriptor.java
@@ -25,7 +25,7 @@
 
 import hudson.ExtensionList;
 import jenkins.model.Jenkins;
-import jenkins.model.item_category.ItemCategory;
+import jenkins.model.ItemCategory.ItemCategory;
 import org.acegisecurity.AccessDeniedException;
 import org.apache.commons.jelly.Script;
 import org.apache.commons.jelly.XMLOutput;

diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
@@ -56,11 +56,11 @@
 import hudson.util.XStream2;
 import hudson.views.ListViewColumn;
 import hudson.widgets.Widget;
-import jenkins.model.item_category.Categories;
 import jenkins.model.Jenkins;
 import jenkins.model.ModelObjectWithChildren;
-import jenkins.model.item_category.Category;
-import jenkins.model.item_category.ItemCategory;
+import jenkins.model.ItemCategory.Categories;
+import jenkins.model.ItemCategory.Category;
+import jenkins.model.ItemCategory.ItemCategory;
 import jenkins.util.ProgressiveRendering;
 import jenkins.util.xml.XMLUtils;
 

diff --git a/...nkins/model/item_category/Categories.java → ...enkins/model/ItemCategory/Categories.java b/...nkins/model/item_category/Categories.java → ...enkins/model/ItemCategory/Categories.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright 2016 CloudBees, Inc.
+ * Copyright (c) 2016 CloudBees, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package jenkins.model.item_category;
+package jenkins.model.ItemCategory;
 
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;

diff --git a/...jenkins/model/item_category/Category.java → .../jenkins/model/ItemCategory/Category.java b/...jenkins/model/item_category/Category.java → .../jenkins/model/ItemCategory/Category.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package jenkins.model.item_category;
+package jenkins.model.ItemCategory;
 
 import hudson.model.TopLevelItem;
 import org.kohsuke.accmod.Restricted;

diff --git a/...ins/model/item_category/ItemCategory.java → ...kins/model/ItemCategory/ItemCategory.java b/...ins/model/item_category/ItemCategory.java → ...kins/model/ItemCategory/ItemCategory.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright 2016 CloudBees, Inc.
+ * Copyright (c) 2016 CloudBees, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,13 +22,12 @@
  * THE SOFTWARE.
  */
 
-package jenkins.model.item_category;
+package jenkins.model.ItemCategory;
 
 import hudson.Extension;
 import hudson.ExtensionList;
 import hudson.ExtensionPoint;
 import hudson.model.TopLevelItemDescriptor;
-import jenkins.model.Messages;
 
 import javax.annotation.Nonnull;
 
@@ -116,12 +115,12 @@ public String getId() {
 
         @Override
         public String getDescription() {
-            return Messages.ItemCategory_Uncategorized_Description();
+            return Messages.Uncategorized_Description();
         }
 
         @Override
         public String getDisplayName() {
-            return Messages.ItemCategory_Uncategorized_DisplayName();
+            return Messages.Uncategorized_DisplayName();
         }
 
         @Override

diff --git a/...item_category/NestedProjectsCategory.java → .../ItemCategory/NestedProjectsCategory.java b/...item_category/NestedProjectsCategory.java → .../ItemCategory/NestedProjectsCategory.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright 2016 CloudBees, Inc.
+ * Copyright (c) 2016 CloudBees, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,10 +22,9 @@
  * THE SOFTWARE.
  */
 
-package jenkins.model.item_category;
+package jenkins.model.ItemCategory;
 
 import hudson.Extension;
-import jenkins.model.Messages;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
 
@@ -53,12 +52,12 @@ public String getId() {
 
     @Override
     public String getDescription() {
-        return Messages.ItemCategory_NestedProjects_Description();
+        return Messages.NestedProjects_Description();
     }
 
     @Override
     public String getDisplayName() {
-        return Messages.ItemCategory_NestedProjects_DisplayName();
+        return Messages.NestedProjects_DisplayName();
     }
 
     @Override

diff --git a/..._category/StandaloneProjectsCategory.java → ...mCategory/StandaloneProjectsCategory.java b/..._category/StandaloneProjectsCategory.java → ...mCategory/StandaloneProjectsCategory.java
@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright 2016 CloudBees, Inc.
+ * Copyright (c) 2016 CloudBees, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,10 +22,9 @@
  * THE SOFTWARE.
  */
 
-package jenkins.model.item_category;
+package jenkins.model.ItemCategory;
 
 import hudson.Extension;
-import jenkins.model.Messages;
 
 /**
  * Designed for projects with a self-contained configuration and history.
@@ -42,12 +41,12 @@ public String getId() {
 
     @Override
     public String getDescription() {
-        return Messages.ItemCategory_StandaloneProjects_Description();
+        return Messages.StandaloneProjects_Description();
     }
 
     @Override
     public String getDisplayName() {
-        return Messages.ItemCategory_StandaloneProjects_DisplayName();
+        return Messages.StandaloneProjects_DisplayName();
     }
 
     @Override

diff --git a/core/src/main/resources/jenkins/model/ItemCategory/Messages.properties b/core/src/main/resources/jenkins/model/ItemCategory/Messages.properties
@@ -0,0 +1,28 @@
+# The MIT License
+#
+# Copyright (c) 2016, CloudBees, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Uncategorized.DisplayName=Uncategorized
+Uncategorized.Description=Item types that have not yet been categorized by their plugin maintainer.
+StandaloneProjects.DisplayName=Standalone Projects
+StandaloneProjects.Description=Create projects with a self-contained configuration and history. These projects can be at the top-level or grouped within folders.
+NestedProjects.DisplayName=Nested Projects
+NestedProjects.Description=Create project categories or project hierarchies with folders. Folders can be created manually or automatically based on repositories.
diff --git a/core/src/main/resources/jenkins/model/Messages.properties b/core/src/main/resources/jenkins/model/Messages.properties
@@ -71,10 +71,3 @@ ParameterizedJobMixIn.build_now=Build Now
 BlockedBecauseOfBuildInProgress.shortDescription=Build #{0} is already in progress{1}
 BlockedBecauseOfBuildInProgress.ETA=\ (ETA:{0})
 BuildDiscarderProperty.displayName=Discard Old Builds
-
-ItemCategory.Uncategorized.DisplayName=Uncategorized
-ItemCategory.Uncategorized.Description=Item types that have not yet been categorized by their plugin maintainer.
-ItemCategory.StandaloneProjects.DisplayName=Standalone Projects
-ItemCategory.StandaloneProjects.Description=Create projects with a self-contained configuration and history. These projects can be at the top-level or grouped within folders.
-ItemCategory.NestedProjects.DisplayName=Nested Projects
-ItemCategory.NestedProjects.Description=Create project categories or project hierarchies with folders. Folders can be created manually or automatically based on repositories.