Merge tag 'upstream/2.1.8.20120912'

Upstream version 2.1.8.20120912

30 files changed, 119 insertions, 50 deletions

diff --git a/Java/com/phidgets/AccelerometerPhidget.java b/Java/com/phidgets/AccelerometerPhidget.java
index c0c82ae..062ea6f 100644
--- a/Java/com/phidgets/AccelerometerPhidget.java
+++ b/Java/com/phidgets/AccelerometerPhidget.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
@@ -11,9 +11,10 @@ import com.phidgets.event.*;
  * This class represents a Phidget Accelerometer. All methods to read
  * acceleration data from an Accelerometer are implemented in this class.
  <p>
- The Phidget Accelerometer provides 2 or 3 axes of acceleration data, at anywhere from 2g to 10g
- sensitivity, depending on the specific revision. See your hardware documetation for more information.
- They can measure both static (gravity) and dynamic acceleration.
+ * The Phidget Accelerometer provides 2 or 3 axes of acceleration data, at anywhere from 2g to 10g
+ * sensitivity, depending on the specific revision. See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  
  * @author Phidgets Inc.
  */
diff --git a/Java/com/phidgets/AdvancedServoPhidget.java b/Java/com/phidgets/AdvancedServoPhidget.java
index db33e2a..f66b924 100644
--- a/Java/com/phidgets/AdvancedServoPhidget.java
+++ b/Java/com/phidgets/AdvancedServoPhidget.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
@@ -11,9 +11,11 @@ import com.phidgets.event.*;
  * This class represents a Phidget Advanced Servo Controller. All methods
  * to to control a motor controller and read back motor data are implemented in this class.
  * <p>
- * The Phidget Advanced Servo Controller is able to control 1 or more servo motors. Motos acceleration
+ * The Phidget Advanced Servo Controller is able to control 1 or more servo motors. Motor acceleration
  * and Velocity are controllable. The number of servos that can be controlled depends on the
- * version of the controller.
+ * version of the controller. See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  * 
  * @author Phidgets Inc.
  */
diff --git a/Java/com/phidgets/AnalogPhidget.java b/Java/com/phidgets/AnalogPhidget.java
index b8f4c0a..56ac084 100644
--- a/Java/com/phidgets/AnalogPhidget.java
+++ b/Java/com/phidgets/AnalogPhidget.java
@@ -1,6 +1,6 @@
 

 /*

- * Copyright 2011 Phidgets Inc.  All rights reserved.

+ * Copyright 2012 Phidgets Inc.  All rights reserved.

  */

 

 package com.phidgets;

@@ -10,6 +10,9 @@ import com.phidgets.event.*;
 /**

  * This class represents a Phidget Analog. All methods

  * to manipulate the Phidget Analog are implemented in this class.

+ * See your device's User Guide for more specific API details, 

+ * technical information, and revision details. The User Guide, along with other resources, can be found on 

+ * the product page for your device.

  * 

  * @author Phidgets Inc.

  */

diff --git a/Java/com/phidgets/BridgePhidget.java b/Java/com/phidgets/BridgePhidget.java
index 55f0b65..2d0e28d 100644
--- a/Java/com/phidgets/BridgePhidget.java
+++ b/Java/com/phidgets/BridgePhidget.java
@@ -1,6 +1,6 @@
 

 /*

- * Copyright 2011 Phidgets Inc.  All rights reserved.

+ * Copyright 2012 Phidgets Inc.  All rights reserved.

  */

 

 package com.phidgets;

@@ -10,6 +10,9 @@ import com.phidgets.event.*;
 /**

  * This class represents a Phidget Bridge. All methods

  * to manipulate the Phidget Bridge are implemented in this class.

+ * See your device's User Guide for more specific API details, 

+ * technical information, and revision details. The User Guide, along with other resources, can be found on 

+ * the product page for your device.

  * <p>

  * 

  * @author Phidgets Inc.

diff --git a/Java/com/phidgets/Dictionary.java b/Java/com/phidgets/Dictionary.java
index 211bdfc..d6b00ae 100644
--- a/Java/com/phidgets/Dictionary.java
+++ b/Java/com/phidgets/Dictionary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
diff --git a/Java/com/phidgets/DictionaryKeyListener.java b/Java/com/phidgets/DictionaryKeyListener.java
index db09a90..85bab25 100644
--- a/Java/com/phidgets/DictionaryKeyListener.java
+++ b/Java/com/phidgets/DictionaryKeyListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
diff --git a/Java/com/phidgets/EncoderPhidget.java b/Java/com/phidgets/EncoderPhidget.java
index 1543bd3..7430aec 100644
--- a/Java/com/phidgets/EncoderPhidget.java
+++ b/Java/com/phidgets/EncoderPhidget.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
@@ -12,7 +12,10 @@ import com.phidgets.event.*;
  * to read encoder data from an encoder are implemented in this class.
  <p>
  Phidget Encoder boards generally support 1 or more encoders with 0 or more digital inputs.
- Both high speed optical and low speed mechanical encoders are supported with this API.
+ Both high speed optical and low speed mechanical encoders are supported with this API. 
+ * See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  * 
  * @author Phidgets Inc.
  */
diff --git a/Java/com/phidgets/FrequencyCounterPhidget.java b/Java/com/phidgets/FrequencyCounterPhidget.java
index b6b138e..46364e6 100644
--- a/Java/com/phidgets/FrequencyCounterPhidget.java
+++ b/Java/com/phidgets/FrequencyCounterPhidget.java
@@ -1,6 +1,6 @@
 

 /*

- * Copyright 2011 Phidgets Inc.  All rights reserved.

+ * Copyright 2012 Phidgets Inc.  All rights reserved.

  */

 

 package com.phidgets;

@@ -10,6 +10,9 @@ import com.phidgets.event.*;
 /**

  * This class represents a Phidget Frequency Counter. All methods

  * to read manipulate the Phidget Frequency Counter are implemented in this class.

+ * See your device's User Guide for more specific API details, 

+ * technical information, and revision details. The User Guide, along with other resources, can be found on 

+ * the product page for your device.

  * <p>

  * 

  * @author Phidgets Inc.

diff --git a/Java/com/phidgets/GPSPhidget.java b/Java/com/phidgets/GPSPhidget.java
index dde1400..4e6e274 100644
--- a/Java/com/phidgets/GPSPhidget.java
+++ b/Java/com/phidgets/GPSPhidget.java
@@ -1,6 +1,6 @@
 

 /*

- * Copyright 2011 Phidgets Inc.  All rights reserved.

+ * Copyright 2012 Phidgets Inc.  All rights reserved.

  */

 

 package com.phidgets;

@@ -8,13 +8,16 @@ import java.util.Iterator;
 import java.util.LinkedList;

 import com.phidgets.event.*;

 import java.util.Calendar;

-	/**

- * This class represents a Phidget GPS. All methods

- * to manipulate the Phidget GPS are implemented in this class.

- * <p>

- * 

- * @author Phidgets Inc.

- */

+/**

+* This class represents a Phidget GPS. All methods

+* to manipulate the Phidget GPS are implemented in this class.

+* See your device's User Guide for more specific API details, 

+* technical information, and revision details. The User Guide, along with other resources, can be found on 

+* the product page for your device.

+* <p>

+* 

+* @author Phidgets Inc.

+*/

 public final class GPSPhidget extends Phidget

 {

 	public GPSPhidget () throws PhidgetException

diff --git a/Java/com/phidgets/IRCode.java b/Java/com/phidgets/IRCode.java
index 51b014c..b34bd06 100644
--- a/Java/com/phidgets/IRCode.java
+++ b/Java/com/phidgets/IRCode.java
@@ -1,6 +1,6 @@
 

 /*

- * Copyright 2006 Phidgets Inc.  All rights reserved.

+ * Copyright 2012 Phidgets Inc.  All rights reserved.

  */

 

 package com.phidgets;

diff --git a/Java/com/phidgets/IRCodeInfo.java b/Java/com/phidgets/IRCodeInfo.java
index 8c67b10..dd2529f 100644
--- a/Java/com/phidgets/IRCodeInfo.java
+++ b/Java/com/phidgets/IRCodeInfo.java
@@ -1,6 +1,6 @@
 

 /*

- * Copyright 2006 Phidgets Inc.  All rights reserved.

+ * Copyright 2012 Phidgets Inc.  All rights reserved.

  */

 

 package com.phidgets;

diff --git a/Java/com/phidgets/IRLearnedCode.java b/Java/com/phidgets/IRLearnedCode.java
index 4949d07..c9c9765 100644
--- a/Java/com/phidgets/IRLearnedCode.java
+++ b/Java/com/phidgets/IRLearnedCode.java
@@ -1,6 +1,6 @@
 

 /*

- * Copyright 2006 Phidgets Inc.  All rights reserved.

+ * Copyright 2012 Phidgets Inc.  All rights reserved.

  */

 

 package com.phidgets;

diff --git a/Java/com/phidgets/IRPhidget.java b/Java/com/phidgets/IRPhidget.java
index 6a1d198..6647eeb 100644
--- a/Java/com/phidgets/IRPhidget.java
+++ b/Java/com/phidgets/IRPhidget.java
@@ -1,21 +1,24 @@
 
 /*
- * Copyright 2010 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
 import java.util.Iterator;
 import java.util.LinkedList;
-import com.phidgets.event.*;
+import com.phidgets.event.*;

 /**
  * This class represents a Phidget IR. All methods
  * to send and receive IR data are implemented in this class.
  * <p>
  * The Phidget IR Receiver-Transmitter can send and receive Consumer-IR signals. Ability to learn and re-transmit codes, 
  * as well as low-level access to raw data, is provided.
+ * See your device's User Guide for more specific API details, 

+ * technical information, and revision details. The User Guide, along with other resources, can be found on 

+ * the product page for your device.
  * 
  * @author Phidgets Inc.
- */
+ */

 public final class IRPhidget extends Phidget
 {
 	public IRPhidget () throws PhidgetException
diff --git a/Java/com/phidgets/InterfaceKitPhidget.java b/Java/com/phidgets/InterfaceKitPhidget.java
index d7aed29..6da48db 100644
--- a/Java/com/phidgets/InterfaceKitPhidget.java
+++ b/Java/com/phidgets/InterfaceKitPhidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
@@ -14,10 +14,12 @@ import com.phidgets.event.*;
  * to read and write data to and from an Interface Kit are implemented in this class.
  * <p>
  * There are many types of Interface Kits, but each is simply a collection of 0 or more 
- * digital inputs, digital outpus and analog sensors. Inputs can be read and outputs can be set,
+ * digital inputs, digital outpus and analog sensor inputs. The inputs can be read and outputs can be set,
  * and event handlers can be set for each of these.
  * <p>
- * See your hardware documentation for more information on the I/O specific to your Phidget.
+ * See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  * 
  * @author Phidgets Inc.
  */
diff --git a/Java/com/phidgets/LEDPhidget.java b/Java/com/phidgets/LEDPhidget.java
index 77a37e2..a1530f3 100644
--- a/Java/com/phidgets/LEDPhidget.java
+++ b/Java/com/phidgets/LEDPhidget.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
@@ -16,6 +16,9 @@ import com.phidgets.event.*;
  so this number is not absolute.
  <p>
  LEDs can be controlled individually, at brightness levels from 0-100.
+ * See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  * 
  * @author Phidgets Inc.
  */
diff --git a/Java/com/phidgets/Manager.java b/Java/com/phidgets/Manager.java
index d0e5f85..9a38cd5 100644
--- a/Java/com/phidgets/Manager.java
+++ b/Java/com/phidgets/Manager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
diff --git a/Java/com/phidgets/MotorControlPhidget.java b/Java/com/phidgets/MotorControlPhidget.java
index 8539b98..19ce88c 100644
--- a/Java/com/phidgets/MotorControlPhidget.java
+++ b/Java/com/phidgets/MotorControlPhidget.java
@@ -9,13 +9,16 @@ import java.util.LinkedList;
 import com.phidgets.event.*;
 /**
  * This class represents a Phidget Motor Controller. All Methods
- * to to control a motor controller and read back motor data are implemented in this class.
+ * to to control a DC motor controller and read back motor data are implemented in this class.
  <p>
  The Motor Control Phidget is able to control 1 or more DC motors. 
  Both speed and acceleration are controllable. Speed is controlled via PWM. The size of the motors
  that can be driven depends on the motor controller. See your hardware documentation for more information.
  <p>
- The motor Controller boards also has 0 or more digital inputs.
+ The motor Controller boards also have 0 or more digital inputs.
+ * See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  * 
  * @author Phidgets Inc.
  */
diff --git a/Java/com/phidgets/PHSensorPhidget.java b/Java/com/phidgets/PHSensorPhidget.java
index dc9ecf6..fa2d7ff 100644
--- a/Java/com/phidgets/PHSensorPhidget.java
+++ b/Java/com/phidgets/PHSensorPhidget.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
@@ -12,6 +12,9 @@ import com.phidgets.event.*;
  * to read pH data from the PH Sensor are implemented in this class.
  * <p>
  * The Phidget PH Sensor provides one standard pH sensor input.
+ * See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  * 
  * @author Phidgets Inc.
  */
diff --git a/Java/com/phidgets/Phidget.java b/Java/com/phidgets/Phidget.java
index 444779a..5faf96a 100644
--- a/Java/com/phidgets/Phidget.java
+++ b/Java/com/phidgets/Phidget.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 package com.phidgets;
 
diff --git a/Java/com/phidgets/PhidgetException.java b/Java/com/phidgets/PhidgetException.java
index 1ace535..138fb31 100644
--- a/Java/com/phidgets/PhidgetException.java
+++ b/Java/com/phidgets/PhidgetException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
diff --git a/Java/com/phidgets/RFIDPhidget.java b/Java/com/phidgets/RFIDPhidget.java
index b102b67..20a0ee2 100644
--- a/Java/com/phidgets/RFIDPhidget.java
+++ b/Java/com/phidgets/RFIDPhidget.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
@@ -12,7 +12,10 @@ import com.phidgets.event.*;
  * to read tags and set outputs on the RFID reader are implemented in this class.
  * <p>
  * The Phidget RFID reader can read one tag at a time. Both tag and tagloss event handlers are provided,
- * as well as control over the antenna so that multiple readers can exists in close proximity without interference.
+ * as well as control over the antenna so that multiple readers can exist in close proximity without interference.
+ * See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  * 
  * @author Phidgets Inc.
  */
diff --git a/Java/com/phidgets/ServoPhidget.java b/Java/com/phidgets/ServoPhidget.java
index aa9f05f..f052b15 100644
--- a/Java/com/phidgets/ServoPhidget.java
+++ b/Java/com/phidgets/ServoPhidget.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
@@ -13,6 +13,9 @@ import com.phidgets.event.*;
  * <p>
  * The Phidget Sevo controller simply outputs varying widths of PWM, which is what 
  * most servo motors take as an input driving signal.
+ * See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  * 
  * @author Phidgets Inc.
  */
diff --git a/Java/com/phidgets/SpatialEventData.java b/Java/com/phidgets/SpatialEventData.java
index 0f7f9c9..483fc3c 100644
--- a/Java/com/phidgets/SpatialEventData.java
+++ b/Java/com/phidgets/SpatialEventData.java
@@ -1,6 +1,6 @@
 

 /*

- * Copyright 2006 Phidgets Inc.  All rights reserved.

+ * Copyright 2012 Phidgets Inc.  All rights reserved.

  */

 

 package com.phidgets;

diff --git a/Java/com/phidgets/SpatialPhidget.java b/Java/com/phidgets/SpatialPhidget.java
index bec1de7..599f361 100644
--- a/Java/com/phidgets/SpatialPhidget.java
+++ b/Java/com/phidgets/SpatialPhidget.java
@@ -1,6 +1,6 @@
 

 /*

- * Copyright 2006 Phidgets Inc.  All rights reserved.

+ * Copyright 2012 Phidgets Inc.  All rights reserved.

  */

 

 package com.phidgets;

@@ -11,6 +11,9 @@ import com.phidgets.event.*;
  * This class represents a Phidget Spatial. All methods for a PhidgetSpatial are implemented in this class.

  <p>

  The Phidget Spatial may provide up to 3 axes of acceleration data, 3 axes of angular rate data and 3 axes of magnetic field data.

+ * See your device's User Guide for more specific API details, 

+ * technical information, and revision details. The User Guide, along with other resources, can be found on 

+ * the product page for your device.

  

  * @author Phidgets Inc.

  */

diff --git a/Java/com/phidgets/StepperPhidget.java b/Java/com/phidgets/StepperPhidget.java
index 83fa772..aed6b1a 100644
--- a/Java/com/phidgets/StepperPhidget.java
+++ b/Java/com/phidgets/StepperPhidget.java
@@ -1,6 +1,6 @@
 

 /*

- * Copyright 2006 Phidgets Inc.  All rights reserved.

+ * Copyright 2012 Phidgets Inc.  All rights reserved.

  */

 

 package com.phidgets;

@@ -9,11 +9,14 @@ import java.util.LinkedList;
 import com.phidgets.event.*;

 /**

  * This class represents a Phidget Stepper Controller. All methods

- * to to control a stepper controller and read back stepper data are implemented in this class.

+ * to control a stepper controller and read back stepper data are implemented in this class.

  * <p>

  * The Phidget Stepper is able to control 1 or more Stepper motors. Motor Acceleration and Velocity are

- * controllable, and micro-stepping is used. The type and number of motors that can be controlled

+ * controllable, and micro-stepping is used for bipolar motors. The type and number of motors that can be controlled

  * depend on the Stepper Controller. Digital inputs are available on select Phidget Stepper Controllers.

+ * See your device's User Guide for more specific API details, 

+ * technical information, and revision details. The User Guide, along with other resources, can be found on 

+ * the product page for your device.

  * 

  * @author Phidgets Inc.

  */

diff --git a/Java/com/phidgets/TemperatureSensorPhidget.java b/Java/com/phidgets/TemperatureSensorPhidget.java
index baaa589..83ff326 100644
--- a/Java/com/phidgets/TemperatureSensorPhidget.java
+++ b/Java/com/phidgets/TemperatureSensorPhidget.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
@@ -16,6 +16,9 @@ import com.phidgets.event.*;
  * and calibrate the thermocouple sensed temperature.
  * <p>
  * Both the thermocouple and temperature IC temperatures can be read. Value are returned in degrees celcius.
+ * See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  * 
  * @author Phidgets Inc.
  */
diff --git a/Java/com/phidgets/TextLCDPhidget.java b/Java/com/phidgets/TextLCDPhidget.java
index ac4c500..92c3790 100644
--- a/Java/com/phidgets/TextLCDPhidget.java
+++ b/Java/com/phidgets/TextLCDPhidget.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2011 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
@@ -13,6 +13,9 @@ import com.phidgets.event.*;
  * <p>
  * The TextLCD Phidget consists of a Vacuum Fluorescent display that is capable of
  * displaying Standard as well as custom characters in multiple rows.
+ * See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  * 
  * @author Phidgets Inc.
  */
diff --git a/Java/com/phidgets/TextLEDPhidget.java b/Java/com/phidgets/TextLEDPhidget.java
index a2f39c8..45e2720 100644
--- a/Java/com/phidgets/TextLEDPhidget.java
+++ b/Java/com/phidgets/TextLEDPhidget.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
@@ -14,6 +14,9 @@ import com.phidgets.event.*;
  * The Text LED is a Phidget that displays text and numerals on LED
  * numeric display in rows. The number of rows and size of each row depends on
  * your configuration.
+ * See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  * 
  * @author Phidgets Inc.
  */
diff --git a/Java/com/phidgets/WeightSensorPhidget.java b/Java/com/phidgets/WeightSensorPhidget.java
index b2bd9e8..e1c5728 100644
--- a/Java/com/phidgets/WeightSensorPhidget.java
+++ b/Java/com/phidgets/WeightSensorPhidget.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2006 Phidgets Inc.  All rights reserved.
+ * Copyright 2012 Phidgets Inc.  All rights reserved.
  */
 
 package com.phidgets;
@@ -13,6 +13,9 @@ import com.phidgets.event.*;
  * <p>
  * The Phidget Weight Sensor is simply an electronic scale with a USB interface.
  * It provides one weight value, in kg.
+ * See your device's User Guide for more specific API details, 
+ * technical information, and revision details. The User Guide, along with other resources, can be found on 
+ * the product page for your device.
  *
  * @author Phidget Inc.
  */
diff --git a/Java/phidget_jni.c b/Java/phidget_jni.c
index 1ec7ca6..1a91e74 100644
--- a/Java/phidget_jni.c
+++ b/Java/phidget_jni.c
@@ -27,6 +27,13 @@ jmethodID serverConnectEvent_cons;
 jclass serverDisconnectEvent_class;
 jmethodID serverDisconnectEvent_cons;
 
+#ifdef _WINDOWS
+
+extern int useThreadSecurity;
+extern void destroyThreadSecurityAttributes();
+
+#endif
+
 jint JNICALL
 JNI_OnLoad(JavaVM *vm, void *reserved)
 {
@@ -36,6 +43,12 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
 
 	ph_vm = vm;
 
+	// Don't set thread security when we're using Java -  this break events.
+	#ifdef _WINDOWS
+		useThreadSecurity = PFALSE;
+		destroyThreadSecurityAttributes();
+	#endif
+
 	result = (*vm)->GetEnv(vm, (void **)&env, JNI_VERSION_1_4);
 	
 	if(result == JNI_EDETACHED)