[181417] - Update org.eclipse.gmf.bridge.trace/model/trace.ecore to EMF M6 + regenerate the code.

4 files changed, 20 insertions, 24 deletions

diff --git a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/GenLinkTrace.java b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/GenLinkTrace.java
index 66a504f4e..cd58dff5a 100644
--- a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/GenLinkTrace.java
+++ b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/GenLinkTrace.java
@@ -41,7 +41,7 @@ public interface GenLinkTrace extends MatchingTrace {
 	 * @model type="org.eclipse.gmf.internal.bridge.trace.GenLinkLabelTrace" containment="true"
 	 * @generated
 	 */
-	EList getLinkLabelTraces();
+	EList<GenLinkLabelTrace> getLinkLabelTraces();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/GenNodeTrace.java b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/GenNodeTrace.java
index 828640bd2..089b045f6 100644
--- a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/GenNodeTrace.java
+++ b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/GenNodeTrace.java
@@ -42,7 +42,7 @@ public interface GenNodeTrace extends MatchingTrace {
 	 * @model type="org.eclipse.gmf.internal.bridge.trace.GenNodeLabelTrace" containment="true"
 	 * @generated
 	 */
-	EList getNodeLabelTraces();
+	EList<GenNodeLabelTrace> getNodeLabelTraces();
 
 	/**
 	 * Returns the value of the '<em><b>Compartment Traces</b></em>' containment reference list.
@@ -58,7 +58,7 @@ public interface GenNodeTrace extends MatchingTrace {
 	 * @model type="org.eclipse.gmf.internal.bridge.trace.GenCompartmentTrace" containment="true"
 	 * @generated
 	 */
-	EList getCompartmentTraces();
+	EList<GenCompartmentTrace> getCompartmentTraces();
 
 	/**
 	 * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/MergingIdentifierDispenser.java b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/MergingIdentifierDispenser.java
index c37dd2881..06ebea4ab 100644
--- a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/MergingIdentifierDispenser.java
+++ b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/MergingIdentifierDispenser.java
@@ -55,7 +55,7 @@ public class MergingIdentifierDispenser implements StatefulVisualIdentifierDispe
 	private int myOverflowCount = OVERFLOW_COUNT_BASE;
 	
 	private TraceModel myTraceModel;
-	private Map mySavingOptions;
+	private Map<String, String> mySavingOptions;
 	
 	public void loadState(URI genModelFileURI) {
 		loadTraceModel(genModelFileURI);
@@ -72,9 +72,9 @@ public class MergingIdentifierDispenser implements StatefulVisualIdentifierDispe
 		myTraceModel = null;
 	}
 	
-	private Map getSavingOptions() {
+	private Map<?, ?> getSavingOptions() {
 		if (mySavingOptions == null) {
-			mySavingOptions = new HashMap();
+			mySavingOptions = new HashMap<String, String>();
 			mySavingOptions.put(XMIResource.OPTION_ENCODING, "UTF-8");
 		}
 		return mySavingOptions;
@@ -106,28 +106,25 @@ public class MergingIdentifierDispenser implements StatefulVisualIdentifierDispe
 		initNodeChildrenCounters(myTraceModel.getNodeTraces());
 		initNodeChildrenCounters(myTraceModel.getChildNodeTraces());
 
-		for (Iterator it = myTraceModel.getLinkTraces().iterator(); it.hasNext();) {
-			GenLinkTrace trace = (GenLinkTrace) it.next();
+		for (GenLinkTrace trace : myTraceModel.getLinkTraces()) {
 			myLinkLabelCount = Math.max(myLinkLabelCount, getMaxVid(trace.getLinkLabelTraces()));
 		}
 		
 		myToolGroupCount = Math.max(myToolGroupCount, getMaxVid(myTraceModel.getToolGroupTraces()));
 	}
 	
-	private void initNodeChildrenCounters(Collection nodeTraces) {
-		for (Iterator it = nodeTraces.iterator(); it.hasNext();) {
-			GenNodeTrace trace = (GenNodeTrace) it.next();
+	private void initNodeChildrenCounters(Collection<? extends GenNodeTrace> nodeTraces) {
+		for (GenNodeTrace trace : nodeTraces) {
 			myNodeLabelCount = Math.max(myNodeLabelCount, getMaxVid(trace.getNodeLabelTraces()));
 			myCompartmentCount = Math.max(myCompartmentCount, getMaxVid(trace.getCompartmentTraces()));
 		}
 	}
 	
-	private int getMaxVid(Collection abstractTraces) {
+	private int getMaxVid(Collection<? extends AbstractTrace> abstractTraces) {
 		int id = -1;
-		for (Iterator it = abstractTraces.iterator(); it.hasNext();) {
-			AbstractTrace nextTrace = (AbstractTrace) it.next();
-			id = Math.max(id, nextTrace.getVisualID());
-			myOverflowCount = Math.max(myOverflowCount, nextTrace.getVisualID());
+		for (AbstractTrace trace : abstractTraces) {
+			id = Math.max(id, trace.getVisualID());
+			myOverflowCount = Math.max(myOverflowCount, trace.getVisualID());
 		}
 		return id;
 	}
@@ -244,9 +241,8 @@ public class MergingIdentifierDispenser implements StatefulVisualIdentifierDispe
 		return visualID;
 	}
 
-	private int getMatchingVID(Object context, Collection matchingTraces) {
-		for (Iterator it = matchingTraces.iterator(); it.hasNext();) {
-			MatchingTrace trace = (MatchingTrace) it.next();
+	private int getMatchingVID(Object context, Collection<? extends MatchingTrace> matchingTraces) {
+		for (MatchingTrace trace : matchingTraces) {
 			if (trace.isProcessed()) {
 				continue;
 			}
diff --git a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/TraceModel.java b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/TraceModel.java
index 14c4f6cf2..a2fde2855 100644
--- a/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/TraceModel.java
+++ b/plugins/org.eclipse.gmf.bridge.trace/src/org/eclipse/gmf/internal/bridge/trace/TraceModel.java
@@ -44,7 +44,7 @@ public interface TraceModel extends EObject {
 	 * @model type="org.eclipse.gmf.internal.bridge.trace.GenNodeTrace" containment="true"
 	 * @generated
 	 */
-	EList getNodeTraces();
+	EList<GenNodeTrace> getNodeTraces();
 
 	/**
 	 * Returns the value of the '<em><b>Child Node Traces</b></em>' containment reference list.
@@ -60,7 +60,7 @@ public interface TraceModel extends EObject {
 	 * @model type="org.eclipse.gmf.internal.bridge.trace.GenChildNodeTrace" containment="true"
 	 * @generated
 	 */
-	EList getChildNodeTraces();
+	EList<GenChildNodeTrace> getChildNodeTraces();
 
 	/**
 	 * Returns the value of the '<em><b>Link Traces</b></em>' containment reference list.
@@ -76,7 +76,7 @@ public interface TraceModel extends EObject {
 	 * @model type="org.eclipse.gmf.internal.bridge.trace.GenLinkTrace" containment="true"
 	 * @generated
 	 */
-	EList getLinkTraces();
+	EList<GenLinkTrace> getLinkTraces();
 
 	/**
 	 * Returns the value of the '<em><b>Tool Group Traces</b></em>' containment reference list.
@@ -92,7 +92,7 @@ public interface TraceModel extends EObject {
 	 * @model type="org.eclipse.gmf.internal.bridge.trace.ToolGroupTrace" containment="true"
 	 * @generated
 	 */
-	EList getToolGroupTraces();
+	EList<ToolGroupTrace> getToolGroupTraces();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -116,7 +116,7 @@ public interface TraceModel extends EObject {
 	 * @model kind="operation" type="org.eclipse.gmf.internal.bridge.trace.AbstractTrace"
 	 * @generated
 	 */
-	EList getAllAbstractTraces();
+	EList<AbstractTrace> getAllAbstractTraces();
 
 	/**
 	 * <!-- begin-user-doc -->