connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java
equal
deleted
inserted
replaced
25 import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatusChangedListener; |
25 import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatusChangedListener; |
26 import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus; |
26 import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus; |
27 import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory.IValidationErrorReporter; |
27 import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory.IValidationErrorReporter; |
28 import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller; |
28 import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller; |
29 import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller.IPackageContents; |
29 import com.nokia.carbide.remoteconnections.interfaces.IRemoteAgentInstallerProvider.IRemoteAgentInstaller.IPackageContents; |
|
30 import com.nokia.carbide.remoteconnections.internal.registry.Registry; |
30 import com.nokia.cpp.internal.api.utils.core.*; |
31 import com.nokia.cpp.internal.api.utils.core.*; |
31 import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils; |
32 import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils; |
32 |
33 |
33 import org.eclipse.core.runtime.IPath; |
34 import org.eclipse.core.runtime.IPath; |
34 import org.eclipse.core.runtime.Path; |
35 import org.eclipse.core.runtime.Path; |
456 label.setLayoutData(gd); |
457 label.setLayoutData(gd); |
457 } |
458 } |
458 |
459 |
459 // update services list |
460 // update services list |
460 Collection<IService> compatibleServices = |
461 Collection<IService> compatibleServices = |
461 RemoteConnectionsActivator.getConnectionTypeProvider().getCompatibleServices(connectionType); |
462 Registry.instance().getCompatibleServices(connectionType); |
462 servicesListViewer.setInput(compatibleServices); |
463 servicesListViewer.setInput(compatibleServices); |
463 if (!compatibleServices.isEmpty()) { |
464 if (!compatibleServices.isEmpty()) { |
464 servicesListViewer.getList().select(0); |
465 servicesListViewer.getList().select(0); |
465 servicesListViewer.setSelection(servicesListViewer.getSelection()); |
466 servicesListViewer.setSelection(servicesListViewer.getSelection()); |
466 } |
467 } |
598 connection.updateSettings(settings); |
599 connection.updateSettings(settings); |
599 } |
600 } |
600 if (newConnection || connectedService == null || !connectedService.getService().equals(service)) { |
601 if (newConnection || connectedService == null || !connectedService.getService().equals(service)) { |
601 disposeConnectedService(); |
602 disposeConnectedService(); |
602 connectedService = |
603 connectedService = |
603 RemoteConnectionsActivator.getConnectionsManager().createConnectedService(service, connection); |
604 Registry.instance().createConnectedService(service, connection); |
604 IStructuredSelection selection = (IStructuredSelection) deviceOSComboViewer.getSelection(); |
605 IStructuredSelection selection = (IStructuredSelection) deviceOSComboViewer.getSelection(); |
605 Pair<String, Version> pair = (Pair<String, Version>) selection.getFirstElement(); |
606 Pair<String, Version> pair = (Pair<String, Version>) selection.getFirstElement(); |
606 if (pair != null) |
607 if (pair != null) |
607 connectedService.setDeviceOS(pair.first, pair.second); |
608 connectedService.setDeviceOS(pair.first, pair.second); |
608 connectedService.addStatusChangedListener(statusListener = new IStatusChangedListener() { |
609 connectedService.addStatusChangedListener(statusListener = new IStatusChangedListener() { |