Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-02-18 16:04:25 -0500
committerEike Stepper2009-02-18 16:04:25 -0500
commitbdc9486813ababcd7351c6056614fa22e2284df7 (patch)
tree3e9374f9261c973eed8e8b71619a75f7f4d4953b /plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util
parent200dcdf61a1720f029c7f4d5181c01c612688dc9 (diff)
downloadcdo-bdc9486813ababcd7351c6056614fa22e2284df7.tar.gz
cdo-bdc9486813ababcd7351c6056614fa22e2284df7.tar.xz
cdo-bdc9486813ababcd7351c6056614fa22e2284df7.zip
[262880] [UI] Integrate with Common Navigator Framework
https://bugs.eclipse.org/bugs/show_bug.cgi?id=262880
Diffstat (limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util')
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
index f8d12da1ae..5d0c9047bf 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
@@ -276,7 +276,17 @@ public final class ModelUtil
Object defaultValue = eFeature.getDefaultValue();
if (type == CDOType.CUSTOM)
{
- defaultValue = EcoreUtil.convertToString((EDataType)eFeature.getEType(), defaultValue);
+ try
+ {
+ defaultValue = EcoreUtil.convertToString((EDataType)eFeature.getEType(), defaultValue);
+ }
+ catch (RuntimeException ex)
+ {
+ if (defaultValue != null)
+ {
+ throw ex;
+ }
+ }
}
return CDOModelUtil.createAttribute(containingClass, featureID, name, type, defaultValue, many);

Back to the top