summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2009-12-29 03:28:45 (EST)
committerCaspar De Groot2009-12-29 03:28:45 (EST)
commit90c90c2016a8d082aef9151a8f86495ec18cd09d (patch)
treee1a1ad41f1bd53858f6df8a428f0913fa57e4293
parente49d962ac5da49413abd95f2a82711ddb8f63860 (diff)
downloadcdo-90c90c2016a8d082aef9151a8f86495ec18cd09d.zip
cdo-90c90c2016a8d082aef9151a8f86495ec18cd09d.tar.gz
cdo-90c90c2016a8d082aef9151a8f86495ec18cd09d.tar.bz2
Rewrote CDOObjectImpl.eDynamicIsSet in readable style (no functional change)
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java17
1 files changed, 15 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
index 9c29679..af40a83 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectImpl.java
@@ -543,8 +543,21 @@ public class CDOObjectImpl extends EStoreEObjectImpl implements InternalCDOObjec
@Override
protected boolean eDynamicIsSet(int dynamicFeatureID, EStructuralFeature eFeature)
{
- return dynamicFeatureID < 0 ? eOpenIsSet(eFeature) : !EMFUtil.isPersistent(eFeature) ? eSettingDelegate(eFeature)
- .dynamicIsSet(this, eSettings(), dynamicFeatureID) : eStore().isSet(this, eFeature);
+ if (dynamicFeatureID < 0)
+ {
+ return eOpenIsSet(eFeature);
+ }
+ else
+ {
+ if (EMFUtil.isPersistent(eFeature))
+ {
+ return eStore().isSet(this, eFeature);
+ }
+ else
+ {
+ return eSettingDelegate(eFeature).dynamicIsSet(this, eSettings(), dynamicFeatureID);
+ }
+ }
}
/**