diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo')
40 files changed, 339 insertions, 68 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/AImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/AImpl.java index 13255b7f44..97a838f8b2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/AImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/AImpl.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BImpl.java index 86bffa3c47..f2306575fb 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/BImpl.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -83,9 +83,13 @@ public class BImpl extends EObjectImpl implements B msgs = newOwnedC.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null, msgs); } if (msgs != null) + { msgs.dispatch(); + } if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.B__OWNED_C, oldOwnedC, ownedC)); + } } } return ownedC; @@ -114,9 +118,13 @@ public class BImpl extends EObjectImpl implements B ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.B__OWNED_C, oldOwnedC, newOwnedC); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -131,17 +139,25 @@ public class BImpl extends EObjectImpl implements B { NotificationChain msgs = null; if (ownedC != null) + { msgs = ((InternalEObject)ownedC).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null, msgs); + } if (newOwnedC != null) + { msgs = ((InternalEObject)newOwnedC).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.B__OWNED_C, null, msgs); + } msgs = basicSetOwnedC(newOwnedC, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.B__OWNED_C, newOwnedC, newOwnedC)); + } } /** @@ -170,7 +186,9 @@ public class BImpl extends EObjectImpl implements B { case Model6Package.B__OWNED_C: if (resolve) + { return getOwnedC(); + } return basicGetOwnedC(); } return super.eGet(featureID, resolve, coreType); diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/CImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/CImpl.java index cc48483830..eacee611a2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/CImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/CImpl.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ContainmentObjectImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ContainmentObjectImpl.java index 42c06f7b9f..e9a97051b4 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ContainmentObjectImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/ContainmentObjectImpl.java @@ -1,9 +1,10 @@ /* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -51,7 +52,7 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment /** * The cached value of the '{@link #getContainmentList() <em>Containment List</em>}' containment reference list. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getContainmentList() * @generated * @ordered @@ -98,10 +99,14 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs); } if (msgs != null) + { msgs.dispatch(); + } if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, oldContainmentOptional, containmentOptional)); + } } } return containmentOptional; @@ -130,9 +135,13 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, oldContainmentOptional, newContainmentOptional); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -147,18 +156,26 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment { NotificationChain msgs = null; if (containmentOptional != null) + { msgs = ((InternalEObject)containmentOptional).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs); + } if (newContainmentOptional != null) + { msgs = ((InternalEObject)newContainmentOptional).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, null, msgs); + } msgs = basicSetContainmentOptional(newContainmentOptional, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL, newContainmentOptional, newContainmentOptional)); + } } /** @@ -203,7 +220,9 @@ public class ContainmentObjectImpl extends BaseObjectImpl implements Containment { case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_OPTIONAL: if (resolve) + { return getContainmentOptional(); + } return basicGetContainmentOptional(); case Model6Package.CONTAINMENT_OBJECT__CONTAINMENT_LIST: return getContainmentList(); diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/DImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/DImpl.java index 4e84da1cb0..9b65632edc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/DImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/DImpl.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -85,9 +85,13 @@ public class DImpl extends EObjectImpl implements D ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.D__DATA, oldData, newData); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -102,15 +106,23 @@ public class DImpl extends EObjectImpl implements D { NotificationChain msgs = null; if (data != null) + { msgs = ((InternalEObject)data).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.D__DATA, null, msgs); + } if (newData != null) + { msgs = ((InternalEObject)newData).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.D__DATA, null, msgs); + } msgs = basicSetData(newData, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.D__DATA, newData, newData)); + } } /** diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/EImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/EImpl.java index 7c38603774..03abb48247 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/EImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/EImpl.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/FImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/FImpl.java index 29294f6cd1..16c77153a0 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/FImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/FImpl.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/GImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/GImpl.java index 5c3288763e..7e6eabe4fd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/GImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/GImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.legacy.model6.impl; @@ -148,7 +156,9 @@ public class GImpl extends EObjectImpl implements G String oldDummy = dummy; dummy = newDummy; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.G__DUMMY, oldDummy, dummy)); + } } /** @@ -165,7 +175,9 @@ public class GImpl extends EObjectImpl implements G if (reference != oldReference) { if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.G__REFERENCE, oldReference, reference)); + } } } return reference; @@ -191,7 +203,9 @@ public class GImpl extends EObjectImpl implements G BaseObject oldReference = reference; reference = newReference; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.G__REFERENCE, oldReference, reference)); + } } /** @@ -252,7 +266,9 @@ public class GImpl extends EObjectImpl implements G return getDummy(); case Model6Package.G__REFERENCE: if (resolve) + { return getReference(); + } return basicGetReference(); case Model6Package.G__LIST: return getList(); @@ -337,7 +353,9 @@ public class GImpl extends EObjectImpl implements G public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (dummy: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/MyEnumListImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/MyEnumListImpl.java index fb2bc23625..dd131905f1 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/MyEnumListImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/MyEnumListImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.legacy.model6.impl; @@ -150,7 +158,9 @@ public class MyEnumListImpl extends EObjectImpl implements MyEnumList public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (myEnum: "); @@ -159,4 +169,4 @@ public class MyEnumListImpl extends EObjectImpl implements MyEnumList return result.toString(); } -} //MyEnumListImpl +} // MyEnumListImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/MyEnumListUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/MyEnumListUnsettableImpl.java index aaf21455a9..6a876e5f07 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/MyEnumListUnsettableImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/MyEnumListUnsettableImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.legacy.model6.impl; @@ -83,7 +91,9 @@ public class MyEnumListUnsettableImpl extends EObjectImpl implements MyEnumListU public void unsetMyEnum() { if (myEnum != null) + { ((InternalEList.Unsettable<?>)myEnum).unset(); + } } /** @@ -173,7 +183,9 @@ public class MyEnumListUnsettableImpl extends EObjectImpl implements MyEnumListU public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (myEnum: "); @@ -182,4 +194,4 @@ public class MyEnumListUnsettableImpl extends EObjectImpl implements MyEnumListU return result.toString(); } -} //MyEnumListUnsettableImpl +} // MyEnumListUnsettableImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/PropertiesMapEntryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/PropertiesMapEntryImpl.java index d42a65ab75..819a0fa27e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/PropertiesMapEntryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/PropertiesMapEntryImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.legacy.model6.impl; @@ -102,7 +110,9 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent String oldKey = key; key = newKey; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY__KEY, oldKey, key)); + } } /** @@ -127,10 +137,14 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent msgs); } if (msgs != null) + { msgs.dispatch(); + } if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model6Package.PROPERTIES_MAP_ENTRY__VALUE, oldValue, value)); + } } } return value; @@ -160,9 +174,13 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY__VALUE, oldValue, newValue); if (msgs == null) + { msgs = notification; + } else + { msgs.add(notification); + } } return msgs; } @@ -178,18 +196,26 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent { NotificationChain msgs = null; if (value != null) + { msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, msgs); + } if (newValue != null) + { msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Model6Package.PROPERTIES_MAP_ENTRY__VALUE, null, msgs); + } msgs = basicSetTypedValue(newValue, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY__VALUE, newValue, newValue)); + } } /** @@ -222,7 +248,9 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent return getTypedKey(); case Model6Package.PROPERTIES_MAP_ENTRY__VALUE: if (resolve) + { return getTypedValue(); + } return basicGetTypedValue(); } return super.eGet(featureID, resolve, coreType); @@ -295,7 +323,9 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (key: "); @@ -321,7 +351,7 @@ public class PropertiesMapEntryImpl extends EObjectImpl implements BasicEMap.Ent if (hash == -1) { Object theKey = getKey(); - hash = (theKey == null ? 0 : theKey.hashCode()); + hash = theKey == null ? 0 : theKey.hashCode(); } return hash; } diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/PropertiesMapEntryValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/PropertiesMapEntryValueImpl.java index bbde7e24ca..a642c87b59 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/PropertiesMapEntryValueImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/PropertiesMapEntryValueImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.legacy.model6.impl; @@ -86,8 +94,10 @@ public class PropertiesMapEntryValueImpl extends EObjectImpl implements Properti String oldLabel = label; label = newLabel; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP_ENTRY_VALUE__LABEL, oldLabel, label)); + } } /** @@ -165,7 +175,9 @@ public class PropertiesMapEntryValueImpl extends EObjectImpl implements Properti public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (label: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/PropertiesMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/PropertiesMapImpl.java index 3d50ff084b..3e933d119c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/PropertiesMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/PropertiesMapImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.legacy.model6.impl; @@ -115,7 +123,9 @@ public class PropertiesMapImpl extends EObjectImpl implements PropertiesMap String oldLabel = label; label = newLabel; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, Model6Package.PROPERTIES_MAP__LABEL, oldLabel, label)); + } } /** @@ -180,14 +190,22 @@ public class PropertiesMapImpl extends EObjectImpl implements PropertiesMap return getLabel(); case Model6Package.PROPERTIES_MAP__PERSISTENT_MAP: if (coreType) + { return getPersistentMap(); + } else + { return getPersistentMap().map(); + } case Model6Package.PROPERTIES_MAP__TRANSIENT_MAP: if (coreType) + { return getTransientMap(); + } else + { return getTransientMap().map(); + } } return super.eGet(featureID, resolve, coreType); } @@ -267,7 +285,9 @@ public class PropertiesMapImpl extends EObjectImpl implements PropertiesMap public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (label: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/UnorderedListImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/UnorderedListImpl.java index 647715961a..a5f33917d2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/UnorderedListImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/legacy/model6/impl/UnorderedListImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.legacy.model6.impl; @@ -33,7 +41,7 @@ public class UnorderedListImpl extends EObjectImpl implements UnorderedList /** * The cached value of the '{@link #getContained() <em>Contained</em>}' containment reference list. <!-- * begin-user-doc --> <!-- end-user-doc --> - * + * * @see #getContained() * @generated * @ordered diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java index 08f03dc753..fc3eeb35db 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/A.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java index 9a42f476ea..eaf33bd87f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/B.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ @@ -31,7 +31,7 @@ public interface B extends EObject /** * Returns the value of the '<em><b>Owned C</b></em>' containment reference. <!-- begin-user-doc --> <!-- end-user-doc * --> <!-- begin-model-doc --> The style of the node. <!-- end-model-doc --> - * + * * @return the value of the '<em>Owned C</em>' containment reference. * @see #setOwnedC(C) * @see org.eclipse.emf.cdo.tests.model6.Model6Package#getB_OwnedC() diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java index 27493095d5..eca1dda471 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/C.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java index b9c9df7bf2..b8be2f1591 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/D.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java index d5fb548c99..4493889f3c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/E.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java index c4178c4fc6..936d7adf94 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/F.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java index e90dd79424..8d2590b58e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/G.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6; diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java index 0d6527b749..bbd6d2de5d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnum.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6; @@ -271,4 +279,4 @@ public enum MyEnum implements Enumerator return literal; } -} //MyEnum +} // MyEnum diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java index a19960033f..bd17efd85c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumList.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6; diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java index 47c12c8a20..6fd33f9361 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/MyEnumListUnsettable.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6; diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java index b46c092eee..45d9a6d6bc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMap.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6; diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java index 4a7e4f3118..9aac0e4187 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/PropertiesMapEntryValue.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6; diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java index 7a3f00b969..3dcb6e32a9 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/UnorderedList.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6; diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/AImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/AImpl.java index c362f18cee..3bf52185fd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/AImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/AImpl.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BImpl.java index af2851a212..1323dcc68b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/BImpl.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/CImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/CImpl.java index 91eafa757a..2122f607e7 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/CImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/CImpl.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/DImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/DImpl.java index db1e8463c3..70b4a2be47 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/DImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/DImpl.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/EImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/EImpl.java index 73a1408090..eac12e5bba 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/EImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/EImpl.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/FImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/FImpl.java index 07c93997bb..3ec46e9a45 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/FImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/FImpl.java @@ -1,10 +1,10 @@ -/** +/* * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * Eike Stepper - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/GImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/GImpl.java index e0c91d70d2..982a3ada7b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/GImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/GImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6.impl; diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/MyEnumListImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/MyEnumListImpl.java index d0b421379f..112021283c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/MyEnumListImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/MyEnumListImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6.impl; @@ -69,4 +77,4 @@ public class MyEnumListImpl extends CDOObjectImpl implements MyEnumList return (EList<MyEnum>)eGet(Model6Package.Literals.MY_ENUM_LIST__MY_ENUM, true); } -} //MyEnumListImpl +} // MyEnumListImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/MyEnumListUnsettableImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/MyEnumListUnsettableImpl.java index 673b2e53f5..e9c3bb58dd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/MyEnumListUnsettableImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/MyEnumListUnsettableImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6.impl; @@ -89,4 +97,4 @@ public class MyEnumListUnsettableImpl extends CDOObjectImpl implements MyEnumLis return eIsSet(Model6Package.Literals.MY_ENUM_LIST_UNSETTABLE__MY_ENUM); } -} //MyEnumListUnsettableImpl +} // MyEnumListUnsettableImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapEntryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapEntryImpl.java index 8bbcad9578..128d7f701f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapEntryImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapEntryImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6.impl; @@ -117,7 +125,7 @@ public class PropertiesMapEntryImpl extends CDOObjectImpl implements BasicEMap.E if (hash == -1) { Object theKey = getKey(); - hash = (theKey == null ? 0 : theKey.hashCode()); + hash = theKey == null ? 0 : theKey.hashCode(); } return hash; } diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapEntryValueImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapEntryValueImpl.java index 59ad394e6f..0c648553b3 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapEntryValueImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapEntryValueImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6.impl; diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapImpl.java index 28a6d2cf19..0033c84c6f 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/PropertiesMapImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6.impl; diff --git a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/UnorderedListImpl.java b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/UnorderedListImpl.java index 2db9c17684..ec8b5e9c7b 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/UnorderedListImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model6/src/org/eclipse/emf/cdo/tests/model6/impl/UnorderedListImpl.java @@ -1,4 +1,12 @@ -/** +/* + * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Eike Stepper - initial API and implementation */ package org.eclipse.emf.cdo.tests.model6.impl; |