Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.qvtd.debug.ui')
-rw-r--r--plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java
index a4e042f3e..13d81b25f 100644
--- a/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java
+++ b/plugins/org.eclipse.qvtd.debug.ui/src/org/eclipse/qvtd/debug/ui/launching/MainTab.java
@@ -1085,11 +1085,7 @@ public abstract class MainTab<TX> extends AbstractMainTab implements QVTiLaunchC
}
/* protected void refreshParametersGroup(@NonNull Group group, int style, @NonNull Map<String, String> map, @Nullable Comparator<ParameterRow> keyComparator) {
-<<<<<<< Upstream, based on ewillink/510348
List<String> keys = new ArrayList<>(map.keySet());
-=======
- List<String> keys = new ArrayList<String>(map.keySet());
->>>>>>> 21d359e [495621] Add UMLX launch, CGed UMLX test
Collections.sort(keys);
Control[] children = group.getChildren();
for (int i = 0; i < children.length; i++) {

Back to the top