Fixed bad merge of metamodel to master

2014-03-29 11:13:14 -05:00 · 2014-03-29 11:13:14 -05:00 · 2e09b19b8c
parent 545516328a
commit 2e09b19b8c
1 changed files with 3 additions and 2 deletions
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/sortedcollection/Printer.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/jpamodelgen/test/sortedcollection/Printer.java
@ -30,6 +30,7 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;

+import org.hibernate.annotations.SortNatural;

 /**
 * @author Hardy Ferentschik
@ -41,11 +42,11 @@ public class Printer {
 	private long id;

 	@OneToMany
-	@Sort
+	@SortNatural
 	private SortedSet<PrintJob> printQueue;

 	@OneToMany
-	@Sort
+	@SortNatural
 	private SortedMap<String, PrintJob> printedJobs;
 }