Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorashatalin2007-04-06 17:12:06 +0000
committerashatalin2007-04-06 17:12:06 +0000
commitb1447e3199aca7100afdee335da1e784d9ae588f (patch)
tree5e07105155dd5120a501a628c387e4693133eb1b /plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal
parent03818cf369cc370a0567a9804ee8cd9e379916a0 (diff)
downloadorg.eclipse.gmf-tooling-b1447e3199aca7100afdee335da1e784d9ae588f.tar.gz
org.eclipse.gmf-tooling-b1447e3199aca7100afdee335da1e784d9ae588f.tar.xz
org.eclipse.gmf-tooling-b1447e3199aca7100afdee335da1e784d9ae588f.zip
[181417] - Update org.eclipse.gmf.bridge.trace/model/trace.ecore to EMF M6 + regenerate the code.
Diffstat (limited to 'plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal')
-rw-r--r--plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/impl/TraceModelImpl.java85
-rw-r--r--plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/impl/TracePackageImpl.java4
2 files changed, 47 insertions, 42 deletions
diff --git a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/impl/TraceModelImpl.java b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/impl/TraceModelImpl.java
index 7a51b960b..289ab8442 100644
--- a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/impl/TraceModelImpl.java
+++ b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/impl/TraceModelImpl.java
@@ -52,7 +52,7 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* @generated
* @ordered
*/
- protected EList nodeTraces = null;
+ protected EList<GenNodeTrace> nodeTraces;
/**
* The cached value of the '{@link #getChildNodeTraces() <em>Child Node Traces</em>}' containment reference list.
@@ -62,7 +62,7 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* @generated
* @ordered
*/
- protected EList childNodeTraces = null;
+ protected EList<GenChildNodeTrace> childNodeTraces;
/**
* The cached value of the '{@link #getLinkTraces() <em>Link Traces</em>}' containment reference list.
@@ -72,7 +72,7 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* @generated
* @ordered
*/
- protected EList linkTraces = null;
+ protected EList<GenLinkTrace> linkTraces;
/**
* The cached value of the '{@link #getToolGroupTraces() <em>Tool Group Traces</em>}' containment reference list.
@@ -82,7 +82,7 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* @generated
* @ordered
*/
- protected EList toolGroupTraces = null;
+ protected EList<ToolGroupTrace> toolGroupTraces;
/**
* <!-- begin-user-doc -->
@@ -98,6 +98,7 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
protected EClass eStaticClass() {
return TracePackage.Literals.TRACE_MODEL;
}
@@ -107,9 +108,9 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* <!-- end-user-doc -->
* @generated
*/
- public EList getNodeTraces() {
+ public EList<GenNodeTrace> getNodeTraces() {
if (nodeTraces == null) {
- nodeTraces = new EObjectContainmentEList(GenNodeTrace.class, this, TracePackage.TRACE_MODEL__NODE_TRACES);
+ nodeTraces = new EObjectContainmentEList<GenNodeTrace>(GenNodeTrace.class, this, TracePackage.TRACE_MODEL__NODE_TRACES);
}
return nodeTraces;
}
@@ -119,9 +120,9 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* <!-- end-user-doc -->
* @generated
*/
- public EList getChildNodeTraces() {
+ public EList<GenChildNodeTrace> getChildNodeTraces() {
if (childNodeTraces == null) {
- childNodeTraces = new EObjectContainmentEList(GenChildNodeTrace.class, this, TracePackage.TRACE_MODEL__CHILD_NODE_TRACES);
+ childNodeTraces = new EObjectContainmentEList<GenChildNodeTrace>(GenChildNodeTrace.class, this, TracePackage.TRACE_MODEL__CHILD_NODE_TRACES);
}
return childNodeTraces;
}
@@ -131,9 +132,9 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* <!-- end-user-doc -->
* @generated
*/
- public EList getLinkTraces() {
+ public EList<GenLinkTrace> getLinkTraces() {
if (linkTraces == null) {
- linkTraces = new EObjectContainmentEList(GenLinkTrace.class, this, TracePackage.TRACE_MODEL__LINK_TRACES);
+ linkTraces = new EObjectContainmentEList<GenLinkTrace>(GenLinkTrace.class, this, TracePackage.TRACE_MODEL__LINK_TRACES);
}
return linkTraces;
}
@@ -143,9 +144,9 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* <!-- end-user-doc -->
* @generated
*/
- public EList getToolGroupTraces() {
+ public EList<ToolGroupTrace> getToolGroupTraces() {
if (toolGroupTraces == null) {
- toolGroupTraces = new EObjectContainmentEList(ToolGroupTrace.class, this, TracePackage.TRACE_MODEL__TOOL_GROUP_TRACES);
+ toolGroupTraces = new EObjectContainmentEList<ToolGroupTrace>(ToolGroupTrace.class, this, TracePackage.TRACE_MODEL__TOOL_GROUP_TRACES);
}
return toolGroupTraces;
}
@@ -156,16 +157,14 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* @generated NOT
*/
public GenNodeTrace getNodeTrace(int visualID) {
- for (Iterator it = getNodeTraces().iterator(); it.hasNext();) {
- GenNodeTrace nextTrace = (GenNodeTrace) it.next();
- if (nextTrace.getVisualID() == visualID) {
- return nextTrace;
+ for (GenNodeTrace trace : getNodeTraces()) {
+ if (trace.getVisualID() == visualID) {
+ return trace;
}
}
- for (Iterator it = getChildNodeTraces().iterator(); it.hasNext();) {
- GenChildNodeTrace nextTrace = (GenChildNodeTrace) it.next();
- if (nextTrace.getVisualID() == visualID) {
- return nextTrace;
+ for (GenChildNodeTrace trace : getChildNodeTraces()) {
+ if (trace.getVisualID() == visualID) {
+ return trace;
}
}
@@ -178,10 +177,9 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* @generated NOT
*/
public GenLinkTrace getLinkTrace(int visualID) {
- for (Iterator it = getLinkTraces().iterator(); it.hasNext();) {
- GenLinkTrace nextTrace = (GenLinkTrace) it.next();
- if (nextTrace.getVisualID() == visualID) {
- return nextTrace;
+ for (GenLinkTrace trace : getLinkTraces()) {
+ if (trace.getVisualID() == visualID) {
+ return trace;
}
}
throw new IllegalArgumentException("Link trace with id = " + visualID + " was not found");
@@ -192,8 +190,8 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* <!-- end-user-doc -->
* @generated NOT
*/
- public EList getAllAbstractTraces() {
- Collection result = new ArrayList();
+ public EList<AbstractTrace> getAllAbstractTraces() {
+ Collection<AbstractTrace> result = new ArrayList<AbstractTrace>();
result.addAll(getNodeTraces());
addNodeChildTraces(result, getNodeTraces());
@@ -201,18 +199,16 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
addNodeChildTraces(result, getChildNodeTraces());
result.addAll(getLinkTraces());
- for (Iterator it = getLinkTraces().iterator(); it.hasNext();) {
- GenLinkTrace trace = (GenLinkTrace) it.next();
+ for (GenLinkTrace trace : getLinkTraces()) {
result.addAll(trace.getLinkLabelTraces());
}
result.addAll(getToolGroupTraces());
- return new BasicEList.UnmodifiableEList(result.size(), result.toArray());
+ return new BasicEList.UnmodifiableEList<AbstractTrace>(result.size(), result.toArray());
}
- private void addNodeChildTraces(Collection collection, Collection nodeTraces) {
- for (Iterator it = nodeTraces.iterator(); it.hasNext();) {
- GenNodeTrace trace = (GenNodeTrace) it.next();
+ private void addNodeChildTraces(Collection<AbstractTrace> collection, Collection<? extends GenNodeTrace> nodeTraces) {
+ for (GenNodeTrace trace : nodeTraces) {
collection.addAll(trace.getCompartmentTraces());
collection.addAll(trace.getNodeLabelTraces());
}
@@ -224,8 +220,7 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* @generated NOT
*/
public void purgeUnprocessedTraces() {
- for (Iterator it = getAllAbstractTraces().iterator(); it.hasNext();) {
- AbstractTrace trace = (AbstractTrace) it.next();
+ for (AbstractTrace trace : getAllAbstractTraces()) {
if (trace.isProcessed()) {
continue;
}
@@ -261,16 +256,17 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
case TracePackage.TRACE_MODEL__NODE_TRACES:
- return ((InternalEList)getNodeTraces()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getNodeTraces()).basicRemove(otherEnd, msgs);
case TracePackage.TRACE_MODEL__CHILD_NODE_TRACES:
- return ((InternalEList)getChildNodeTraces()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getChildNodeTraces()).basicRemove(otherEnd, msgs);
case TracePackage.TRACE_MODEL__LINK_TRACES:
- return ((InternalEList)getLinkTraces()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getLinkTraces()).basicRemove(otherEnd, msgs);
case TracePackage.TRACE_MODEL__TOOL_GROUP_TRACES:
- return ((InternalEList)getToolGroupTraces()).basicRemove(otherEnd, msgs);
+ return ((InternalEList<?>)getToolGroupTraces()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -280,6 +276,7 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case TracePackage.TRACE_MODEL__NODE_TRACES:
@@ -299,23 +296,25 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* <!-- end-user-doc -->
* @generated
*/
+ @SuppressWarnings("unchecked")
+ @Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
case TracePackage.TRACE_MODEL__NODE_TRACES:
getNodeTraces().clear();
- getNodeTraces().addAll((Collection)newValue);
+ getNodeTraces().addAll((Collection<? extends GenNodeTrace>)newValue);
return;
case TracePackage.TRACE_MODEL__CHILD_NODE_TRACES:
getChildNodeTraces().clear();
- getChildNodeTraces().addAll((Collection)newValue);
+ getChildNodeTraces().addAll((Collection<? extends GenChildNodeTrace>)newValue);
return;
case TracePackage.TRACE_MODEL__LINK_TRACES:
getLinkTraces().clear();
- getLinkTraces().addAll((Collection)newValue);
+ getLinkTraces().addAll((Collection<? extends GenLinkTrace>)newValue);
return;
case TracePackage.TRACE_MODEL__TOOL_GROUP_TRACES:
getToolGroupTraces().clear();
- getToolGroupTraces().addAll((Collection)newValue);
+ getToolGroupTraces().addAll((Collection<? extends ToolGroupTrace>)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -326,6 +325,7 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public void eUnset(int featureID) {
switch (featureID) {
case TracePackage.TRACE_MODEL__NODE_TRACES:
@@ -349,6 +349,7 @@ public class TraceModelImpl extends EObjectImpl implements TraceModel {
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public boolean eIsSet(int featureID) {
switch (featureID) {
case TracePackage.TRACE_MODEL__NODE_TRACES:
diff --git a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/impl/TracePackageImpl.java b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/impl/TracePackageImpl.java
index ff7732f28..188446812 100644
--- a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/impl/TracePackageImpl.java
+++ b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/impl/TracePackageImpl.java
@@ -464,6 +464,10 @@ public class TracePackageImpl extends EPackageImpl implements TracePackage {
QueryPackage theQueryPackage = (QueryPackage)EPackage.Registry.INSTANCE.getEPackage(QueryPackage.eNS_URI);
GMFGenPackage theGMFGenPackage = (GMFGenPackage)EPackage.Registry.INSTANCE.getEPackage(GMFGenPackage.eNS_URI);
+ // Create type parameters
+
+ // Set bounds for type parameters
+
// Add supertypes to classes
matchingTraceEClass.getESuperTypes().add(this.getAbstractTrace());
genNodeTraceEClass.getESuperTypes().add(this.getMatchingTrace());

Back to the top