Target Explorer: Sort service lists

1 files changed, 7 insertions, 3 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelPeerNodeQueryService.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelPeerNodeQueryService.java
index 5cc2338af..02b9c7348 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelPeerNodeQueryService.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/services/LocatorModelPeerNodeQueryService.java
@@ -10,7 +10,7 @@
 package org.eclipse.tcf.te.tcf.locator.services;

 

 import java.util.ArrayList;

-import java.util.Collection;

+import java.util.Collections;

 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

@@ -229,13 +229,17 @@ public class LocatorModelPeerNodeQueryService extends AbstractLocatorModelServic
 					innerDone.doneQueryServices(error);

 				} else {

 					// Get the local service

-					Collection<String> localServices = new ArrayList<String>(channel.getLocalServices());

+					List<String> localServices = new ArrayList<String>(channel.getLocalServices());

 					// Get the remote services

-					Collection<String> remoteServices = new ArrayList<String>(channel.getRemoteServices());

+					List<String> remoteServices = new ArrayList<String>(channel.getRemoteServices());

 

 					// Close the channel

 					Tcf.getChannelManager().closeChannel(channel);

 

+					// Sort the service lists

+					Collections.sort(localServices);

+					Collections.sort(remoteServices);

+

 					// Update the services

 					ILocatorModelUpdateService updateService = node.getModel().getService(ILocatorModelUpdateService.class);

 					updateService.updatePeerServices(node, localServices, remoteServices);