Browse Source

Removed creation of BasicEList because EMF uses InternalBasicEList and it is not necessary to use EMF specific lists here

benjamin.schwertfeger@googlemail.com 12 years ago
parent
commit
3ee74ac202

+ 2 - 2
plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/refactor/impl/FoldIncomingActionsRefactoring.java

@@ -147,7 +147,7 @@ public class FoldIncomingActionsRefactoring extends AbstractRefactoring<State> {
 		Effect effect = transition.getEffect();
 		if (effect instanceof ReactionEffect) {
 			ReactionEffect reactionEffect = (ReactionEffect) effect;
-			EList<Expression> actions = reactionEffect.getActions();
+			List<Expression> actions = reactionEffect.getActions();
 			for (int i = 1; i <= number; i++) {
 				lastActions.add(actions.get(actions.size() - i));
 			}
@@ -156,7 +156,7 @@ public class FoldIncomingActionsRefactoring extends AbstractRefactoring<State> {
 	}
 
 	private Expression getLastFoldableAction(
-			List<EList<Expression>> allActions, int indexFromBack) {
+			List<List<Expression>> allActions, int indexFromBack) {
 		Expression actionToCheck = null;
 		for (List<Expression> actionList : allActions) {
 			if (actionList.size() - 1 - indexFromBack < 0) {

+ 2 - 2
plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/refactor/impl/FoldOutgoingActionsRefactoring.java

@@ -145,7 +145,7 @@ public class FoldOutgoingActionsRefactoring extends AbstractRefactoring<State> {
 		Effect effect = transition.getEffect();
 		if (effect instanceof ReactionEffect) {
 			ReactionEffect reactionEffect = (ReactionEffect) effect;
-			EList<Expression> actions = reactionEffect.getActions();
+			List<Expression> actions = reactionEffect.getActions();
 			for (int i = 0; i < number; i++) {
 				firstActions.add(actions.get(i));
 			}
@@ -154,7 +154,7 @@ public class FoldOutgoingActionsRefactoring extends AbstractRefactoring<State> {
 	}
 
 	private Expression getFirstFoldableAction(
-			List<EList<Expression>> allActions, int index) {
+			List<List<Expression>> allActions, int index) {
 		Expression actionToCheck = null;
 		for (List<Expression> actionList : allActions) {
 			if (index >= actionList.size()) {

+ 4 - 3
plugins/org.yakindu.sct.refactoring/src/org/yakindu/sct/refactoring/utils/RefactoringHelper.java

@@ -1,6 +1,7 @@
 package org.yakindu.sct.refactoring.utils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -39,8 +40,8 @@ public class RefactoringHelper {
 	 * @param transitions
 	 * @return list of list of actions for the specified transitions
 	 */
-	public List<EList<Expression>> getAllActions(EList<Transition> transitions) {
-		List<EList<Expression>> allActions = new ArrayList<EList<Expression>>();
+	public List<List<Expression>> getAllActions(List<Transition> transitions) {
+		List<List<Expression>> allActions = new ArrayList<List<Expression>>();
 		for (Transition transition : transitions) {
 			Effect effect = transition.getEffect();
 			if (effect instanceof ReactionEffect) {
@@ -48,7 +49,7 @@ public class RefactoringHelper {
 				allActions.add(reactionEffect.getActions());
 			}
 			else {
-				allActions.add(new BasicEList<Expression>());
+				allActions.add(Collections.<Expression>emptyList());
 			}
 		}
 		return allActions;