# HG changeset patch # User dadubrow # Date 1261143951 21600 # Node ID 9441b6037cb61109bdff8b5dfe2875f0bef978d9 # Parent fe13162b76cf2733d248adf0be0d284e418fc400 rename internal api package to internal.api diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/META-INF/MANIFEST.MF --- a/connectivity/com.nokia.carbide.remoteConnections/META-INF/MANIFEST.MF Thu Dec 17 15:43:43 2009 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/META-INF/MANIFEST.MF Fri Dec 18 07:45:51 2009 -0600 @@ -19,7 +19,7 @@ com.nokia.carbide.installpackages.gen.InstallPackages, com.nokia.carbide.remoteconnections, com.nokia.carbide.remoteconnections.interfaces, - com.nokia.carbide.remoteconnections.internal, + com.nokia.carbide.remoteconnections.internal.api, com.nokia.carbide.remoteconnections.internal.registry;x-friends:="com.nokia.carbide.remoteConnections.tests,com.nokia.carbide.tests.debug", com.nokia.carbide.remoteconnections.settings.ui;x-friends:="com.nokia.carbide.tests.debug" Bundle-ClassPath: ., diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/RemoteConnectionsActivator.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/RemoteConnectionsActivator.java Thu Dec 17 15:43:43 2009 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/RemoteConnectionsActivator.java Fri Dec 18 07:45:51 2009 -0600 @@ -32,7 +32,7 @@ import com.nokia.carbide.remoteconnections.interfaces.IConnectionTypeProvider; import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager; -import com.nokia.carbide.remoteconnections.internal.IDeviceDiscoveryAgent; +import com.nokia.carbide.remoteconnections.internal.api.IDeviceDiscoveryAgent; import com.nokia.carbide.remoteconnections.internal.registry.Registry; import com.nokia.cpp.internal.api.utils.core.Logging; diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService.java Thu Dec 17 15:43:43 2009 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService.java Fri Dec 18 07:45:51 2009 -0600 @@ -18,7 +18,7 @@ import com.nokia.carbide.remoteconnections.Messages; import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus; -import com.nokia.carbide.remoteconnections.internal.IConnectedService2; +import com.nokia.carbide.remoteconnections.internal.api.IConnectedService2; import com.nokia.cpp.internal.api.utils.core.Check; import com.nokia.cpp.internal.api.utils.core.ListenerList; import com.nokia.cpp.internal.api.utils.core.ObjectUtils; diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnection.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnection.java Thu Dec 17 15:43:43 2009 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnection.java Fri Dec 18 07:45:51 2009 -0600 @@ -23,8 +23,8 @@ import org.eclipse.jface.resource.ImageDescriptor; -import com.nokia.carbide.remoteconnections.internal.IConnection2; -import com.nokia.carbide.remoteconnections.internal.IConnection2.IStatus.EStatus; +import com.nokia.carbide.remoteconnections.internal.api.IConnection2; +import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IStatus.EStatus; import com.nokia.cpp.internal.api.utils.core.Check; import com.nokia.cpp.internal.api.utils.core.ListenerList; diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/IConnectedService2.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/IConnectedService2.java Thu Dec 17 15:43:43 2009 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -/** -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -package com.nokia.carbide.remoteconnections.internal; - -import java.util.Map; - -import com.nokia.carbide.remoteconnections.interfaces.IConnectedService; - -/** - * An extended interface to a connected service - * @since 3.0 - */ -public interface IConnectedService2 extends IConnectedService { - - /** - * Return the properties for this connected service - * @return Map - */ - Map getProperties(); -} diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/IConnection2.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/IConnection2.java Thu Dec 17 15:43:43 2009 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +0,0 @@ -/** -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -package com.nokia.carbide.remoteconnections.internal; - -import org.eclipse.jface.resource.ImageDescriptor; - -import com.nokia.carbide.remoteconnections.interfaces.IConnection; - -/** - * An extended interface to a connection - * @since 3.0 - */ -public interface IConnection2 extends IConnection { - - /** - * Whether this connection is dynamic (managed by an automated process) - * Dynamic connections are not persisted or user editable. - * @return boolean - */ - boolean isDynamic(); - - /** - * Sets this connection's dynamic attribute. - * @see IConnection2#isDynamic() - * @param dynamic boolean - */ - void setDynamic(boolean dynamic); - - /** - * The status of a connection - */ - public interface IStatus { - enum EStatus { - READY, NOT_READY, IN_USE, IN_USE_DISCONNECTED - }; - - EStatus getEStatus(); - - String getDescription(); - } - - /** - * Gets this connection's status - * @return IStatus - */ - IStatus getStatus(); - - /** - * Sets this connection's status - * @see IConnection2#getStatus() - * @param status IStatus - */ - void setStatus(IStatus status); - - /** - * A listener for status changes - */ - public interface IStatusChangedListener { - void statusChanged(IStatus status); - } - - /** - * Adds a listener for status changes - * @param listener IStatusChangedListener - */ - void addStatusChangedListener(IStatusChangedListener listener); - - /** - * Removes a listener for status changes - * @param listener IStatusChangedListener - */ - void removeStatusChangedListener(IStatusChangedListener listener); - - /** - * An optional icon representing this connection. - * If none is set, the default icon is used. - * @return ImageDescriptor - */ - ImageDescriptor getImageDescriptor(); - - /** - * Set the image descriptor for this connection. - * @see IConnection2#getImageDescriptor() - * @param imageDescriptor - */ - void setImageDescriptor(ImageDescriptor imageDescriptor); - -} diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/IDeviceDiscoveryAgent.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/IDeviceDiscoveryAgent.java Thu Dec 17 15:43:43 2009 -0600 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -/** -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the License "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - -package com.nokia.carbide.remoteconnections.internal; - -import java.net.URL; - -import org.eclipse.core.runtime.CoreException; - -/** - * An interface to a device discovery agent - * @since 3.0 - */ -public interface IDeviceDiscoveryAgent { - - /** - * Starts agent. Once started, runs until stopped. - * @throws CoreException - */ - void start() throws CoreException; - - /** - * Stops agent. - * @throws CoreException - */ - void stop() throws CoreException; - - /** - * Returns a URL to specific information about this discovery mechanism, - * troubleshooting, etc. - * @return URL - */ - URL getInformation(); - - // In addition, there may need to be an additional API to do a deeper form of discovery for - // connection mechanisms that require pairing (like BT or Wifi). In these cases, normal discovery - // will probably be for already paired devices, however, the user will want to discover all - // potential devices from some UI in order to set up a paired device. - // A method for doing this will need to be added. - -} diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/api/IConnectedService2.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/api/IConnectedService2.java Fri Dec 18 07:45:51 2009 -0600 @@ -0,0 +1,35 @@ +/** +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +package com.nokia.carbide.remoteconnections.internal.api; + +import java.util.Map; + +import com.nokia.carbide.remoteconnections.interfaces.IConnectedService; + +/** + * An extended interface to a connected service + * @since 3.0 + */ +public interface IConnectedService2 extends IConnectedService { + + /** + * Return the properties for this connected service + * @return Map + */ + Map getProperties(); +} diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/api/IConnection2.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/api/IConnection2.java Fri Dec 18 07:45:51 2009 -0600 @@ -0,0 +1,103 @@ +/** +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +package com.nokia.carbide.remoteconnections.internal.api; + +import org.eclipse.jface.resource.ImageDescriptor; + +import com.nokia.carbide.remoteconnections.interfaces.IConnection; + +/** + * An extended interface to a connection + * @since 3.0 + */ +public interface IConnection2 extends IConnection { + + /** + * Whether this connection is dynamic (managed by an automated process) + * Dynamic connections are not persisted or user editable. + * @return boolean + */ + boolean isDynamic(); + + /** + * Sets this connection's dynamic attribute. + * @see IConnection2#isDynamic() + * @param dynamic boolean + */ + void setDynamic(boolean dynamic); + + /** + * The status of a connection + */ + public interface IStatus { + enum EStatus { + READY, NOT_READY, IN_USE, IN_USE_DISCONNECTED + }; + + EStatus getEStatus(); + + String getDescription(); + } + + /** + * Gets this connection's status + * @return IStatus + */ + IStatus getStatus(); + + /** + * Sets this connection's status + * @see IConnection2#getStatus() + * @param status IStatus + */ + void setStatus(IStatus status); + + /** + * A listener for status changes + */ + public interface IStatusChangedListener { + void statusChanged(IStatus status); + } + + /** + * Adds a listener for status changes + * @param listener IStatusChangedListener + */ + void addStatusChangedListener(IStatusChangedListener listener); + + /** + * Removes a listener for status changes + * @param listener IStatusChangedListener + */ + void removeStatusChangedListener(IStatusChangedListener listener); + + /** + * An optional icon representing this connection. + * If none is set, the default icon is used. + * @return ImageDescriptor + */ + ImageDescriptor getImageDescriptor(); + + /** + * Set the image descriptor for this connection. + * @see IConnection2#getImageDescriptor() + * @param imageDescriptor + */ + void setImageDescriptor(ImageDescriptor imageDescriptor); + +} diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/api/IDeviceDiscoveryAgent.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/api/IDeviceDiscoveryAgent.java Fri Dec 18 07:45:51 2009 -0600 @@ -0,0 +1,55 @@ +/** +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +package com.nokia.carbide.remoteconnections.internal.api; + +import java.net.URL; + +import org.eclipse.core.runtime.CoreException; + +/** + * An interface to a device discovery agent + * @since 3.0 + */ +public interface IDeviceDiscoveryAgent { + + /** + * Starts agent. Once started, runs until stopped. + * @throws CoreException + */ + void start() throws CoreException; + + /** + * Stops agent. + * @throws CoreException + */ + void stop() throws CoreException; + + /** + * Returns a URL to specific information about this discovery mechanism, + * troubleshooting, etc. + * @return URL + */ + URL getInformation(); + + // In addition, there may need to be an additional API to do a deeper form of discovery for + // connection mechanisms that require pairing (like BT or Wifi). In these cases, normal discovery + // will probably be for already paired devices, however, the user will want to discover all + // potential devices from some UI in order to set up a paired device. + // A method for doing this will need to be added. + +} diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java Thu Dec 17 15:43:43 2009 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java Fri Dec 18 07:45:51 2009 -0600 @@ -53,7 +53,7 @@ import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager; import com.nokia.carbide.remoteconnections.interfaces.IExtensionFilter; import com.nokia.carbide.remoteconnections.interfaces.IService; -import com.nokia.carbide.remoteconnections.internal.IConnection2; +import com.nokia.carbide.remoteconnections.internal.api.IConnection2; import com.nokia.carbide.remoteconnections.ui.ClientServiceSiteUI; import com.nokia.cpp.internal.api.utils.core.Check; import com.nokia.cpp.internal.api.utils.core.ListenerList; diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/SettingsWizard.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/SettingsWizard.java Thu Dec 17 15:43:43 2009 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/SettingsWizard.java Fri Dec 18 07:45:51 2009 -0600 @@ -33,7 +33,7 @@ import com.nokia.carbide.remoteconnections.interfaces.IConnection; import com.nokia.carbide.remoteconnections.interfaces.IConnectionType; import com.nokia.carbide.remoteconnections.interfaces.IService; -import com.nokia.carbide.remoteconnections.internal.IConnection2; +import com.nokia.carbide.remoteconnections.internal.api.IConnection2; import com.nokia.carbide.remoteconnections.internal.registry.Registry; /** diff -r fe13162b76cf -r 9441b6037cb6 connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java Thu Dec 17 15:43:43 2009 -0600 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/view/ConnectionsView.java Fri Dec 18 07:45:51 2009 -0600 @@ -78,7 +78,7 @@ import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatusChangedListener; import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus; import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionsManagerListener; -import com.nokia.carbide.remoteconnections.internal.IConnection2; +import com.nokia.carbide.remoteconnections.internal.api.IConnection2; import com.nokia.carbide.remoteconnections.internal.registry.Registry; import com.nokia.carbide.remoteconnections.settings.ui.SettingsWizard; import com.nokia.cpp.internal.api.utils.core.TextUtils;