fix changing resource order

scm-core/src/main/java/sonia/scm/resources/ResourceNameComparator.java

@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.resources;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.util.Util;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.util.Comparator;
+
+/**
+ * Compare {@link Resource} objects by its name.
+ *
+ * @author Sebastian Sdorra
+ * @since 1.16
+ */
+public class ResourceNameComparator implements Comparator<Resource>
+{
+
+  /** Field description */
+  public static final ResourceNameComparator INSTANCE =
+    new ResourceNameComparator();
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param resource
+   * @param otherResource
+   *
+   * @return
+   */
+  @Override
+  public int compare(Resource resource, Resource otherResource)
+  {
+    return Util.compare(resource.getName(), otherResource.getName());
+  }
+}

scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceManager.java

@@ -30,6 +30,7 @@
  */
 
 
+
 package sonia.scm.resources;
 
 //~--- non-JDK imports --------------------------------------------------------
@@ -42,6 +43,7 @@ import sonia.scm.plugin.PluginResources;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -67,8 +69,8 @@ public abstract class AbstractResourceManager implements ResourceManager
    * @param resourceHandlers
    */
   protected AbstractResourceManager(ServletContext servletContext,
-                                 PluginLoader pluginLoader,
+                                    PluginLoader pluginLoader,
-                                 Set<ResourceHandler> resourceHandlers)
+                                    Set<ResourceHandler> resourceHandlers)
   {
     this.servletContext = servletContext;
     this.pluginLoader = pluginLoader;
@@ -125,6 +127,8 @@ public abstract class AbstractResourceManager implements ResourceManager
       }
     }
 
+    Collections.sort(resources, ResourceNameComparator.INSTANCE);
+
     return resources;
   }