294771 - sort user added associations in entity gen wizard - contributed patch.

1 files changed, 22 insertions, 0 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/ORMGenCustomizer.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/ORMGenCustomizer.java
index c42694e86e..126279f92d 100644
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/ORMGenCustomizer.java
+++ b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/ORMGenCustomizer.java
@@ -15,6 +15,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -590,6 +592,8 @@ public abstract class ORMGenCustomizer implements java.io.Serializable
 			 * the last time the state was persisted. Pass checkExisting true so that the 
 			 * associations restored above are not overwritten.*/
 			addForeignKeyAssociations(true/*checkExisting*/);
+			// sort on restore
+			sortAssociations( mAssociations );
 		}
 	}
 	/**
@@ -786,4 +790,22 @@ public abstract class ORMGenCustomizer implements java.io.Serializable
 		}
 		int mVersion;
 	}
+	
+	private void sortAssociations( List< Association > list ) {
+	   Collections.sort( list, new Comparator< Association >() {
+	      public int compare( Association lhs, Association rhs ) {
+	         // sort by referrer table name first...
+	         int test = lhs.getReferrerTableName().compareTo( rhs.getReferrerTableName() );
+            if( test != 0 )
+               return test;
+            // then by referenced table name...
+            test = lhs.getReferencedTableName().compareTo( rhs.getReferencedTableName() );
+            if( test != 0 )
+               return test;
+            // if referrer and referenced tables are the same, they should
+            // appear next to each other
+            return 0;
+	      }
+	   } );
+	}
 }