Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-09-21 16:44:17 +0000
committerEike Stepper2013-09-21 16:44:17 +0000
commit32b9825d0d19b5bd18e4c3bf4d66b5312f0551d3 (patch)
treef30e07150bf9b87bb7f87e00ef8e7e3fb945a184 /plugins/org.eclipse.emf.cdo.tests.model3
parent3a5aed9500d5fc42cbbc2b8764e41398c7ded662 (diff)
downloadcdo-32b9825d0d19b5bd18e4c3bf4d66b5312f0551d3.tar.gz
cdo-32b9825d0d19b5bd18e4c3bf4d66b5312f0551d3.tar.xz
cdo-32b9825d0d19b5bd18e4c3bf4d66b5312f0551d3.zip
Adjust copyrights
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model3')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeE.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeEImpl.java17
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java31
5 files changed, 45 insertions, 18 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java
index 112d1ccb1a..317bd95ce3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Factory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2008-2013 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java
index c7ae7c7196..a29adf009b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/Model3Package.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2012 Eike Stepper (Berlin, Germany) and others.
+ * Copyright (c) 2008-2013 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
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeE.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeE.java
index b4221e8d3c..759705f6c4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeE.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/NodeE.java
@@ -1,9 +1,16 @@
-/**
+/*
+ * Copyright (c) 2013 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.model3;
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EObject;
/**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeEImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeEImpl.java
index 818f1062d6..ea7bf3530f 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeEImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/NodeEImpl.java
@@ -1,4 +1,12 @@
-/**
+/*
+ * Copyright (c) 2013 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.model3.impl;
@@ -6,12 +14,11 @@ import org.eclipse.emf.cdo.tests.model3.Model3Package;
import org.eclipse.emf.cdo.tests.model3.NodeA;
import org.eclipse.emf.cdo.tests.model3.NodeE;
-import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.internal.cdo.CDOObjectImpl;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.internal.cdo.CDOObjectImpl;
-
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Node E</b></em>'.
@@ -112,4 +119,4 @@ public class NodeEImpl extends CDOObjectImpl implements NodeE
return (EList<NodeA>)eGet(Model3Package.eINSTANCE.getNodeE_OtherNodes(), true);
}
-} //NodeEImpl
+} // NodeEImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java
index bc261bc216..cb04c701ba 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java
@@ -1,26 +1,29 @@
-/**
+/*
+ * Copyright (c) 2013 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.model3.legacy.impl;
-import java.util.Collection;
-
import org.eclipse.emf.cdo.tests.model3.NodeA;
import org.eclipse.emf.cdo.tests.model3.NodeE;
-
import org.eclipse.emf.cdo.tests.model3.legacy.Model3Package;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.common.util.EList;
-
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
-
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
-
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import java.util.Collection;
+
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Node E</b></em>'.
@@ -113,8 +116,10 @@ public class NodeEImpl extends EObjectImpl implements NodeE
if (mainNode != oldMainNode)
{
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, Model3Package.NODE_E__MAIN_NODE, oldMainNode,
mainNode));
+ }
}
}
return mainNode;
@@ -140,7 +145,9 @@ public class NodeEImpl extends EObjectImpl implements NodeE
NodeA oldMainNode = mainNode;
mainNode = newMainNode;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.NODE_E__MAIN_NODE, oldMainNode, mainNode));
+ }
}
/**
@@ -163,7 +170,9 @@ public class NodeEImpl extends EObjectImpl implements NodeE
String oldName = name;
name = newName;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, Model3Package.NODE_E__NAME, oldName, name));
+ }
}
/**
@@ -192,7 +201,9 @@ public class NodeEImpl extends EObjectImpl implements NodeE
{
case Model3Package.NODE_E__MAIN_NODE:
if (resolve)
+ {
return getMainNode();
+ }
return basicGetMainNode();
case Model3Package.NODE_E__NAME:
return getName();
@@ -279,7 +290,9 @@ public class NodeEImpl extends EObjectImpl implements NodeE
public String toString()
{
if (eIsProxy())
+ {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (name: ");
@@ -288,4 +301,4 @@ public class NodeEImpl extends EObjectImpl implements NodeE
return result.toString();
}
-} //NodeEImpl
+} // NodeEImpl

Back to the top