Anonymous avatar Anonymous committed 7d56927

Use Integer.compareTo (duh)

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1970 e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (2)

src/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java

             //sort the documents, according to the "order" attribute
             Collections.sort(docs, new Comparator<Document>() {
                 public int compare(Document doc1, Document doc2) {
-                    return XmlHelper.getLoadOrder(doc1) - XmlHelper.getLoadOrder(doc2);
+                    return XmlHelper.getLoadOrder(doc1).compareTo(XmlHelper.getLoadOrder(doc2));
                 }
             });
 

src/java/com/opensymphony/xwork2/config/providers/XmlHelper.java

     /**
      * Return the value of the "order" attribute from the root element
      */
-     public static int getLoadOrder(Document doc) {
+     public static Integer getLoadOrder(Document doc) {
         Element rootElement = doc.getDocumentElement();
         String number = rootElement.getAttribute("order");
         if (StringUtils.isNotBlank(number)) {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.