Merge pull request #15 from NeuronRobotics/development

Release of 3.10.0

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/AbstractRobotDrive.java

@@ -1,6 +1,7 @@
 package com.neuronrobotics.addons.driving;
 
 import java.util.ArrayList;
+
 import com.neuronrobotics.sdk.pid.IPIDEventListener;
 import com.neuronrobotics.sdk.pid.PIDLimitEvent;
 

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/AckermanBot.java

@@ -4,7 +4,6 @@
 import com.neuronrobotics.sdk.common.Log;
 import com.neuronrobotics.sdk.dyio.peripherals.DigitalOutputChannel;
 import com.neuronrobotics.sdk.pid.PIDChannel;
-import com.neuronrobotics.sdk.pid.PIDCommandException;
 import com.neuronrobotics.sdk.pid.PIDEvent;
 import com.neuronrobotics.sdk.util.ThreadUtil;
 

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/HokuyoURGDevice.java

@@ -1,5 +1,7 @@
 package com.neuronrobotics.addons.driving;
 
+import gnu.io.NRSerialPort;
+
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -8,8 +10,6 @@
 import com.neuronrobotics.sdk.common.ByteList;
 import com.neuronrobotics.sdk.util.ThreadUtil;
 
-import gnu.io.NRSerialPort;
-
 public class HokuyoURGDevice {
 	private NRSerialPort serial;
 	private DataInputStream ins;

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/SimpleDisplay.java

@@ -1,7 +1,6 @@
 package com.neuronrobotics.addons.driving;
 
 import java.awt.Color;
-import java.awt.color.CMMException;
 import java.util.ArrayList;
 
 import javax.swing.JFrame;

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/virtual/VirtualLineSensor.java

@@ -4,7 +4,6 @@
 
 import com.neuronrobotics.addons.driving.AbstractRobotDrive;
 import com.neuronrobotics.addons.driving.AbstractSensor;
-
 import com.neuronrobotics.sdk.util.ThreadUtil;
 
 public class VirtualLineSensor extends AbstractSensor {

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/virtual/VirtualPuckBot.java

@@ -2,7 +2,6 @@
 
 import com.neuronrobotics.addons.driving.IPuckBotKinematics;
 import com.neuronrobotics.addons.driving.PuckBot;
-import com.neuronrobotics.sdk.common.BowlerAbstractConnection;
 import com.neuronrobotics.sdk.pid.IPIDEventListener;
 import com.neuronrobotics.sdk.pid.PIDEvent;
 import com.neuronrobotics.sdk.pid.PIDLimitEvent;

javasdk/NRSDK/addons/com/neuronrobotics/addons/driving/virtual/VirtualWorld.java

@@ -6,10 +6,7 @@
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 
-import javax.swing.ImageIcon;
 import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
 
 import com.neuronrobotics.addons.driving.AbstractRobotDrive;
 import com.neuronrobotics.addons.driving.NrMap;

javasdk/NRSDK/addons/com/neuronrobotics/application/xmpp/GoogleChat/GoogleChatEngine.java

@@ -15,11 +15,8 @@
 import org.jivesoftware.smack.ChatManagerListener;
 import org.jivesoftware.smack.ConnectionConfiguration;
 import org.jivesoftware.smack.MessageListener;
-
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
-
-
 import org.jivesoftware.smack.packet.Presence;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/Axis.java

@@ -43,8 +43,6 @@
  */
 
 
-import java.awt.Color;
-
 import javax.media.j3d.Geometry;
 import javax.media.j3d.GeometryArray;
 import javax.media.j3d.IndexedLineArray;

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/DHKinematicsViewer.java

@@ -3,50 +3,22 @@
 
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.GraphicsConfiguration;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.Transform3D;
-import javax.media.j3d.TransformGroup;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
-import javax.vecmath.Point3d;
+
+import net.miginfocom.swing.MigLayout;
 
 import com.neuronrobotics.sdk.addons.kinematics.AbstractKinematicsNR;
+import com.neuronrobotics.sdk.addons.kinematics.DHParameterKinematics;
 import com.neuronrobotics.sdk.addons.kinematics.IJointSpaceUpdateListenerNR;
 import com.neuronrobotics.sdk.addons.kinematics.JointLimit;
-import com.neuronrobotics.sdk.addons.kinematics.DHParameterKinematics;
 import com.neuronrobotics.sdk.addons.kinematics.math.TransformNR;
-import com.neuronrobotics.sdk.common.BowlerAbstractConnection;
 import com.neuronrobotics.sdk.common.Log;
-import com.neuronrobotics.sdk.dyio.DyIO;
-import com.neuronrobotics.sdk.ui.ConnectionDialog;
 import com.neuronrobotics.sdk.util.ThreadUtil;
-import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
-import com.sun.j3d.utils.behaviors.mouse.MouseRotate;
-import com.sun.j3d.utils.behaviors.mouse.MouseTranslate;
-import com.sun.j3d.utils.behaviors.mouse.MouseZoom;
-import com.sun.j3d.utils.geometry.ColorCube;
-import com.sun.j3d.utils.pickfast.behaviors.PickRotateBehavior;
-import com.sun.j3d.utils.universe.SimpleUniverse;
-
-import com.sun.j3d.utils.applet.MainFrame; 
-import com.sun.j3d.utils.universe.*;
-import com.sun.j3d.utils.behaviors.mouse.*;
-import com.sun.j3d.utils.behaviors.vp.OrbitBehavior;
-import com.sun.j3d.utils.behaviors.vp.ViewPlatformBehavior;
-
-import javax.media.j3d.*;
-import javax.vecmath.*;
-
-import net.miginfocom.swing.MigLayout;
-
-import java.awt.event.*;
-import java.util.ArrayList;
-import java.util.Enumeration;
 
 
 public class DHKinematicsViewer  extends JPanel implements IJointSpaceUpdateListenerNR{

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/DHViewer.java

@@ -1,30 +1,12 @@
 package com.neuronrobotics.sdk.addons.kinematics.gui;
 
 import java.awt.Color;
-import java.awt.GraphicsConfiguration;
 import java.util.ArrayList;
 
-import javax.media.j3d.AmbientLight;
-import javax.media.j3d.BoundingBox;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.BranchGroup;
-import javax.media.j3d.Canvas3D;
-import javax.media.j3d.DirectionalLight;
-import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
-import javax.swing.JPanel;
-import javax.vecmath.Color3f;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3d;
-import javax.vecmath.Vector3f;
 
 import com.neuronrobotics.sdk.addons.kinematics.DHChain;
 import com.neuronrobotics.sdk.addons.kinematics.math.TransformNR;
-import com.sun.j3d.utils.behaviors.mouse.MouseBehavior;
-import com.sun.j3d.utils.behaviors.mouse.MouseRotate;
-import com.sun.j3d.utils.behaviors.mouse.MouseTranslate;
-import com.sun.j3d.utils.behaviors.mouse.MouseWheelZoom;
-import com.sun.j3d.utils.universe.SimpleUniverse;
 
 
 public class DHViewer extends SimpleTransformViewer{

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/Java3dNativeLoader.java

@@ -2,13 +2,8 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.FilePermission;
 import java.io.IOException;
 import java.io.InputStream;
-import java.security.AccessController;
-import java.util.ArrayList;
-
-import com.neuronrobotics.sdk.common.Log;
 
 public class Java3dNativeLoader {
 	private static boolean loaded = false;

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/KinematicsDeveopmentMain.java

@@ -12,9 +12,8 @@
 import net.miginfocom.swing.MigLayout;
 
 import com.neuronrobotics.sdk.addons.kinematics.AbstractKinematicsNR;
-import com.neuronrobotics.sdk.addons.kinematics.ITaskSpaceUpdateListenerNR;
 import com.neuronrobotics.sdk.addons.kinematics.DHParameterKinematics;
-import com.neuronrobotics.sdk.addons.kinematics.gui.SampleGuiNR;
+import com.neuronrobotics.sdk.addons.kinematics.ITaskSpaceUpdateListenerNR;
 import com.neuronrobotics.sdk.addons.kinematics.math.TransformNR;
 import com.neuronrobotics.sdk.common.BowlerAbstractConnection;
 import com.neuronrobotics.sdk.dyio.DyIO;

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/MatrixDisplayNR.java

@@ -11,10 +11,10 @@
 import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableModel;
 
-import com.neuronrobotics.sdk.addons.kinematics.math.TransformNR;
-
-import Jama.Matrix;
 import net.miginfocom.swing.MigLayout;
+import Jama.Matrix;
+
+import com.neuronrobotics.sdk.addons.kinematics.math.TransformNR;
 
 public class MatrixDisplayNR extends JPanel {
 	/**

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/PosePanelNR.java

@@ -2,6 +2,7 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -11,14 +12,14 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
+import net.miginfocom.swing.MigLayout;
+
 import com.neuronrobotics.sdk.addons.kinematics.AbstractKinematicsNR;
 import com.neuronrobotics.sdk.addons.kinematics.IRegistrationListenerNR;
 import com.neuronrobotics.sdk.addons.kinematics.ITaskSpaceUpdateListenerNR;
 import com.neuronrobotics.sdk.addons.kinematics.math.TransformNR;
 import com.neuronrobotics.sdk.common.Log;
 
-import net.miginfocom.swing.MigLayout;
-
 public class PosePanelNR extends JPanel implements ITaskSpaceUpdateListenerNR, IRegistrationListenerNR {
 	/**
 	 * 

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/SampleGuiAxisWidgetNR.java

@@ -3,18 +3,19 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.text.DecimalFormat;
+
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
+import net.miginfocom.swing.MigLayout;
+
 import com.neuronrobotics.sdk.addons.kinematics.AbstractKinematicsNR;
 import com.neuronrobotics.sdk.addons.kinematics.IJointSpaceUpdateListenerNR;
 import com.neuronrobotics.sdk.addons.kinematics.JointLimit;
 
-import net.miginfocom.swing.MigLayout;
-
 public class SampleGuiAxisWidgetNR extends JPanel implements IJointSpaceUpdateListenerNR{
 
 	/**

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/SampleGuiNR.java

@@ -11,13 +11,11 @@
 import javax.swing.event.TableModelListener;
 
 import net.miginfocom.swing.MigLayout;
-
 import Jama.Matrix;
 
 import com.neuronrobotics.sdk.addons.kinematics.AbstractKinematicsNR;
 import com.neuronrobotics.sdk.addons.kinematics.IRegistrationListenerNR;
 import com.neuronrobotics.sdk.addons.kinematics.math.TransformNR;
-import com.neuronrobotics.sdk.common.BowlerAbstractConnection;
 //import com.neuronrobotics.sdk.pid.IPIDControl;
 //import com.neuronrobotics.sdk.ui.ConnectionImageIconFactory;
 

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/SimpleTransformViewer.java

@@ -4,7 +4,6 @@
 import java.util.ArrayList;
 
 import javax.media.j3d.AmbientLight;
-import javax.media.j3d.BoundingBox;
 import javax.media.j3d.BoundingSphere;
 import javax.media.j3d.BranchGroup;
 import javax.media.j3d.Canvas3D;

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/TransformFactory.java

@@ -3,13 +3,7 @@
 import java.awt.Color;
 import java.awt.Font;
 
-import javax.media.j3d.AmbientLight;
 import javax.media.j3d.Appearance;
-import javax.media.j3d.BoundingBox;
-import javax.media.j3d.BoundingSphere;
-import javax.media.j3d.Bounds;
-import javax.media.j3d.ColoringAttributes;
-import javax.media.j3d.DirectionalLight;
 import javax.media.j3d.Font3D;
 import javax.media.j3d.FontExtrusion;
 import javax.media.j3d.Material;
@@ -18,14 +12,9 @@
 import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
 import javax.vecmath.Color3f;
-import javax.vecmath.Point3d;
-import javax.vecmath.Vector3f;
-
-import Jama.Matrix;
 
 import com.neuronrobotics.sdk.addons.kinematics.math.RotationNR;
 import com.neuronrobotics.sdk.addons.kinematics.math.TransformNR;
-import com.sun.j3d.utils.geometry.ColorCube;
 
 
 public class TransformFactory {

javasdk/NRSDK/addons/com/neuronrobotics/sdk/addons/kinematics/gui/TrobotGuiMain.java

@@ -12,7 +12,6 @@
 import net.miginfocom.swing.MigLayout;
 
 import com.neuronrobotics.sdk.addons.kinematics.DHParameterKinematics;
-import com.neuronrobotics.sdk.addons.kinematics.gui.SampleGuiNR;
 import com.neuronrobotics.sdk.common.BowlerAbstractConnection;
 import com.neuronrobotics.sdk.dyio.DyIO;
 import com.neuronrobotics.sdk.ui.ConnectionDialog;

javasdk/NRSDK/addons/com/neuronrobotics/sdk/dyio/sequencer/CoreScheduler.java

@@ -15,8 +15,6 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-import com.neuronrobotics.sdk.addons.walker.WalkerServoLink;
-import com.neuronrobotics.sdk.common.Log;
 import com.neuronrobotics.sdk.dyio.DyIO;
 import com.neuronrobotics.sdk.dyio.peripherals.ServoChannel;
 import com.neuronrobotics.sdk.util.ThreadUtil;

javasdk/NRSDK/addons/com/neuronrobotics/sdk/dyio/sequencer/SequencerMP3.java

@@ -21,9 +21,9 @@
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 
-import com.neuronrobotics.sdk.util.ThreadUtil;
-
 import javazoom.jl.player.MyPlayer;
+
+import com.neuronrobotics.sdk.util.ThreadUtil;
 public class SequencerMP3 {
     private MyPlayer player; 
     private String fn="";

javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/ConnectionDialog.java

@@ -6,17 +6,15 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 import javax.swing.LookAndFeel;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
 
 import net.miginfocom.swing.MigLayout;
+
 import com.neuronrobotics.sdk.common.BowlerAbstractConnection;
 import com.neuronrobotics.sdk.common.BowlerAbstractDevice;
 import com.neuronrobotics.sdk.common.ConfigManager;

javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/TCPConnectionPanel.java

@@ -14,21 +14,15 @@
  ******************************************************************************/
 package com.neuronrobotics.sdk.ui;
 
-import java.io.IOException;
-import java.net.Socket;
-import java.net.UnknownHostException;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JTextField;
 
-
-
 import net.miginfocom.swing.MigLayout;
 
 import com.neuronrobotics.sdk.common.BowlerAbstractConnection;
 import com.neuronrobotics.sdk.common.Log;
-
 import com.neuronrobotics.sdk.network.BowlerTCPClient;
 
 

javasdk/NRSDK/addons/com/neuronrobotics/sdk/ui/UDPConnectionPanel.java

@@ -25,8 +25,6 @@
 import javax.swing.JOptionPane;
 import javax.swing.JTextField;
 
-
-
 import net.miginfocom.swing.MigLayout;
 
 import com.neuronrobotics.sdk.common.BowlerAbstractConnection;