Merge branch 'ols_v0_9_5'

Conflicts:
	pom.xml

ChangeLog

@@ -1,3 +1,78 @@
+2011-12-31  JaWi <[email protected]>
+
+	*
+	device.logicsniffer/src/main/java/org/sump/device/logicsniffer/Logi
+	cSnifferAcquisitionTask.java,
+	device.logicsniffer/src/main/java/org/sump/device/logicsniffer/Logi
+	cSnifferCancelTask.java,
+	device.logicsniffer/src/main/java/org/sump/device/logicsniffer/Logi
+	cSnifferDevice.java: Some simplifications in the cancellation of
+	acquisitions.
+
+2011-12-31  JaWi <[email protected]>
+
+	* rxtx/src/main/java/nl/lxtreme/rxtx/CommPortUtils.java,
+	rxtx/src/main/java/nl/lxtreme/rxtx/SerialConnection.java,
+	rxtx/src/main/java/nl/lxtreme/rxtx/SerialConnectionFactory.java,
+	rxtx/src/main/java/nl/lxtreme/rxtx/SerialPortOptions.java: Updated
+	to latest PureJavaComm release (0.0.3).
+
+2011-12-09  JaWi <[email protected]>
+
+	*
+	tool.1wire/src/main/java/nl/lxtreme/ols/tool/onewire/OneWireAnalyse
+	rDialog.java,
+	tool.asm45/src/main/java/nl/lxtreme/ols/tool/asm45/Asm45ProtocolAna
+	lysisDialog.java,
+	tool.i2c/src/main/java/nl/lxtreme/ols/tool/i2c/I2CProtocolAnalysisD
+	ialog.java,
+	tool.jtag/src/main/java/nl/lxtreme/ols/tool/jtag/JTAGProtocolAnalys
+	isDialog.java,
+	tool.spi/src/main/java/nl/lxtreme/ols/tool/spi/SPIProtocolAnalysisD
+	ialog.java,
+	tool.uart/src/main/java/nl/lxtreme/ols/tool/uart/UARTProtocolAnalys
+	isDialog.java: Fixed issue #83: export button in various tools was
+	not enabled properly after a successful decoding has taken place.
+
+2011-12-05  JaWi <[email protected]>
+
+	* api/src/main/java/nl/lxtreme/ols/api/DataAcquisitionService.java,
+	api/src/main/java/nl/lxtreme/ols/api/devices/AcquisitionTask.java,
+	api/src/main/java/nl/lxtreme/ols/api/devices/CancelTask.java,
+	api/src/main/java/nl/lxtreme/ols/api/devices/Device.java,
+	client/src/main/java/nl/lxtreme/ols/client/ClientController.java,
+	device.generic/src/main/java/nl/lxtreme/ols/device/generic/GenericD
+	evice.java,
+	device.generic/src/main/java/nl/lxtreme/ols/device/generic/GenericD
+	eviceAcquisitionTask.java,
+	device.logicsniffer/src/main/java/org/sump/device/logicsniffer/Logi
+	cSnifferAcquisitionTask.java,
+	device.logicsniffer/src/main/java/org/sump/device/logicsniffer/Logi
+	cSnifferCancelTask.java,
+	device.logicsniffer/src/main/java/org/sump/device/logicsniffer/Logi
+	cSnifferDevice.java,
+	device.test/src/main/java/nl/lxtreme/ols/device/test/TestAcquisitio
+	nTask.java,
+	device.test/src/main/java/nl/lxtreme/ols/device/test/TestDevice.jav
+	a, rxtx/src/main/java/nl/lxtreme/rxtx/SerialConnection.java,
+	service.acquisition/src/main/java/nl/lxtreme/ols/acquisition/Backgr
+	oundDataAcquisitionService.java: When a RLE-enabled capture was
+	ongoing, the cancel acquisition didn't finish properly. This won't
+	work however when a basic trigger is set which not yet fired. It
+	appears that advanced triggers should work.
+
+2011-11-27  JaWi <[email protected]>
+
+	* client/src/main/java/nl/lxtreme/ols/client/ClientController.java,
+	client/src/main/java/nl/lxtreme/ols/client/MainFrame.java: By
+	default select the OLS device as capturing device; after a capture
+	is complete, or a project is loaded, zoom diagram to fit window.
+
+2011-11-25  JaWi <[email protected]>
+
+	* ChangeLog, ols.distribution/src/main/resources/CHANGELOG, pom.xml: 
+	Preparation for beta 2.
+
 2011-11-25  JaWi <[email protected]>
 
 	* client/src/main/java/nl/lxtreme/ols/client/ClientController.java,

api/pom.xml

@@ -8,7 +8,7 @@
 	</parent>
 	<artifactId>api</artifactId>
 	<packaging>bundle</packaging>
-	<version>1.0.5-SNAPSHOT</version>
+	<version>1.0.5</version>
 	<name>OLS Framework API</name>
 	<dependencies>
 		<dependency>

client/pom.xml

@@ -8,7 +8,7 @@
 	</parent>
 	<artifactId>client</artifactId>
 	<packaging>bundle</packaging>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.0</version>
 	<name>OLS Swing client</name>
 	<dependencies>
 		<dependency>

device.logicsniffer/pom.xml

@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>nl.lxtreme.ols.device</groupId>
 	<artifactId>logicsniffer</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.0</version>
 	<packaging>bundle</packaging>
 	<name>OLS OpenBench LogicSniffer Device</name>
 	<dependencies>

ols.distribution/src/main/resources/CHANGELOG

@@ -3,6 +3,9 @@ OpenBench LogicSniffer Client ChangeLog
 J.W. Janssen, <[email protected]>
 
 
+Release 0.9.5:
+- Fixed cancel capture issue.
+
 Release 0.9.5 (beta 2):
 - Fixed issues #81 and #82;
 - Ensured that the selected capture device is retained between user sessions;
@@ -27,4 +30,4 @@ Older releases:
 
 
 1. http://www.sparetimelabs.com/purejavacomm/index.html
-2. http://www.hp9845.net/9845/projects/assembler/
+2. http://www.hp9845.net/9845/projects/assembler/

ols.distribution/src/site/main/index.html

@@ -137,6 +137,8 @@ <h3 class="content">Introduction</h3>
 
     <h3 class="content">News</h3>
     <ul>
+      <li>January 8th, 2012, OLS version 0.9.5 released. Major highlights: Asm45 decoder tool added, support for running on Java 7, included <a 
+        href="http://www.sparetimelabs.com/purejavacomm/index.html">PureJavacomm</a> as replacement for RXTX, many small changes and updates;</li>
       <li>April 20th, 2011, OLS version 0.9.4 released. Major highlights: better support for BusPirate, LogicShrimp, IRToy and other SUMP-compatible devices,
         several improvements to the user interface;</li>
       <li>February 7th, 2011, OLS version 0.9.3 SP1 released. This service pack fixes some severe bugs that crept into the
@@ -189,19 +191,20 @@ <h3 class="content">FAQ</h3>
 
     <h3 class="content">Download</h3>
     <p>
-      The current release of Logic Sniffer is <strong><a href="ols-0.9.4-full.tar.gz">0.9.4</a></strong>.
+      The current release of Logic Sniffer is <strong><a href="ols-0.9.5-full.tar.gz">0.9.5</a></strong>.
       Older releases, for historical reasons:
     </p>
     <ul id="releases">
-    <li>ols-0.9.4 [<a href="ols-0.9.4-full.tar.gz">tar.gz</a>] [<a href="ols-0.9.4-full.zip">zip</a>] [<a href="ols-0.9.4-full.dmg">dmg</a>] <span>released <em>April 20th, 2011</em>, 2.6M;</span></li>
+    <li>ols-0.9.5 [<a href="ols-0.9.5-full.tar.gz">tar.gz</a>] [<a href="ols-0.9.5-full.zip">zip</a>] [<a href="ols-0.9.5-full.dmg">dmg</a>] [<a href="ols-0.9.5-api.zip">API</a>] <span>released <em>January 8th, 2012</em>, 3.8M;</span></li>
+    <li>ols-0.9.4 [<a href="ols-0.9.4-full.tar.gz">tar.gz</a>] [<a href="ols-0.9.4-full.zip">zip</a>] [<a href="ols-0.9.4-full.dmg">dmg</a>] [<a href="ols-0.9.4-api.zip">API</a>] <span>released <em>April 20th, 2011</em>, 2.6M;</span></li>
     <li>ols-0.9.3 SP1 [<a href="ols-0.9.3.1.tar.gz">tar.gz</a>] [<a href="ols-0.9.3.1.zip">zip</a>] [<a href="ols-0.9.3.1.dmg">dmg</a>] <span>released <em>February 7th, 2011</em>, 2.3M;</span></li>
     <li><strike>ols-0.9.3 [tar.gz] [zip] [dmg] <span>released <em>February 6th, 2011</em>, 2.3M;</span></strike></li>
     <li>ols-0.9.2 [<a href="ols-0.9.2.tar.gz">tar.gz</a>] [<a href="ols-0.9.2.zip">zip</a>] [<a href="ols-0.9.2.dmg">dmg</a>] <span>released <em>December 19th, 2010</em>, 2.3M;</span></li>
     <li>ols-0.9.1 [<a href="ols-0.9.1.tar.gz">tar.gz</a>] [<a href="ols-0.9.1.zip">zip</a>] [<a href="ols-0.9.1.dmg">dmg</a>] <span>released <em>November 1st, 2010</em>, 2.2M;</span></li>
     <li>ols-0.9.0 [<a href="ols-0.9.0.tar.gz">tar.gz</a>] [<a href="ols-0.9.0.zip">zip</a>] [<a href="ols-0.9.0.dmg">dmg</a>] <span>released <em>October 23rd, 2010</em>, 2.2M;</span></li>
-    <li>ols-0.8.5 [<a href="ols-0.8.5.tar.gz">tar.gz</a>] <span>released <em>October 1st, 2010</em>, 2.1M;</span></li>
-	  <li>ols-0.8.4 [<a href="ols-0.8.4.tar.gz">tar.gz</a>] <span>released <em>September 9th 2010</em>, 1.5M;</span></li>
-	  <li>ols-0.8.3 [<a href="ols-0.8.3.tar.gz">tar.gz</a>] <span>released <em>August 26th 2010</em>, 1.5M;</span></li>
+    <li>ols-0.8.5 [<a href="http://lxtreme.xs4all.nl/~jawi/ols/ols-0.8.5.tar.gz">tar.gz</a>] <span>released <em>October 1st, 2010</em>, 2.1M;</span></li>
+	  <li>ols-0.8.4 [<a href="http://lxtreme.xs4all.nl/~jawi/ols/ols-0.8.4.tar.gz">tar.gz</a>] <span>released <em>September 9th 2010</em>, 1.5M;</span></li>
+	  <li>ols-0.8.3 [<a href="http://lxtreme.xs4all.nl/~jawi/ols/ols-0.8.3.tar.gz">tar.gz</a>] <span>released <em>August 26th 2010</em>, 1.5M;</span></li>
 	  <li>ols-0.8.2 [<a href="http://lxtreme.xs4all.nl/~jawi/ols/ols-0.8.2.tar.gz">tar.gz</a>] <span>released <em>August 22nd 2010</em>, 1.5M;</span></li>
 	  <li>ols-0.8.1 [<a href="http://lxtreme.xs4all.nl/~jawi/ols/ols-0.8.1.tar.gz">tar.gz</a>] <span>released <em>August 07th 2010</em>, 1.4M;</span></li>
 	  <li>ols-0.8.0 [<a href="http://lxtreme.xs4all.nl/~jawi/ols/ols-0.8.0.tar.gz">tar.gz</a>] <span>released <em>August 24th 2010</em>, 1.4M;</span></li>

pom.xml

@@ -190,12 +190,12 @@
 			<dependency>
 				<groupId>nl.lxtreme.ols</groupId>
 				<artifactId>api</artifactId>
-				<version>1.0.5-SNAPSHOT</version>
+				<version>1.0.5</version>
 			</dependency>
 			<dependency>
 				<groupId>nl.lxtreme.ols</groupId>
 				<artifactId>client</artifactId>
-				<version>1.2.0-SNAPSHOT</version>
+				<version>1.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>nl.lxtreme.ols</groupId>
@@ -220,7 +220,7 @@
 			<dependency>
 				<groupId>nl.lxtreme.ols</groupId>
 				<artifactId>util</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0</version>
 			</dependency>
 			<dependency>
 				<groupId>nl.lxtreme.ols</groupId>
@@ -245,7 +245,7 @@
 			<dependency>
 				<groupId>nl.lxtreme.ols.device</groupId>
 				<artifactId>logicsniffer</artifactId>
-				<version>1.1.0-SNAPSHOT</version>
+				<version>1.1.0</version>
 			</dependency>
 			<dependency>
 				<groupId>nl.lxtreme.ols.tool</groupId>

util/pom.xml

@@ -8,7 +8,7 @@
 	</parent>
 	<artifactId>util</artifactId>
 	<packaging>bundle</packaging>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.0</version>
 	<name>OLS Utilities</name>
 	<dependencies>
 		<dependency>