diff options
| author | nhauge | 2009-04-10 15:40:26 +0000 |
|---|---|---|
| committer | nhauge | 2009-04-10 15:40:26 +0000 |
| commit | 0a236a4e88888497defdb5c10ef877b197f49514 (patch) | |
| tree | 3068e13e950c2ffa11b1c20381a8db5542f0093e | |
| parent | 0c78b29c0dfa31a8bea56c75e26e895848ca833d (diff) | |
| download | webtools.dali-0a236a4e88888497defdb5c10ef877b197f49514.tar.gz webtools.dali-0a236a4e88888497defdb5c10ef877b197f49514.tar.xz webtools.dali-0a236a4e88888497defdb5c10ef877b197f49514.zip | |
[270329] Committing patch - move primary keys to front of list in UI and generated code.
2 files changed, 11 insertions, 3 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenTable.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenTable.java index 98fb0c3182..05a5247e6e 100644 --- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenTable.java +++ b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenTable.java @@ -316,6 +316,9 @@ public class ORMGenTable if (column.isPrimaryKey()) { if (!includePk || isCompositeKey()) { continue; + }else{ + result.add(0, column); + continue; } } else if (isColumnInAsscociation(column, roles)) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java index 50ee02cef8..e9f0905b08 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TablesAndColumnsCustomizationWizardPage.java @@ -282,10 +282,15 @@ public class TablesAndColumnsCustomizationWizardPage extends NewTypeWizardPage { for( ORMGenColumn col : columns){ if( col.isForeignKey() ) continue; - if( col.isPrimaryKey() && isCompositePk ){ - continue; + if( col.isPrimaryKey() ){ + if( isCompositePk ){ + continue; + }else{ + ret.add(0,col ); + } + }else{ + ret.add(col); } - ret.add(col); } return ret.toArray(); } |