Author: max.andersen(a)jboss.com
Date: 2006-10-24 06:50:28 -0400 (Tue, 24 Oct 2006)
New Revision: 10643
Modified:
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocHelper.java
Log:
HBX-787 Entity lists are not alphabetically sorted
Modified:
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocHelper.java
===================================================================
---
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocHelper.java 2006-10-24
10:49:35 UTC (rev 10642)
+++
branches/Branch_3_2/HibernateExt/tools/src/java/org/hibernate/tool/hbm2x/doc/DocHelper.java 2006-10-24
10:50:28 UTC (rev 10643)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -34,7 +35,17 @@
*/
public final class DocHelper {
- /**
+ /** used to sort pojoclass according to their declaration name */
+ static final Comparator POJOCLASS_COMPARATOR = new Comparator() {
+ public int compare(Object o1, Object o2) {
+ POJOClass that = (POJOClass) o1;
+ POJOClass what = (POJOClass) o2;
+
+ return that.getDeclarationName().compareTo(what.getDeclarationName());
+ }
+ };
+
+ /**
* Name to use if the schema is not specified.
*/
public static final String DEFAULT_NO_SCHEMA_NAME = "default";
@@ -305,12 +316,15 @@
}
/**
- * return List of POJOClass corresponding to packageName passed
+ * return a sorted List of POJOClass corresponding to packageName passed
* @param packageName packageName other than DEFAULT_NO_PACKAGE
- * @return List of POJOClass
+ * @return a sorted List of POJOClass
*/
public List getClasses(String packageName){
- return (List)classesByPackage.get(packageName);
+ List classes = (List)classesByPackage.get(packageName);
+ List orderedClasses = new ArrayList(classes);
+ Collections.sort(orderedClasses, POJOCLASS_COMPARATOR);
+ return orderedClasses;
}
/**
@@ -324,11 +338,13 @@
}
/**
- * Return List of all POJOClass
+ * Return a sorted List of all POJOClass
* @return
*/
public List getClasses(){
- return classes;
+ List orderedClasses = new ArrayList(classes);
+ Collections.sort(orderedClasses, POJOCLASS_COMPARATOR);
+ return orderedClasses;
}
/**
Show replies by date