Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2010-05-18 15:25:53 +0000
committerkmoore2010-05-18 15:25:53 +0000
commit09ed13ac9137e929b9eaed2fd02d2d952352c736 (patch)
treee3dcd963ccfaaffd020aa5b395977fb52b8ccc40
parenta162fa5666ece586486b55bcdce6dbe9fe45ab20 (diff)
downloadwebtools.dali-09ed13ac9137e929b9eaed2fd02d2d952352c736.tar.gz
webtools.dali-09ed13ac9137e929b9eaed2fd02d2d952352c736.tar.xz
webtools.dali-09ed13ac9137e929b9eaed2fd02d2d952352c736.zip
312957 - fix order-by translator
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java2
2 files changed, 10 insertions, 2 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java
index db976943d9..e33e50703a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaProject.java
@@ -519,7 +519,15 @@ public abstract class AbstractJpaProject
return null; // the file must be on the Java classpath
}
- JpaFile jpaFile = this.getJpaPlatform().buildJpaFile(this, file);
+ JpaFile jpaFile = null;
+ try {
+ jpaFile = this.getJpaPlatform().buildJpaFile(this, file);
+ }
+ catch (Exception e) {
+ //log any developer exceptions and don't build a JpaFile rather
+ //than completely failing to build the JpaProject
+ JptCorePlugin.log(e);
+ }
if (jpaFile == null) {
return null;
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java
index 8c7d0cda08..3103bc7640 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlElementCollection.java
@@ -1581,7 +1581,7 @@ public class XmlElementCollection extends AbstractXmlAttributeMapping implements
}
protected static Translator buildOrderByTranslator() {
- return new BooleanTranslator(JPA.ORDER_BY, OrmPackage.eINSTANCE.getXmlOrderable_OrderBy());
+ return new Translator(JPA.ORDER_BY, OrmPackage.eINSTANCE.getXmlOrderable_OrderBy());
}
protected static Translator buildOrderColumnTranslator() {

Back to the top