--- a/htiextension/com.nokia.carbide.extensions.hticonnection/feature.xml Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.carbide.extensions.hticonnection/feature.xml Thu Mar 04 13:38:40 2010 +0200
@@ -11,7 +11,7 @@
</description>
<copyright>
- Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: "http://www.eclipse.org/legal/epl-v10.html".
+ Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License:: "http://www.eclipse.org/legal/epl-v10.html".
</copyright>
<license url="license.txt">
--- a/htiextension/com.nokia.s60tools.hticonnection.help/META-INF/MANIFEST.MF Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/META-INF/MANIFEST.MF Thu Mar 04 13:38:40 2010 +0200
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Carbide.c++ Extensions - HTI Connection Help Plug-in
Bundle-SymbolicName: com.nokia.s60tools.hticonnection.help;singleton:=true
-Bundle-Version: 1.3.0
+Bundle-Version: 1.3.1
Bundle-Vendor: Nokia
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
--- a/htiextension/com.nokia.s60tools.hticonnection.help/about.html Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/about.html Thu Mar 04 13:38:40 2010 +0200
@@ -7,7 +7,7 @@
<body>
<h2>About This Content</h2>
-<p>June 25, 2009</p>
+<p>November 27, 2009</p>
<h3>Copyright</h3>
<p>Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.<br>
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</p>
--- a/htiextension/com.nokia.s60tools.hticonnection.help/book.css Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/book.css Thu Mar 04 13:38:40 2010 +0200
@@ -1,185 +1,184 @@
-/*
- Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
- License: http://www.eclipse.org/legal/epl-v10.html.
-*/
-
-/* Add whitespace around entire display to avoid crowding edges of view */
-/* 20070523-Removed top margin size to close gap between location breadcrumbs and page title */
-html {
- margin: 0px 10px 10px 10px;
- }
-
-/* Set default font to serif style, 12-pt and plain */
-body, p, table {
- font-family: Georgia, "Times New Roman", Times, serif;
- font-size: 12px;
- font-weight: normal;
-}
-
-/* Use sans-serif fonts for all title styles */
-h1, h2, h3, h4, h5, h6, strong, em {
- font-family: Helvetica, sans-serif;
- color: #000000;
- }
-
-h1 { font-size:20px }
-h2 { font-size:18px }
-h3 { font-size:16px }
-h4 { font-size:14px }
-h5 { font-size:12px }
-h6 { font-size:10px }
-
-/* For headlines at the top of a view, add space */
-/* 20070522-added gradiant to background to update visual style of docs */
-h1, h2, h3 {
- background-image: url(html/images/green_fade_left_68_165_28.png);
- background-repeat: no-repeat;
- padding:10px 0px 10px 12px;
- }
-
-li {
- margin-bottom:8px;
- margin-top:8px;
- }
-
-/* Footer includes space and a gray line above the company logo */
-#footer {
- padding-top:10px;
- margin-top:20px;
- border-top:1px solid #999;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- color: #03C;
- }
-
-.listing {
- font-family: "Courier New", Courier, mono;
- color: #009;
- background-color: #EEE;
- padding: 10px 0px;
- margin: 10px 0px;
- }
-
-.code, pre {
- font-family: "Courier New", Courier, mono;
- font-size: 11px;
- color: #333;
- }
-
-.step {
- /* background-color: #EEE; */
- /* margin: 10px 0px; */
- color: #333;
- border-bottom:2px solid #EEE;
- }
-
-.substep {
- background-color: #EEE;
- }
-
-
-/* Figure/Listing/Table titles are centered and gray */
-p.table {
- color: #999;
- font-weight: bold;
- padding-top: 5px;
- }
-
-table {
- border: solid #999 1px;
- table-layout: auto;
- font-size: 12px;
- }
-
-td, th {
- border: solid #999 1px;
- padding: 5px;
- vertical-align:top;
- }
-
-/* 20070522-replaced gray with green background to match gradiant color for title */
-th {
- background-color:#ACD79B;
- /* background-color:#999;
- color:#FFF; */
- }
-
-div.ol.p {
- margin-left: 3em;
- }
-
-/* Make all ordered/unordered list items appear in bold gray */
-div ol > li, div ul > li {
- font-weight:bold;
- color: #333;
- }
-
-div ol > p, div ul > p, div li > p {
- font-weight:normal;
- }
-
-/* Make all H4 and H5 items appear in bold gray against a light green background */
-div h5, div h4 {
- padding:5px 0px 5px 12px;
- background-color:#ECFBEA;
- /* background-color: #EEE; */
- font-weight:bold;
- color: #333;
- }
-
-
-/* Notes stand out using a light top & bottom borders with dark gray text */
-p.note {
- /* color: #03C; */
- /* background-color: #FFFF99; */
- color: #333;
- padding: 5px;
- margin-left: 1em;
- margin-right: 1em;
- border-top: solid #BBB thin;
- border-bottom: solid #BBB thin;
- }
-
-
-/* Figure/Listing/Table titles are centered and gray */
-p.figure {
- color: #333;
- text-align: center;
- font-weight: bold;
- }
-
-/* highly visible red background and white text for things that need fixing before release */
-/* SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
-.fix {
- background-color: red;
- font-weight: bold;
- color: white;
- }
-
-.question {
- font-style:italic;
- font-weight:bold;
- color: #555;
- }
-
-.titleSmall {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- }
-
-
-.plain {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
- font-style: normal;
- line-height: normal;
- font-weight: normal;
- font-variant: normal;
- color: #000000;
- text-decoration: none;
- }
-
-a:link { color: #0033CC }
-a:visited { color: #555555 }
-a:hover { color: #0033CC }
-
+/*
+ Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ All rights reserved.
+ License: http://www.eclipse.org/legal/epl-v10.html
+*/
+
+/* Add whitespace around entire display to avoid crowding edges of view */
+/* 20070523-Removed top margin size to close gap between location breadcrumbs and page title */
+html {
+ margin: 2px 10px 10px 10px;
+ }
+
+/* Set default font to serif style, 12-pt and plain */
+body, p, table {
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-size: 13px;
+ font-weight: normal;
+}
+
+/* Use sans-serif fonts for all title styles */
+h1, h2, h3, h4, h5, h6, strong, em {
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ color: #000000;
+ }
+
+h1 { font-size:20px }
+h2 { font-size:18px }
+h3 { font-size:16px }
+h4 { font-size:14px }
+h5 { font-size:13px }
+h6 { font-size:12px }
+
+/* For headlines at the top of a view, add space */
+/* 20090224-changed green fade to gold header image */
+h1, h2, h3 {
+ background-image: url(html/images/gold_header.png);
+ background-repeat: no-repeat;
+ padding:10px 0px 10px 12px;
+ }
+
+li {
+ margin-bottom:8px;
+ margin-top:8px;
+ }
+
+/* Footer includes space and a gray line above the company logo */
+#footer {
+ padding-top:10px;
+ margin-top:20px;
+ border-top:1px solid #999;
+ font-family: Helvetica, sans-serif;
+ font-size: 11px;
+ color:#333;
+ }
+
+.listing {
+ font-family: "Courier New", Courier, mono;
+ color: #000000;
+ background-color: #FFFFCC;
+ margin: 5px 0px;
+ }
+
+.code, pre {
+ font-family: "Courier New", Courier, mono;
+ font-size: 13px;
+ color: #000000;
+ }
+
+.step {
+ /* background-color: #EEE; */
+ /* margin: 10px 0px; */
+ /* color: #111; */
+ /* border-bottom:2px solid #EEE; */
+ }
+
+.substep {
+ background-color: #EEE;
+ }
+
+
+/* Figure/Listing/Table titles are centered and gray */
+p.table {
+ color: #999;
+ font-weight: bold;
+ padding-top: 5px;
+ }
+
+table {
+ border: solid #999 1px;
+ table-layout: auto;
+ font-size: 13px;
+ }
+
+td, th {
+ border: solid #999 1px;
+ padding: 5px;
+ vertical-align:top;
+ }
+
+/* 20070522-replaced gray with green background to match gradiant color for title */
+th {
+ background-color:#FFC550; /* background-color:#acd79b;
+ background-color:#999;
+ color:#FFF; */
+ }
+
+div.ol.p {
+ margin-left: 3em;
+ }
+
+/* Make all ordered/unordered list items appear in bold gray */
+div ol > li, div ul > li {
+ font-weight:bold;
+ color: #333;
+ }
+
+div ol > p, div ul > p, div li > p {
+ font-weight:normal;
+ }
+
+/* Make all H4 and H5 items appear in bold gray against a light green background */
+div h5, div h4 {
+ padding:5px 0px 5px 12px;
+ background-color:#FDCB2F;
+ /* background-color: #EEE; */
+ font-weight:bold;
+ color: #000000;
+ }
+
+
+/* Notes stand out using a light top & bottom borders with dark gray text */
+p.note {
+ /* color: #03C; */
+ /* background-color: #FFFF99; */
+ color: #333;
+ padding: 5px;
+ margin-left: 1em;
+ margin-right: 1em;
+ border-top: solid #BBB thin;
+ border-bottom: solid #BBB thin;
+ }
+
+
+/* Figure/Listing/Table titles are centered and gray */
+p.figure {
+ color: #333;
+ text-align: center;
+ font-weight: bold;
+ }
+
+/* highly visible red background and white text for things that need fixing before release */
+/* SHOULD NOT BE PRESENT IN RELEASED PRODUCTS */
+.fix {
+ background-color: red;
+ font-weight: bold;
+ color: white;
+ }
+
+.question {
+ font-style:italic;
+ font-weight:bold;
+ color: #555;
+ }
+
+.titleSmall {
+ font-family: Helvetica, sans-serif;
+ font-size: 11px;
+ }
+
+
+.plain {
+ font-family: Helvetica, sans-serif;
+ font-size: 12px;
+ font-style: normal;
+ line-height: normal;
+ font-weight: normal;
+ font-variant: normal;
+ color: #000000;
+ text-decoration: none;
+ }
+
+a:link { color: #0033CC }
+a:visited { color: #555555 }
+a:hover { color: #0033CC }
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/concepts/concepts.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/concepts/concepts.htm Thu Mar 04 13:38:40 2010 +0200
@@ -13,7 +13,7 @@
<li><a href="hti.htm">Harmonized Test Interface (HTI)</a></li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
</body>
</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/concepts/hti.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/concepts/hti.htm Thu Mar 04 13:38:40 2010 +0200
@@ -11,7 +11,7 @@
<p>HTI is a software component that enables remote controlling of Symbian OS. The purpose of HTI is to help and enable automated testing of devices running on Symbian OS.</p>
<p>On a high-level, the HTI on Symbian OS side consists of HTI Framework and plug-in Test Services. The HTI Framework handles the messaging and communication between the device doing the remote controlling (usually PC) and the Symbian OS device being controlled. The Test Services are components that are plugged in to the HTI Framework and they execute different functionalities. Examples of Test Services are key press emulation, screen shot capture, file transfer, process starting/stopping, etc.</p>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
</body>
</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/gettingstarted/GS_index.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/gettingstarted/GS_index.htm Thu Mar 04 13:38:40 2010 +0200
@@ -16,7 +16,7 @@
<li><a href="prerequisites.htm">Prerequisites for use</a></li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
</body>
</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/gettingstarted/overview.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/gettingstarted/overview.htm Thu Mar 04 13:38:40 2010 +0200
@@ -13,7 +13,7 @@
<li><a href="../concepts/hti.htm">Harmonized Test Interface (HTI)</a></li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
</body>
</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/gettingstarted/prerequisites.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/gettingstarted/prerequisites.htm Thu Mar 04 13:38:40 2010 +0200
@@ -16,7 +16,7 @@
<li>HTIAdmin is started in the device<!-- or emulator-->.</li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
</body>
</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/gettingstarted/walk_through.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/gettingstarted/walk_through.htm Thu Mar 04 13:38:40 2010 +0200
@@ -22,7 +22,7 @@
<li><a href="../gettingstarted/prerequisites.htm">Prerequisites for use</a></li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
</body>
</html>
\ No newline at end of file
Binary file htiextension/com.nokia.s60tools.hticonnection.help/html/images/Thumbs.db has changed
Binary file htiextension/com.nokia.s60tools.hticonnection.help/html/images/about_cpp.png has changed
Binary file htiextension/com.nokia.s60tools.hticonnection.help/html/images/background_carbide.jpg has changed
Binary file htiextension/com.nokia.s60tools.hticonnection.help/html/images/brandmark_cpp.gif has changed
Binary file htiextension/com.nokia.s60tools.hticonnection.help/html/images/delete_connection.png has changed
Binary file htiextension/com.nokia.s60tools.hticonnection.help/html/images/gold_header.png has changed
Binary file htiextension/com.nokia.s60tools.hticonnection.help/html/images/toolbar.png has changed
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/legal.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/legal.htm Thu Mar 04 13:38:40 2010 +0200
@@ -9,11 +9,11 @@
<h3>License Information</h3>
<h5>COPYRIGHTS</h5>
-<p>Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of "Eclipse Public License v1.0" which accompanies this distribution and is available at the URL <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</p>
+<p>Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. This component and the accompanying materials are made available under the terms of "Eclipse Public License v1.0" which accompanies this distribution and is available at the URL <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</p>
<p>Initial Contributors:<br>
Nokia Corporation - initial contribution</p>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
</body>
</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/reference/references.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/reference/references.htm Thu Mar 04 13:38:40 2010 +0200
@@ -15,7 +15,7 @@
<li><a href="troubleshooting.htm">Troubleshooting</a></li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
</body>
</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/reference/toolbar.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/reference/toolbar.htm Thu Mar 04 13:38:40 2010 +0200
@@ -49,7 +49,7 @@
</tbody>
</table>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
</body>
</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/reference/troubleshooting.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/reference/troubleshooting.htm Thu Mar 04 13:38:40 2010 +0200
@@ -62,7 +62,7 @@
<li><a href="../tasks/set_preferences.htm">Editing HTI connection settings</a></li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
</body>
</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/release_notes.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/release_notes.htm Thu Mar 04 13:38:40 2010 +0200
@@ -1,105 +1,140 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
-<title>Release Notes</title>
-<link href="../book.css" type="text/css" rel="stylesheet">
-</head>
-<body>
-
-<h2>Release Notes</h2>
-<h4>HTI Connection – Version 1.3.0</h4>
-<p>Released 25th June 2009</p>
-<ul>
- <li><a href="#description">Product description</a></li>
- <li><a href="#features">Main features</a></li>
- <li><a href="#newfeatures">What's new</a></li>
- <li><a href="#installation">Installation notes</a></li>
- <li><a href="#requirements">System requirements</a></li>
- <li><a href="#compissues">Compatibility issues</a></li>
- <li><a href="#issues">Known issues</a></li>
-</ul>
-
-<h3><a name="description"></a>Product description</h3>
-<p>The <b>HTI Connection</b> service provides a communication interface between Carbide.c++ and an emulator/device. HTI Connection manages the connection between Carbide.c++ and an emulator/decive by starting the HTI Datagateway and shows generated log in the <b>HTI Connection</b> view. The HTI Connection view shows information of events and errors from Datagateway.exe. The connection parameters can be modified from HTI Preferences.</p><p> HTI Connection opens when a plug-in is started, that is, when another plug-in starts using Harmonized Test Interface (HTI) service. You can open the HTI Connection also by selecting <b>Carbide</b> > <b>HTI Connection.</b></p>
-
-<h3><a name="features"></a>Main features</h3>
-<ul>
- <li>Console for Datagateway logging</li>
- <li>Starting and stopping Datagateway</li>
- <li>HTI connection to device using serial port or TCP/IP connection</li>
- <li>Connection test API</li>
- <li>File transfer API</li>
- <li>Screen capture API</li>
- <li>Application control API</li>
- <li>Key event API</li>
-</ul>
-
-<h3><a name="newfeatures"></a>What's new</h3>
-<ul>
- <li>Change: Connections are handled via Carbide.c++ Remote Connections.</li>
- <li>Change: API updates.</li>
-</ul>
-
-<h3><a name="installation"></a>Installation notes</h3>
-<ul>
- <li>N/A</li>
-</ul>
-
-<h3><a name="requirements"></a>System requirements</h3>
-<p>Basic requirements:</p>
-<ul>
- <li>Windows 2000 or Windows XP</li>
- <li>Minimum Platform/SDK build PC.</li>
- <li>Normal Platform/SDK build PC.</li>
-</ul>
-<p>Additional requirements:</p>
-<ul>
- <li> Nokia Connectivity Drivers (part of PC Suite)</li>
-</ul>
-
-<h3><a name="compissues"></a>Compatibility issues</h3>
-<ul>
- <li>N/A</li>
-</ul>
-
-<h3><a name="issues"></a>Known issues</h3>
-<ul>
- <li>If Carbide crashes when HTI Connection is active, it is possible that the datagateway.exe continues running in background. In this case, the datagateway.exe process needs to be ended from Task Manager.</li>
- <li>There is a known issue with serial connection in the emulator environment. Virtual com ports are transferring data too fast, and as a result some data is lost. In most cases this can be fixed by increasing the <code>SendDelay</code> value in <b>HtiSerialComm.cfg</b> (<i>{EPOCROOT}\epoc32\winscw\c\</i>). It has been tested with <code>SendDelay=5</code>.</li>
-</ul>
-
-<h3>Version history</h3>
-<h5>Version 1.2.0 – 8th April 2009</h5>
-<ul>
- <li>Change: Improved handling of connection errors.</li>
- <li>Change: Connection status is displayed in the console.</li>
- <li>Change: API updates.</li>
-</ul>
-
-<h5>Version 1.1.0 – 17th February 2009</h5>
-<ul>
- <li>Feature: Application control API.</li>
- <li>Feature: Key event API.</li>
-</ul>
-
-<h5>Version 1.0.0 – 19th December 2008</h5>
-<p>The first version.</p>
-
-<div id="footer">
-Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies).<br>
-All rights reserved. <br>
-This component and the accompanying materials are made available <br>
-under the terms of "Eclipse Public License v1.0" <br>
-which accompanies this distribution and is available <br>
-at the URL <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-<br><br>
-Initial Contributors:<br>
-Nokia Corporation - initial contribution
-<br><br>
-Contributors:<br>
-Description:
-
-</div>
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+ <title>Release Notes</title>
+ <link href="../book.css" type="text/css" rel="stylesheet">
+</head>
+
+<body>
+<h2>Release Notes</h2>
+
+<h4>HTI Connection – Version 1.3.1</h4>
+
+<p>Released 19th February 2010</p>
+<ul>
+ <li><a href="#description">Product description</a></li>
+ <li><a href="#features">Main features</a></li>
+ <li><a href="#newfeatures">What's new</a></li>
+ <li><a href="#installation">Installation notes</a></li>
+ <li><a href="#requirements">System requirements</a></li>
+ <li><a href="#compissues">Compatibility issues</a></li>
+ <li><a href="#issues">Known issues</a></li>
+</ul>
+
+<h3><a name="description"></a>Product description</h3>
+
+<p>The <b>HTI Connection</b> service provides a communication interface between
+Carbide.c++ and an emulator/device. HTI Connection manages the connection
+between Carbide.c++ and an emulator/device by starting the HTI Datagateway and
+shows generated log in the <b>HTI Connection</b> view. The HTI Connection view
+shows information of events and errors from Datagateway.exe. The connection
+parameters can be modified from HTI Preferences.</p>
+
+<p>HTI Connection opens when a plug-in is started, that is, when another
+plug-in starts using Harmonized Test Interface (HTI) service. You can open the
+HTI Connection also by selecting <b>Carbide</b> > <b>HTI Connection.</b></p>
+
+<h3><a name="features"></a>Main features</h3>
+<ul>
+ <li>Console for Datagateway logging</li>
+ <li>Starting and stopping Datagateway</li>
+ <li>HTI connection to device using serial port or TCP/IP connection</li>
+ <li>Connection test API</li>
+ <li>File transfer API</li>
+ <li>Screen capture API</li>
+ <li>Application control API</li>
+ <li>Key event API</li>
+</ul>
+
+<h3><a name="newfeatures"></a>What's new</h3>
+<ul>
+ <li>Requires Carbide.c++ 2.5.0 or later to work!</li>
+ <li>New: New connection preference option called "Current connection". If
+ this option is selected, user can change the currently active connection
+ easily either from Remote Connection view, or from a new Trim widget
+ showing the current connection.</li>
+ <li>Fix: Unhandled event loop exception -error during connection creation is
+ now fixed.</li>
+ <li>Documentation: Help links pointing to wrong location were fixed.</li>
+</ul>
+
+<h3><a name="installation"></a>Installation notes</h3>
+<ul>
+ <li>N/A</li>
+</ul>
+
+<h3><a name="requirements"></a>System requirements</h3>
+
+<p>Basic requirements:</p>
+<ul>
+ <li>Windows 2000 or Windows XP</li>
+ <li>Minimum Platform/SDK build PC.</li>
+ <li>Normal Platform/SDK build PC.</li>
+</ul>
+
+<p>Additional requirements:</p>
+<ul>
+ <li>Nokia Connectivity Drivers (part of PC Suite)</li>
+</ul>
+
+<h3><a name="compissues"></a>Compatibility issues</h3>
+<ul>
+ <li>N/A</li>
+</ul>
+
+<h3><a name="issues"></a>Known issues</h3>
+<ul>
+ <li>If Carbide crashes when HTI Connection is active, it is possible that the
+ datagateway.exe continues running in background. In this case, the
+ datagateway.exe process needs to be ended from Task Manager.</li>
+ <li>There is a known issue with serial connection in the emulator
+ environment. Virtual com ports are transferring data too fast, and as a
+ result some data is lost. In most cases this can be fixed by increasing the
+ <code>SendDelay</code> value in <b>HtiSerialComm.cfg</b>
+ (<i>{EPOCROOT}\epoc32\winscw\c\</i>). It has been tested with
+ <code>SendDelay=5</code>.</li>
+</ul>
+
+<h3>Version history</h3>
+
+<h5>Version 1.3.0 – 25th June 2009</h5>
+<ul>
+ <li>Change: Connections are handled via Carbide.c++ Remote Connections.</li>
+ <li>Change: API updates.</li>
+</ul>
+
+<h5>Version 1.2.0 – 8th April 2009</h5>
+<ul>
+ <li>Change: Improved handling of connection errors.</li>
+ <li>Change: Connection status is displayed in the console.</li>
+ <li>Change: API updates.</li>
+</ul>
+
+<h5>Version 1.1.0 – 17th February 2009</h5>
+<ul>
+ <li>Feature: Application control API.</li>
+ <li>Feature: Key event API.</li>
+</ul>
+
+<h5>Version 1.0.0 – 19th December 2008</h5>
+
+<p>The first version.</p>
+
+<div id="footer">
+Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies).<br>
+All rights reserved. <br>
+This component and the accompanying materials are made available <br>
+under the terms of "Eclipse Public License v1.0" <br>
+which accompanies this distribution and is available <br>
+at the URL <a
+href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+<br>
+<br>
+Initial Contributors:<br>
+Nokia Corporation - initial contribution <br>
+<br>
+Contributors:<br>
+Description: </div>
+</body>
+</html>
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/tasks/comm_bt.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/tasks/comm_bt.htm Thu Mar 04 13:38:40 2010 +0200
@@ -1,63 +1,94 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-<title>Setting up Bluetooth connection</title>
-<link href="../../book.css" type="text/css" rel="stylesheet">
-</head>
-<body>
-
-<h2>Setting up Bluetooth connection</h2>
-<ol>
-<li>In the S60 device, start <b>HtiAdmin</b> by selecting <b>Menu</b>> <b>RnD Tools</b> > <b>HtiAdmin</b>.</li>
-<li>Stop the HTI Framework if it is running by selecting <b>Options</b> > <b>Stop</b>.</li>
-<li>Enable Bluetooth connection by selecting <b>Options</b> > <b>Comms</b> > <b>Enable BT comm</b>, and then one of the following:
-<ul>
-<li><b>By BT address</b> to connect to a specified Bluetooth address.</li>
-<li><b>By BT name</b> to connect to a specified Bluetooth name.</li>
-<li><b>Search when starting</b> to select a Bluetooth connection when you start the HTI connection.</li>
-</ul>
-</li>
-<li>Start the HTI Framework by selecting <b>Options</b> > <b>Start</b>.</li>
-<li>On the PC, configure and start a Bluetooth serial port service. For instructions on setting up a serial port service on a PC, see the manual of your Bluetooth driver.</li>
-<li>Before starting the HTI connection, configure the PC’s Bluetooth serial port service not to use Secure Connection. This means that no pairing or authorization is needed when the phone connects to the PC.</li>
-<li>On the PC, open the <b>HTI Connection Carbide.c++ Extension</b> by selecting <b>Carbide</b> > <b>HTI Connection</b>.</li>
-<li>Click <img src="../images/run_exc_arrow.png"> and select <b>New Connection</b> to create a new connection, or select an existing connection.</li>
-<li>Configure the HTI connection to use <b>Serial</b> communication. Click <b>Next</b> and check that the HTI settings correspond to the Bluetooth serial port service configured and started earlier.</li>
-<li>(Optional) To test the connection, click <b>Initiate service testing</b>. The test status is shown in the <b>Status</b> pane:
- <ul>
- <li><i>Status not tested</i></li>
- <li><i>Connection to HTI agent OK, HTI version x.xx</i></li>
- <li><i>HTI agent in the device is not responding</i></li>
- <li><i>Connection failed</i></li>
- </ul>
-</li>
-<li>Click <b>Finish</b> to close the wizard. HTI Connection now starts the Datagateway with the connection you configured. If the Datagateway does not start automatically, start it by clicking <img src="../images/run_exc.gif">. The connection status will be displayed in the status line above the console screen:
- <ul>
- <li><i>Not connected</i></li>
- <li><i>Testing connection</i></li>
- <li><i>Trying to connect to <connection name></i></li>
- <li><i>Connected to <connection name></i></li>
- </ul>
-
-</li>
-</ol>
-
-<p>In addition to configuring and starting HTI connections, you can do the following:</p>
-<ul>
-<li>To stop the Datagateway, click <img src="../images/stop.gif">.</li>
-<li>To edit the connection settings, click <img src="../images/environment_co.png">.</li>
-<li>To start a connection after the initial setup, click <img src="../images/run_exc_arrow.png"> and select a connection.</li>
-<li>To delete a connection, open the <b>Remote Connections</b> view and use the dynamic menu. For details, see <a href="viewing_remote_connections.htm">Viewing remote connections</a>.</li>
-</ul>
-
-<h5>Related tasks</h5>
-<ul>
- <li><a href="tasks/viewing_remote_connections.htm">Viewing remote connections</li>
- <li><a href="set_preferences.htm">Editing HTI connection settings</a></li>
-</ul>
-
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
-License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+ <title>Setting up Bluetooth connection</title>
+ <link href="../../book.css" type="text/css" rel="stylesheet">
+</head>
+
+<body>
+<h2>Setting up Bluetooth connection</h2>
+<ol>
+ <li>In the S60 device, start <b>HtiAdmin</b> by selecting <b>Menu</b>>
+ <b>RnD Tools</b> > <b>HtiAdmin</b>.</li>
+ <li>Stop the HTI Framework if it is running by selecting <b>Options</b> >
+ <b>Stop</b>.</li>
+ <li>Enable Bluetooth connection by selecting <b>Options</b> > <b>Comms</b>
+ > <b>Enable BT comm</b>, and then one of the following:
+ <ul>
+ <li><b>By BT address</b> to connect to a specified Bluetooth address.</li>
+ <li><b>By BT name</b> to connect to a specified Bluetooth name.</li>
+ <li><b>Search when starting</b> to select a Bluetooth connection when you
+ start the HTI connection.</li>
+ </ul>
+ </li>
+ <li>Start the HTI Framework by selecting <b>Options</b> >
+ <b>Start</b>.</li>
+ <li>On the PC, configure and start a Bluetooth serial port service. For
+ instructions on setting up a serial port service on a PC, see the manual of
+ your Bluetooth driver.</li>
+ <li>Before starting the HTI connection, configure the PC’s Bluetooth serial
+ port service not to use Secure Connection. This means that no pairing or
+ authorization is needed when the phone connects to the PC.</li>
+ <li>On the PC, open the <b>HTI Connection Carbide.c++ Extension</b> by
+ selecting <b>Carbide</b> > <b>HTI Connection</b>.</li>
+ <li>In the HTI Connection Carbide.c++ Extension, click <img
+ src="../images/environment_co.png"> to open the Preferences dialog. In the
+ dialog click <b>New...</b> to create a new connection, or select Current
+ connection or an existing connection from the drop down list.
+ <p><b>Note:</b> If you select <b>Current connection</b>, HTI Connection
+ will automatically use the currently active connection.If <b>Current
+ connection</b> is selected, user can change the currently active connection
+ easily either from Remote Connection view, or from a new Trim widget
+ showing the current connection.</p>
+ </li>
+ <li>Configure the HTI connection to use <b>Serial</b> communication. Click
+ <b>Next</b> and check that the HTI settings correspond to the Bluetooth
+ serial port service configured and started earlier.</li>
+ <li>(Optional) To test the connection, click <b>Initiate service testing</b>.
+ The test status is shown in the <b>Status</b> pane:
+ <ul>
+ <li><i>Status not tested</i></li>
+ <li><i>Connection to HTI agent OK, HTI version x.xx</i></li>
+ <li><i>HTI agent in the device is not responding</i></li>
+ <li><i>Connection failed</i></li>
+ </ul>
+ </li>
+ <li>Click <b>Finish</b> to close the wizard. HTI Connection now starts the
+ Datagateway with the connection you configured. If the Datagateway does not
+ start automatically, start it by clicking <img
+ src="../images/run_exc.gif">. The connection status will be displayed in
+ the status line above the console screen:
+ <ul>
+ <li><i>Not connected</i></li>
+ <li><i>Testing connection</i></li>
+ <li><i>Trying to connect to <connection name></i></li>
+ <li><i>Connected to <connection name></i></li>
+ </ul>
+ </li>
+</ol>
+
+<p>In addition to configuring and starting HTI connections, you can do the
+following:</p>
+<ul>
+ <li>To stop the Datagateway, click <img src="../images/stop.gif">.</li>
+ <li>To edit the connection settings, click <img
+ src="../images/environment_co.png">.</li>
+ <li>To delete a connection, open the <b>Remote Connections</b> view and use
+ the dynamic menu. For details, see <a
+ href="viewing_remote_connections.htm">Viewing remote connections</a>.</li>
+</ul>
+
+<h5>Related tasks</h5>
+<ul>
+ <li><a href="viewing_remote_connections.htm">Viewing remote
+ connections</a></li>
+ <li><a href="set_preferences.htm">Editing HTI connection settings</a></li>
+</ul>
+
+<div id="footer">
+Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights
+reserved. License: <a
+href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
+</body>
+</html>
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/tasks/comm_emulator.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/tasks/comm_emulator.htm Thu Mar 04 13:38:40 2010 +0200
@@ -70,7 +70,7 @@
<p>To stop the Datagateway, click <img src="../images/stop.gif">.</p>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
</body>
</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/tasks/comm_usb.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/tasks/comm_usb.htm Thu Mar 04 13:38:40 2010 +0200
@@ -1,56 +1,92 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-<title>Setting up USB serial connection</title>
-<link href="../../book.css" type="text/css" rel="stylesheet">
-</head>
-<body>
-
-<h2>Setting up USB serial connection</h2>
-<ol>
-<li>Make sure you have USB cable drivers (such as Nokia Connectivity Cable Drivers for Nokia devices) installed on your PC (either with PC Suite or separately for Nokia devices). The latest version of the drivers is always recommended.</li>
-<li>In the S60 device, start HtiAdmin by selecting <b>Menu</b> > <b>RnD Tools</b> > <b>HtiAdmin</b>.</li>
-<li>Stop the HTI Framework if it is running by selecting <b>Options</b> > <b>Stop</b>.</li>
-<li>Enable USB connection by selecting <b>Options</b> > <b>Comms</b> > <b>Enable USB serial comm</b>.</li>
-<li>Start the HTI Framework by selecting <b>Options</b> > <b>Start</b>.</li>
-<li>Connect the device to the PC with a USB cable and select the <b>PC Suite</b> mode. If Windows starts to install drivers, wait for all installations to complete.</li>
-<li>In the HTI Connection Carbide.c++ Extension, click <img src="../images/run_exc_arrow.png"> and select <b>New Connection</b> to create a new connection, or select an existing connection.</li>
-<li>In <b>Connection name</b>, enter a name for the connection, and in <b>Connection type</b>, select <b>Serial</b>. To edit the serial port settings, click <b>Next</b>.<br><br><img src="../images/new_connection_1.png"></li>
-<li>In <b>Serial Port</b>, select the serial port that is used for USB connection. You can also select a baud rate.<br><br><img src="../images/new_connection_2.png"></li>
-<li>(Optional) To test the connection, click <b>Initiate service testing</b>. The test status is shown in the <b>Status</b> pane:
- <ul>
- <li><i>Status not tested</i></li>
- <li><i>Connection to HTI agent OK, HTI version x.xx</i></li>
- <li><i>HTI agent in the device is not responding</i></li>
- <li><i>Connection failed</i></li>
- </ul>
-</li>
-<li>Click <b>Finish</b> to close the wizard. HTI Connection now starts the Datagateway with the connection you configured. If the Datagateway does not start automatically, start it by clicking <img src="../images/run_exc.gif">. The connection status will be displayed in the status line above the console screen:
- <ul>
- <li><i>Not connected</i></li>
- <li><i>Testing connection</i></li>
- <li><i>Trying to connect to <connection name></i></li>
- <li><i>Connected to <connection name></i></li>
- </ul>
-</li>
-</ol>
-
-<p>In addition to configuring and starting HTI connections, you can do the following:</p>
-<ul>
-<li>To stop the Datagateway, click <img src="../images/stop.gif">.</li>
-<li>To edit the connection settings, click <img src="../images/environment_co.png">.</li>
-<li>To start a connection after the initial setup, click <img src="../images/run_exc_arrow.png"> and select a connection.</li>
-<li>To delete a connection, open the <b>Remote Connections</b> view and use the dynamic menu. For details, see <a href="viewing_remote_connections.htm">Viewing remote connections</a>.</li>
-</ul>
-
-<h5>Related tasks</h5>
-<ul>
- <li><a href="tasks/viewing_remote_connections.htm">Viewing remote connections</a></li>
- <li><a href="set_preferences.htm">Editing HTI connection settings</a></li>
-</ul>
-
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
-License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+ <title>Setting up USB serial connection</title>
+ <link href="../../book.css" type="text/css" rel="stylesheet">
+</head>
+
+<body>
+<h2>Setting up USB serial connection</h2>
+<ol>
+ <li>Make sure you have USB cable drivers (such as Nokia Connectivity Cable
+ Drivers for Nokia devices) installed on your PC (either with PC Suite or
+ separately for Nokia devices). The latest version of the drivers is always
+ recommended.</li>
+ <li>In the S60 device, start HtiAdmin by selecting <b>Menu</b> > <b>RnD
+ Tools</b> > <b>HtiAdmin</b>.</li>
+ <li>Stop the HTI Framework if it is running by selecting <b>Options</b> >
+ <b>Stop</b>.</li>
+ <li>Enable USB connection by selecting <b>Options</b> > <b>Comms</b> >
+ <b>Enable USB serial comm</b>.</li>
+ <li>Start the HTI Framework by selecting <b>Options</b> >
+ <b>Start</b>.</li>
+ <li>Connect the device to the PC with a USB cable and select the <b>PC
+ Suite</b> mode. If Windows starts to install drivers, wait for all
+ installations to complete.</li>
+ <li>In the HTI Connection Carbide.c++ Extension, click <img
+ src="../images/environment_co.png"> to open the Preferences dialog. In the
+ dialog click <b>New...</b> to create a new connection, or select Current
+ connection or an existing connection from the drop down list.
+ <p><b>Note:</b> If you select <b>Current connection</b>, HTI Connection
+ will automatically use the currently active connection.If <b>Current
+ connection</b> is selected, user can change the currently active connection
+ easily either from Remote Connection view, or from a new Trim widget
+ showing the current connection.</p>
+ </li>
+ <li>In <b>Connection name</b>, enter a name for the connection, and in
+ <b>Connection type</b>, select <b>Serial</b>. To edit the serial port
+ settings, click <b>Next</b>.<br>
+ <br>
+ <img src="../images/new_connection_1.png"></li>
+ <li>In <b>Serial Port</b>, select the serial port that is used for USB
+ connection. You can also select a baud rate.<br>
+ <br>
+ <img src="../images/new_connection_2.png"></li>
+ <li>(Optional) To test the connection, click <b>Initiate service testing</b>.
+ The test status is shown in the <b>Status</b> pane:
+ <ul>
+ <li><i>Status not tested</i></li>
+ <li><i>Connection to HTI agent OK, HTI version x.xx</i></li>
+ <li><i>HTI agent in the device is not responding</i></li>
+ <li><i>Connection failed</i></li>
+ </ul>
+ </li>
+ <li>Click <b>Finish</b> to close the wizard. HTI Connection now starts the
+ Datagateway with the connection you configured. If the Datagateway does not
+ start automatically, start it by clicking <img
+ src="../images/run_exc.gif">. The connection status will be displayed in
+ the status line above the console screen:
+ <ul>
+ <li><i>Not connected</i></li>
+ <li><i>Testing connection</i></li>
+ <li><i>Trying to connect to <connection name></i></li>
+ <li><i>Connected to <connection name></i></li>
+ </ul>
+ </li>
+</ol>
+
+<p>In addition to configuring and starting HTI connections, you can do the
+following:</p>
+<ul>
+ <li>To stop the Datagateway, click <img src="../images/stop.gif">.</li>
+ <li>To edit the connection settings, click <img
+ src="../images/environment_co.png">.</li>
+ <li>To delete a connection, open the <b>Remote Connections</b> view and use
+ the dynamic menu. For details, see <a
+ href="viewing_remote_connections.htm">Viewing remote connections</a>.</li>
+</ul>
+
+<h5>Related tasks</h5>
+<ul>
+ <li><a href="viewing_remote_connections.htm">Viewing remote
+ connections</a></li>
+ <li><a href="set_preferences.htm">Editing HTI connection settings</a></li>
+</ul>
+
+<div id="footer">
+Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights
+reserved. License: <a
+href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
+</body>
+</html>
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/tasks/set_preferences.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/tasks/set_preferences.htm Thu Mar 04 13:38:40 2010 +0200
@@ -1,35 +1,53 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-<title>Editing HTI connection settings</title>
-<link href="../../book.css" type="text/css" rel="stylesheet">
-</head>
-<body>
-
-<h2>Editing HTI connection settings</h2>
-<p>To edit the HTI connection settings:</p>
-<ol>
-<li>Select <b>Window</b> > <b>Preferences</b> > <b>Carbide Extensions</b> > <b>HTI Preferences</b>.</li>
-<li>In <b>Use connection</b>, do one of the following:
- <ul>
- <li>To edit an existing HTI connection, select a connection and click <b>Edit</b>.</li>
- <li>To create a new HTI connection, click <b>New</b>.</li>
- </ul>
-<p>Follow the instructions in <a href="comm_usb.htm">Setting up USB serial connection</a> or <a href="comm_bt.htm">Setting up Bluetooth connection</a>.</p>
-<p>If you have problems with the connection, see <a href="../reference/troubleshooting.htm">Troubleshooting</a>.</p>
-</li>
-<li>Click <b>Apply</b>/<b>OK</b>.</li>
-</ol>
-
-<h5>Related tasks</h5>
-<ul>
- <li><a href="comm_usb.htm">Setting up USB serial connection</a></li>
- <li><a href="comm_bt.htm">Setting up Bluetooth connection</a></li>
- <li><a href="../reference/troubleshooting.htm">Troubleshooting</a></li>
-</ul>
-
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
-License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+ <title>Editing HTI connection settings</title>
+ <link href="../../book.css" type="text/css" rel="stylesheet">
+</head>
+
+<body>
+<h2>Editing HTI connection settings</h2>
+
+<p>To edit the HTI connection settings:</p>
+<ol>
+ <li>Select <b>Window</b> > <b>Preferences</b> > <b>Carbide
+ Extensions</b> > <b>HTI Preferences</b>.</li>
+ <li>In <b>Use connection</b>, do one of the following:
+ <ul>
+ <li>Select one of the exiting connections <br>
+ <b>Note:</b> If you select <b>Current connection</b>, HTI Connection
+ will automatically use the currently active connection.If <b>Current
+ connection</b> is selected, user can change the currently active
+ connection easily either from Remote Connection view, or from a new
+ Trim widget showing the current connection.<br>
+
+ <ul>
+ <li>To edit an existing HTI connection, select a connection and click
+ <b>Edit</b>.</li>
+ <li>To create a new HTI connection, click <b>New</b>.</li>
+ </ul>
+ </li>
+ </ul>
+ <p>Follow the instructions in <a href="comm_usb.htm">Setting up USB serial
+ connection</a> or <a href="comm_bt.htm">Setting up Bluetooth
+ connection</a>.</p>
+ <p>If you have problems with the connection, see <a
+ href="../reference/troubleshooting.htm">Troubleshooting</a>.</p>
+ </li>
+ <li>Click <b>Apply</b>/<b>OK</b>.</li>
+</ol>
+
+<h5>Related tasks</h5>
+<ul>
+ <li><a href="comm_usb.htm">Setting up USB serial connection</a></li>
+ <li><a href="comm_bt.htm">Setting up Bluetooth connection</a></li>
+ <li><a href="../reference/troubleshooting.htm">Troubleshooting</a></li>
+</ul>
+
+<div id="footer">
+Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights
+reserved. License: <a
+href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
+</body>
+</html>
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/tasks/tasks.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/tasks/tasks.htm Thu Mar 04 13:38:40 2010 +0200
@@ -17,7 +17,7 @@
<li><a href="set_preferences.htm">Editing HTI connection settings</a></li>
</ul>
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+<div id="footer">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
</body>
</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/tasks/viewing_remote_connections.htm Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/tasks/viewing_remote_connections.htm Thu Mar 04 13:38:40 2010 +0200
@@ -1,37 +1,55 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-<title>Viewing remote connections</title>
-<link href="../../book.css" type="text/css" rel="stylesheet">
-</head>
-<body>
-
-<h2>Viewing remote connections</h2>
-<p>You can view active remote connections in the <b>Remote Connections</b> view. To open the Remote Connections view, select <b>Window</b> > <b>Show view</b> > <b>Other...</b> > <b>Carbide.c++</b> > <b>Remote Connections</b>.</p>
-<p>Note that the Remote Connections view shows all connections in Carbide.c++, including connections configured for and used by other services. The <b>HTI Connection</b> Carbide.c++ Extension uses the generic <b>Serial</b> and <b>TCP/IP</b> connection types. HTI Connections use the following statuses:</p>
-<ul>
- <li><i>Not connected</i></li>
- <li><i>Trying to connect</i></li>
- <li><i>Connected</i></li>
-</ul>
-<img src="../images/remote_connections_view.png">
-
-<p>In addition to viewing the connections status, you can do the following:</p>
-<ul>
-<li>To edit an existing connection, doubleclick it in the Remote Connections view. For details, see <a href="comm_usb.htm">Setting up USB serial connection</a> and <a href="comm_bt.htm">Setting up Bluetooth connection</a>.</li>
-<li>To delete a connection, rightclick it in the Remote Connections view and select <b>Delete Connection</b>.<br><br><img src="../images/delete_connection.png"></li>
-</ul>
-
-<h5>Related tasks</h5>
-<ul>
- <li><a href="comm_usb.htm">Setting up USB serial connection</a></li>
- <li><a href="comm_bt.htm">Setting up Bluetooth connection</a></li>
- <li><a href="set_preferences.htm">Editing HTI connection settings</a></li>
- <li><a href="../reference/troubleshooting.htm">Troubleshooting</a></li>
-</ul>
-
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
-License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
-</body>
-</html>
\ No newline at end of file
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+ <title>Viewing remote connections</title>
+ <link href="../../book.css" type="text/css" rel="stylesheet">
+</head>
+
+<body>
+<h2>Viewing remote connections</h2>
+
+<p>You can view active remote connections in the <b>Remote Connections</b>
+view. To open the Remote Connections view, select <b>Window</b> > <b>Show
+view</b> > <b>Other...</b> > <b>Carbide.c++</b> > <b>Remote
+Connections</b>.</p>
+
+<p>Note that the Remote Connections view shows all connections in Carbide.c++,
+including connections configured for and used by other services. The <b>HTI
+Connection</b> Carbide.c++ Extension uses the generic <b>Serial</b> and
+<b>TCP/IP</b> connection types. HTI Connections use the following statuses:</p>
+<ul>
+ <li><i>Not connected</i></li>
+ <li><i>Trying to connect</i></li>
+ <li><i>Connected</i></li>
+</ul>
+<img src="../images/remote_connections_view.png">
+
+<p>In addition to viewing the connections status, you can do the following:</p>
+<ul>
+ <li>To edit an existing connection, doubleclick it in the Remote Connections
+ view. For details, see <a href="comm_usb.htm">Setting up USB serial
+ connection</a> and <a href="comm_bt.htm">Setting up Bluetooth
+ connection</a>.</li>
+ <li>To delete a connection, rightclick it in the Remote Connections view and
+ select <b>Delete</b>.<br>
+ <br>
+ <img src="../images/delete_connection.png"></li>
+ <li>To set a correction as Current connection, rightclick it in the Remote
+ Connections view and select <b>Make Current</b>. </li>
+</ul>
+
+<h5>Related tasks</h5>
+<ul>
+ <li><a href="comm_usb.htm">Setting up USB serial connection</a></li>
+ <li><a href="comm_bt.htm">Setting up Bluetooth connection</a></li>
+ <li><a href="set_preferences.htm">Editing HTI connection settings</a></li>
+ <li><a href="../reference/troubleshooting.htm">Troubleshooting</a></li>
+</ul>
+
+<div id="footer">
+Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights
+reserved. License: <a
+href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
+</body>
+</html>
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/toc.htm Fri Feb 19 10:07:34 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-<link href="../book.css" type="text/css" rel="stylesheet">
-</head>
-<body>
-
-<h1>HTI Connection Online Help</h1>
-
-<p><a href="release_notes.htm">Release notes</a></p>
-<p><a href="gettingstarted/GS_index.htm">Getting started</a></p>
-<ul>
- <li><a href="gettingstarted/overview.htm">Overview</a></li>
- <li><a href="gettingstarted/prerequisites.htm">Prerequisites for use</a></li>
- <li><a href="gettingstarted/walk_through.htm">Basic walk-through</a></li>
-</ul>
-<p></p>
-<p><a href="concepts/concepts.htm">Concepts</a></p>
-<ul>
- <li><a href="concepts/hti.htm">Harmonized Test Interface (HTI)</a></li>
-</ul>
-<p></p>
-<p><a href="tasks/tasks.htm">Tasks</a></p>
-<ul>
- <li><a href="tasks/comm_usb.htm">Setting up USB serial connection</a></li>
- <li><a href="tasks/comm_bt.htm">Setting up Bluetooth connection</a></li>
- <li><a href="tasks/viewing_remote_connections.htm">Viewing remote connections</li>
- <li><a href="tasks/set_preferences.htm">Editing HTI connection settings</a></li>
-</ul>
-<p></p>
-<p><a href="reference/references.htm">References</a></p>
-<ul>
- <li><a href="reference/toolbar.htm">Toolbar</a></li>
- <li><a href="reference/troubleshooting.htm">Troubleshooting</a></li>
-</ul>
-<p></p>
-<p><a href="legal.htm">Legal</a></p>
-
-<div id="footer">Copyright © 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
-License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.</div>
-</body>
-</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/tocTasks.xml Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/tocTasks.xml Thu Mar 04 13:38:40 2010 +0200
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?NLS TYPE="org.eclipse.help.toc"?>
-<toc label="Tasks">
+<toc label="Tasks">
+ <topic label="Editing HTI connection settings" href="html/tasks/set_preferences.htm" />
<topic label="Setting up USB serial connection" href="html/tasks/comm_usb.htm" />
<topic label="Setting up Bluetooth connection" href="html/tasks/comm_bt.htm" />
- <topic label="Viewing remote connections" href="html/tasks/viewing_remote_connections.htm" />
- <topic label="Editing HTI connection settings" href="html/tasks/set_preferences.htm" />
+ <topic label="Viewing remote connections" href="html/tasks/viewing_remote_connections.htm" />
</toc>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/tool.htm Thu Mar 04 13:38:40 2010 +0200
@@ -0,0 +1,32 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Carbide.c++ User Guide</title>
+ <link href="../book.css" rel="stylesheet" type="text/css">
+ <style>
+ table, td, th { border: 0px none #FFF; }
+ </style>
+</head>
+
+<body background="images/background_carbide.jpg" >
+<p> </p>
+<table width="530" border="0" align="center" cellpadding="0" cellspacing="5" bgcolor="#FFFFFF" >
+ <tr>
+ <td width="215"><img src="images/about_cpp.png" width="225" height="200"></td>
+ <td width="294" valign="bottom"><p align="right"><b><img src="images/brandmark_cpp.gif" width="106" height="52"></b></p>
+ <p> </p>
+ <p> </p>
+ <p> </p>
+ <p class="titleSmall">Copyright © 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+ License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"><h1 align="center">HTI Connection User Guide</h1>
+ <p align="center" class="titleSmall">Version 1.3.1; February, 2010</p></td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
--- a/htiextension/com.nokia.s60tools.hticonnection.help/html/toolTOC.xml Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/html/toolTOC.xml Thu Mar 04 13:38:40 2010 +0200
@@ -4,7 +4,7 @@
<toc label="HTI Connection"
link_to="../com.nokia.carbide.help.common/carbideHelpTOC.xml#anchorCarbideFeature">
- <topic label="HTI Connection" href="html/toc.htm" >
+ <topic label="HTI Connection" href="html/tool.htm" >
<topic label="Release Notes" href="html/release_notes.htm" />
--- a/htiextension/com.nokia.s60tools.hticonnection.help/src/com/nokia/s60tools/hticonnection/help/HelpPlugin.java Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection.help/src/com/nokia/s60tools/hticonnection/help/HelpPlugin.java Thu Mar 04 13:38:40 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
--- a/htiextension/com.nokia.s60tools.hticonnection.help/src/com/nokia/s60tools/hticonnection/help/HelpPlugin.java.orig Fri Feb 19 10:07:34 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +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 "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.s60tools.hticonnection.help;
-
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class HelpPlugin extends AbstractUIPlugin {
-
- //The shared instance.
- private static HelpPlugin plugin;
-
- /**
- * The constructor.
- */
- public HelpPlugin() {
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static HelpPlugin getDefault() {
- return plugin;
- }
-}
--- a/htiextension/com.nokia.s60tools.hticonnection/META-INF/MANIFEST.MF Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection/META-INF/MANIFEST.MF Thu Mar 04 13:38:40 2010 +0200
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Carbide.c++ Extensions - HTI Connection
Bundle-SymbolicName: com.nokia.s60tools.hticonnection;singleton:=true
-Bundle-Version: 1.3.0
+Bundle-Version: 1.3.1
Bundle-ClassPath: .,
htiapi.jar
Bundle-Vendor: Nokia
--- a/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/actions/StartStopGatewayAction.java Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/actions/StartStopGatewayAction.java Thu Mar 04 13:38:40 2010 +0200
@@ -47,7 +47,7 @@
public StartStopGatewayAction() {
super(startGatewayMsg,
startGatewayMsg,
- IAction.AS_DROP_DOWN_MENU,
+ IAction.AS_PUSH_BUTTON,
ImageKeys.IMG_START_GATEWAY);
setRunning(HtiConnection.getInstance().getConnectionStatus()
--- a/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/connection/HTIConnectedService.java Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/connection/HTIConnectedService.java Thu Mar 04 13:38:40 2010 +0200
@@ -20,7 +20,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.osgi.framework.Version;
-import com.nokia.carbide.remoteconnections.interfaces.AbstractConnectedService;
+import com.nokia.carbide.remoteconnections.interfaces.AbstractConnectedService2;
import com.nokia.carbide.remoteconnections.interfaces.AbstractSynchronizedConnection;
import com.nokia.carbide.remoteconnections.interfaces.IService;
import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
@@ -32,8 +32,8 @@
/**
* Connected service for HTI to contain connection information.
*/
-public class HTIConnectedService extends AbstractConnectedService {
-
+public class HTIConnectedService extends AbstractConnectedService2 {
+
/**
* Constructor.
* @param service Service that is connected.
@@ -48,15 +48,15 @@
}
/* (non-Javadoc)
- * @see com.nokia.carbide.remoteconnections.interfaces.AbstractConnectedService#runTestStatus(org.eclipse.core.runtime.IProgressMonitor)
+ * @see com.nokia.carbide.remoteconnections.interfaces.AbstractConnectedService2#runTestStatus(org.eclipse.core.runtime.IProgressMonitor)
*/
protected TestResult runTestStatus(IProgressMonitor monitor) {
- if(!manualTesting) {
+ if(!externalTesting) {
// Not using automatic testing as it would take too much resources. Returning currently known status.
IStatus status = getStatusFromHtiConnection();
return new TestResult(status.getEStatus(), status.getShortDescription(), status.getLongDescription());
}
-
+
// Testing connection when user has ordered testing command from the settings wizard.
monitor.beginTask("Testing HTI Service", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
IStatus status = HtiConnection.getInstance().testConnection(connection);
--- a/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/core/HtiConnection.java Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/core/HtiConnection.java Thu Mar 04 13:38:40 2010 +0200
@@ -22,6 +22,7 @@
import java.util.List;
import java.util.concurrent.ExecutionException;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PartInitException;
@@ -29,9 +30,15 @@
import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
import com.nokia.carbide.remoteconnections.interfaces.IConnectedService;
import com.nokia.carbide.remoteconnections.interfaces.IConnection;
+import com.nokia.carbide.remoteconnections.interfaces.IService;
import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus;
import com.nokia.carbide.remoteconnections.interfaces.IConnectedService.IStatus.EStatus;
-import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionsManagerListener;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionListener;
+import com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.ISelectedConnectionInfo;
+import com.nokia.carbide.remoteconnections.internal.api.IConnection2;
+import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus;
+import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatusChangedListener;
+import com.nokia.carbide.remoteconnections.internal.api.IConnection2.IConnectionStatus.EConnectionStatus;
import com.nokia.s60tools.hticonnection.HtiApiActivator;
import com.nokia.s60tools.hticonnection.actions.OpenPreferencePageAction;
import com.nokia.s60tools.hticonnection.connection.HTIConnectedService;
@@ -41,6 +48,7 @@
import com.nokia.s60tools.hticonnection.listener.HtiConnectionManager;
import com.nokia.s60tools.hticonnection.preferences.HtiApiPreferenceConstants;
import com.nokia.s60tools.hticonnection.preferences.HtiApiPreferencePage;
+import com.nokia.s60tools.hticonnection.preferences.HtiApiPreferences;
import com.nokia.s60tools.hticonnection.resources.Messages;
import com.nokia.s60tools.hticonnection.services.HTIVersion;
import com.nokia.s60tools.hticonnection.ui.dialogs.ErrorDialogWithHelp;
@@ -51,7 +59,7 @@
/**
* This class manages current connection and holds it status information.
*/
-public class HtiConnection implements IConnectionsManagerListener {
+public class HtiConnection {
/**
* Status of current connection. Used to device if new requests should
@@ -85,6 +93,21 @@
private DataGatewayManager gatewayManager = null;
/**
+ * Listener for listening changes in connections.
+ */
+ private IConnectionListener connectionListener = null;
+
+ /**
+ * Listener for listening changes in current connection status.
+ */
+ private IConnectionStatusChangedListener currentConnectionStatusListener = null;
+
+ /**
+ * To point right connection when IConnectionStatusChangedListener is added and removed.
+ */
+ private IConnection currentlyOpenConnection = null;
+
+ /**
* Enumeration for status of the current connection.
*/
public enum ConnectionStatus {
@@ -116,7 +139,11 @@
* Initializes listeners and settings.
*/
public void init() {
- RemoteConnectionsActivator.getConnectionsManager().addConnectionStoreChangedListener(this);
+ // Add listeners
+ // Create "current connection" listener
+ connectionListener = new ConnectionChangedListener();
+ RemoteConnectionsActivator.getConnectionsManager().addConnectionListener(connectionListener);
+
currentConnection = HtiApiActivator.getPreferences().getCurrentConnection();
}
@@ -125,7 +152,9 @@
*/
public void stop() {
setConnectionStatus(ConnectionStatus.SHUTDOWN);
- RemoteConnectionsActivator.getConnectionsManager().removeConnectionStoreChangedListener(this);
+ // Remove listeners
+ RemoteConnectionsActivator.getConnectionsManager().removeConnectionListener(connectionListener);
+
connectionChecker = null;
if(gatewayManager != null){
@@ -163,7 +192,19 @@
ConnectionStatus status = (isTesting) ? ConnectionStatus.TESTING : ConnectionStatus.CONNECTING;
setConnectionStatus(status);
- return startGateway(connection, isTesting);
+ boolean result = startGateway(connection, isTesting);
+
+ if (result) {
+ currentlyOpenConnection = connection;
+ // Add status listener to the connection
+ if (currentlyOpenConnection instanceof IConnection2) {
+ currentConnectionStatusListener = new ConnectionStatusListener();
+ ((IConnection2) currentlyOpenConnection)
+ .addStatusChangedListener(currentConnectionStatusListener);
+ }
+ }
+
+ return result;
}
/**
@@ -216,6 +257,14 @@
public void stopConnection() {
setConnectionStatus(ConnectionStatus.SHUTDOWN);
gatewayManager.stopGateway();
+
+ // Remove status listener from the connection
+ if ((currentlyOpenConnection instanceof IConnection2) &&
+ (currentConnectionStatusListener != null)) {
+ ((IConnection2) currentlyOpenConnection)
+ .removeStatusChangedListener(currentConnectionStatusListener);
+ }
+ currentlyOpenConnection = null;
}
/**
@@ -461,7 +510,10 @@
// ID of normal connection need to be saved to preferences so that it will be used later as default.
String connectionID = (currentConnection == null) ? HtiApiPreferenceConstants.DEFAULT_CONNECTION_ID
: currentConnection.getIdentifier();
- if (!connectionID.equals(HtiApiActivator.getPreferences().getConnectionID())) {
+
+ // Set only if NOT already set as same or NOT set as "current connection".
+ if ((!connectionID.equals(HtiApiActivator.getPreferences().getConnectionID())) &&
+ (!HtiApiPreferences.SELECTION_ID_CURRENT.equals(HtiApiActivator.getPreferences().getConnectionID()))) {
HtiApiActivator.getPreferences().setConnectionID(connectionID);
}
}
@@ -475,39 +527,62 @@
return currentConnection;
}
- /* (non-Javadoc)
- * @see com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionsManagerListener#connectionStoreChanged()
+ /**
+ * Call when connection changes.
+ * @param newConnection new connection
+ * @throws CoreException
*/
- public void connectionStoreChanged() {
- // Initializing needed variables.
- IConnection currConn = getCurrentConnection();
- if(currConn == null) {
- // Nothing to do, if no connection is selected.
- return;
- }
- String connID = currConn.getIdentifier();
- Collection<IConnection> connections = RemoteConnectionsActivator.getConnectionsManager().getConnections();
+ public void changeConnection(String newConnection) throws CoreException {
+
+ String currentConnectionId = null;
+ if (getCurrentConnection() != null) currentConnectionId = getCurrentConnection().getIdentifier();
+ boolean isConnected = getConnectionStatus() != ConnectionStatus.SHUTDOWN;
+ boolean isNewConnection = (newConnection != null) && !(newConnection.equals(currentConnectionId));
- // Checking if current connection still exists.
- boolean isFound = false;
- for(IConnection conn : connections) {
- if(conn.getIdentifier().equals(connID)) {
- isFound = true;
- break;
- }
+ // Ensure that connection is ok.
+ IService service = RemoteConnectionsActivator.getConnectionTypeProvider().findServiceByID(HTIService.ID);
+ ISelectedConnectionInfo connectionInfo;
+ connectionInfo = RemoteConnectionsActivator.getConnectionsManager().ensureConnection(newConnection, service);
+ IConnection connection = connectionInfo.getConnection();
+
+ if (isConnected && isNewConnection) {
+ // Connection has been changed when connection is started.
+ restartDataGateway(connection, false);
}
-
- if(!isFound) {
- // Connection doesn't exist anymore. Setting current connection as null.
- setCurrentConnection(null, false);
+ else if(!isConnected || currentConnection == null) {
+ // Connection isn't active or connections have been deleted. New connection can be set.
+ setCurrentConnection(connection, false);
}
}
-
- /* (non-Javadoc)
- * @see com.nokia.carbide.remoteconnections.interfaces.IConnectionsManager.IConnectionsManagerListener#displayChanged()
+
+ /**
+ * Call when connection changes.
+ * @param newConnection new connection
*/
- public void displayChanged() {
- // Not implemented.
+ public void changeConnection(IConnection newConnection) {
+ boolean isConnected = getConnectionStatus() != ConnectionStatus.SHUTDOWN;
+ boolean isNewConnection =
+ (newConnection != null) &&
+ !(newConnection.equals(getCurrentConnection()));
+
+ if (isConnected && isNewConnection) {
+ // Connection has been changed when connection is started.
+ restartDataGateway(newConnection, false);
+ }
+ else if(!isConnected || currentConnection == null) {
+ // Connection isn't active or connections have been deleted. New connection can be set.
+ setCurrentConnection(newConnection, false);
+ }
+ }
+
+ /**
+ * Restarts Datagateway with settings from preference store.
+ * @param isTesting True if testing connection and not trying to establish permanent connection.
+ */
+ public boolean restartDataGateway(IConnection conn, boolean isTesting) {
+ stopConnection();
+ setCurrentConnection(conn, false);
+ return startConnection(isTesting);
}
//
@@ -515,6 +590,53 @@
//
/**
+ * Listener for listening changes in current connection status.
+ */
+ private class ConnectionStatusListener implements IConnectionStatusChangedListener {
+
+ public void statusChanged(IConnectionStatus status) {
+ // Stop connection when current connection device is removed.
+ if (status.getEConnectionStatus().equals(EConnectionStatus.IN_USE_DISCONNECTED)) {
+ stopConnection();
+ setCurrentConnection(null, false);
+ }
+ }
+ }
+
+ /**
+ * Listener for listening changes in connections.
+ */
+ private class ConnectionChangedListener implements IConnectionListener {
+
+ public void connectionAdded(IConnection connection) {
+ // Do nothing.
+ }
+
+ public void connectionRemoved(IConnection connection) {
+ // Initializing needed variables.
+ IConnection currConn = getCurrentConnection();
+ if(currConn == null) {
+ // Nothing to do, if no connection is selected.
+ return;
+ }
+
+ // Checking if current connection was the removed one.
+ if (currConn.getIdentifier().equals(connection.getIdentifier())) {
+ //If so, remove it and stop connection.
+ stopConnection();
+ setCurrentConnection(null, false);
+ }
+ }
+
+ public void currentConnectionSet(IConnection connection) {
+ if (HtiApiActivator.getPreferences().getConnectionID().equals(HtiApiPreferences.SELECTION_ID_CURRENT)) {
+ changeConnection(connection);
+ }
+ }
+
+ };
+
+ /**
* Thread that tests connection.
* Connection needs to be tested when new connection has been started
* or there has been problems with current connection.
@@ -587,14 +709,14 @@
/**
* Connection that needs status update.
*/
- private final IConnection onnectionToUpdate;
+ private final IConnection connectionToUpdate;
/**
* Constructor.
- * @param onnectionToUpdate Connection that needs status update.
+ * @param connectionToUpdate Connection that needs status update.
*/
- public ConnectionStatusUpdater(IConnection onnectionToUpdate) {
- this.onnectionToUpdate = onnectionToUpdate;
+ public ConnectionStatusUpdater(IConnection connectionToUpdate) {
+ this.connectionToUpdate = connectionToUpdate;
}
/* (non-Javadoc)
@@ -603,8 +725,8 @@
public void run() {
// Connection status needs to be updated in connected service.
- if(onnectionToUpdate != null) {
- Collection<IConnectedService> services = RemoteConnectionsActivator.getConnectionsManager().getConnectedServices(onnectionToUpdate);
+ if(connectionToUpdate != null) {
+ Collection<IConnectedService> services = RemoteConnectionsActivator.getConnectionsManager().getConnectedServices(connectionToUpdate);
// Collection can be null if getting services for test connection.
if(services != null) {
for(IConnectedService service : services) {
@@ -620,12 +742,17 @@
view.updateActionButtonStates();
// Updating connection description.
+ String displayName = "";
+ if(connectionToUpdate != null){
+ displayName = connectionToUpdate.getDisplayName();
+ }
+
switch (getConnectionStatus()) {
case CONNECTED:
- view.updateDescription(Messages.getString("HtiConnection.Connected_ToolBar_Msg") + onnectionToUpdate.getDisplayName()); //$NON-NLS-1$
+ view.updateDescription(Messages.getString("HtiConnection.Connected_ToolBar_Msg") + displayName); //$NON-NLS-1$
break;
case CONNECTING:
- view.updateDescription(Messages.getString("HtiConnection.Connecting_ToolBar_Msg") + onnectionToUpdate.getDisplayName()); //$NON-NLS-1$
+ view.updateDescription(Messages.getString("HtiConnection.Connecting_ToolBar_Msg") + displayName); //$NON-NLS-1$
break;
case SHUTDOWN:
view.updateDescription(Messages.getString("HtiConnection.NotConnected_ToolBar_Msg")); //$NON-NLS-1$
--- a/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/preferences/HtiApiPreferencePage.java Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/preferences/HtiApiPreferencePage.java Thu Mar 04 13:38:40 2010 +0200
@@ -17,6 +17,7 @@
package com.nokia.s60tools.hticonnection.preferences;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -28,15 +29,13 @@
import org.eclipse.ui.PlatformUI;
import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
-import com.nokia.carbide.remoteconnections.interfaces.IClientServiceSiteUI;
-import com.nokia.carbide.remoteconnections.interfaces.IConnection;
+import com.nokia.carbide.remoteconnections.interfaces.IClientServiceSiteUI2;
import com.nokia.carbide.remoteconnections.interfaces.IService;
import com.nokia.s60tools.hticonnection.HtiApiActivator;
import com.nokia.s60tools.hticonnection.HtiConnectionHelpContextIDs;
import com.nokia.s60tools.hticonnection.common.ProductInfoRegistry;
import com.nokia.s60tools.hticonnection.connection.HTIService;
import com.nokia.s60tools.hticonnection.core.HtiConnection;
-import com.nokia.s60tools.hticonnection.core.HtiConnection.ConnectionStatus;
import com.nokia.s60tools.hticonnection.resources.Messages;
/**
@@ -52,7 +51,7 @@
/**
* UI component for configuring connection.
*/
- private IClientServiceSiteUI clientSiteUI;
+ private IClientServiceSiteUI2 clientSiteUI;
/**
* Keeps information about if preferences page is created and open currently.
@@ -86,15 +85,15 @@
// Client Site UI for creating and selecting connection.
IService service = RemoteConnectionsActivator.getConnectionTypeProvider().findServiceByID(HTIService.ID);
- clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI(service);
+ clientSiteUI = RemoteConnectionsActivator.getConnectionsManager().getClientSiteUI2(service);
clientSiteUI.createComposite(container);
// Current connection needs to be selected or first in the list is selected.
- IConnection currentConnection = HtiApiActivator.getPreferences().getCurrentConnection();
+ String currentConnection = HtiApiActivator.getPreferences().getConnectionID();
if(currentConnection != null) {
clientSiteUI.selectConnection(currentConnection);
}
-
+
setHelps(parent);
return container;
@@ -110,8 +109,8 @@
/* (non-Javadoc)
* @see org.eclipse.jface.preference.PreferencePage#performOk()
*/
- public boolean performOk() {
- doApply();
+ public boolean performOk() {
+ doApply();
return super.performOk();
}
@@ -124,26 +123,14 @@
/**
* Apply settings
+ * @throws CoreException
*/
- private void doApply(){
- savePrefStoreValues();
-
- // Getting needed variables.
- HtiConnection htiConnection = HtiConnection.getInstance();
- IConnection currentConnection = clientSiteUI.getSelectedConnection();
-
- // Restart datagateway if connection has been changed
-
- boolean isConnected = htiConnection.getConnectionStatus() != ConnectionStatus.SHUTDOWN;
- boolean isNewConnection = (currentConnection != null) && !(currentConnection.equals(htiConnection.getCurrentConnection()));
-
- if (isConnected && isNewConnection) {
- // Connection has been changed when connection is started.
- restartDataGateway(currentConnection, false);
- }
- else if(!isConnected || currentConnection == null) {
- // Connection isn't active or connections have been deleted. New connection can be set.
- HtiConnection.getInstance().setCurrentConnection(currentConnection, false);
+ private void doApply() {
+ savePrefStoreValues();
+ try {
+ HtiConnection.getInstance().changeConnection(clientSiteUI.getSelectedConnection());
+ } catch (CoreException e) {
+ e.printStackTrace();
}
}
@@ -166,26 +153,15 @@
* @return True if saved successfully, else false
*/
private void savePrefStoreValues() {
- IConnection currentConnection = clientSiteUI.getSelectedConnection();
+ String currentConnection = clientSiteUI.getSelectedConnection();
String connectionID = (currentConnection == null) ? HtiApiPreferenceConstants.DEFAULT_CONNECTION_ID
- : currentConnection.getIdentifier();
+ : currentConnection;
if (!connectionID.equals(HtiApiActivator.getPreferences().getConnectionID())) {
HtiApiActivator.getPreferences().setConnectionID(connectionID);
}
}
/**
- * Restarts Datagateway with settings from preference store.
- * @param isTesting True if testing connection and not trying to establish permanent connection.
- */
- private boolean restartDataGateway(IConnection conn, boolean isTesting) {
- HtiConnection htiConn = HtiConnection.getInstance();
- htiConn.stopConnection();
- htiConn.setCurrentConnection(conn, false);
- return htiConn.startConnection(isTesting);
- }
-
- /**
* Returns true if preferences page is created and open.
* @return True if page is created.
*/
--- a/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/preferences/HtiApiPreferences.java Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/preferences/HtiApiPreferences.java Thu Mar 04 13:38:40 2010 +0200
@@ -37,6 +37,11 @@
*/
public class HtiApiPreferences implements IHtiApiPreferences {
+ /**
+ * The type of "current" type of connection.
+ */
+ public static String SELECTION_ID_CURRENT = "com.nokia.carbide.remoteConnections.currentConnection";
+
/* (non-Javadoc)
* @see com.nokia.s60tools.hticonnection.preferences.IHtiApiPreferences#initDefaultValues()
*/
@@ -85,7 +90,9 @@
List<IConnection> htiConnections = HtiConnection.getInstance().getHTIConnections();
- if(htiConnections.size() == 1) {
+ // Do not change default if it is "current connection".
+ if (!HtiApiActivator.getPreferences().getConnectionID().equals(HtiApiPreferences.SELECTION_ID_CURRENT) &&
+ htiConnections.size() == 1) {
// Only one compatible connection was found. Using it as default.
IConnection conn = htiConnections.get(0);
HtiApiActivator.getPreferences().setConnectionID(conn.getIdentifier());
--- a/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/ui/views/main/MainView.java Fri Feb 19 10:07:34 2010 +0200
+++ b/htiextension/com.nokia.s60tools.hticonnection/src/com/nokia/s60tools/hticonnection/ui/views/main/MainView.java Thu Mar 04 13:38:40 2010 +0200
@@ -204,9 +204,13 @@
scrollLockAction = new ScrollLockAction(this);
selectAllAction = new SelectAllAction(this);
startStopGatewayAction = new StartStopGatewayAction();
+
+ // Menu is no longer needed after "current connection" -feature
+ /*
// Creator connection menu.
IMenuCreator creator = new ConnectionMenuCreator();
startStopGatewayAction.setMenuCreator(creator);
+ */
StringArrayClipboardCopyHandler copyHandler = new StringArrayClipboardCopyHandler();
copyAction = new CopyFromStringProviderToClipboardAction(this, new ICopyActionHandler[]{ copyHandler });
