summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNan Li2013-05-09 15:38:54 (EDT)
committer Neil Hauge2013-05-09 15:38:54 (EDT)
commit2310a0060bd7da25a8291ab8fdf60bf1d9bccc97 (patch)
treecadd91150472c1f9c5c516d39a6bdc39d377f357
parent7582fde2b8ae4bcaf2edc077be9863cc4544c101 (diff)
downloadwebtools.dali-2310a0060bd7da25a8291ab8fdf60bf1d9bccc97.zip
webtools.dali-2310a0060bd7da25a8291ab8fdf60bf1d9bccc97.tar.gz
webtools.dali-2310a0060bd7da25a8291ab8fdf60bf1d9bccc97.tar.bz2
407467 - fix order column ordering.
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java
index 5f3ab95..ef36c93 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java
@@ -280,6 +280,9 @@ public class GenericJavaOrderable
if (this.getOrderColumnAnnotation() == null) {
this.addOrderColumnAnnotation();
}
+ if (this.getOrderByAnnotation() != null) {
+ this.removeOrderByAnnotation();
+ }
this.setSpecifiedOrderBy_(null);
this.setNoOrdering_(false);