From 2d8c8fd9cce286b29b9999b7f531ecbcb10137f6 Mon Sep 17 00:00:00 2001
From: schlaepfer <schlaepfer@94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c>
Date: Tue, 12 Dec 2006 12:49:32 +0000
Subject: [PATCH] - AbstractDeviceInfo moved to ch.ntb.usb.testApp (no more
 references to test directory) - initialization parameters for TestDevice
 added

git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@229 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
---
 .../ntb/usb/testApp}/AbstractDeviceInfo.java  |  2 +-
 java/src/ch/ntb/usb/testApp/TestDevice.java   | 20 +++++++++++++++++--
 java/src/ch/ntb/usb/usbView/UsbView.java      |  2 +-
 java/test/ch/ntb/usb/test/AT90USB1287.java    |  1 +
 java/test/ch/ntb/usb/test/CY7C68013A.java     |  1 +
 java/test/ch/ntb/usb/test/DeviceTest.java     |  3 ++-
 6 files changed, 24 insertions(+), 5 deletions(-)
 rename java/{test/ch/ntb/usb/test => src/ch/ntb/usb/testApp}/AbstractDeviceInfo.java (93%)

diff --git a/java/test/ch/ntb/usb/test/AbstractDeviceInfo.java b/java/src/ch/ntb/usb/testApp/AbstractDeviceInfo.java
similarity index 93%
rename from java/test/ch/ntb/usb/test/AbstractDeviceInfo.java
rename to java/src/ch/ntb/usb/testApp/AbstractDeviceInfo.java
index ca1d5e1..145c2d4 100644
--- a/java/test/ch/ntb/usb/test/AbstractDeviceInfo.java
+++ b/java/src/ch/ntb/usb/testApp/AbstractDeviceInfo.java
@@ -4,7 +4,7 @@
  *
  * This library is covered by the LGPL, read LGPL.txt for details.
  */
-package ch.ntb.usb.test;
+package ch.ntb.usb.testApp;
 
 public abstract class AbstractDeviceInfo {
 
diff --git a/java/src/ch/ntb/usb/testApp/TestDevice.java b/java/src/ch/ntb/usb/testApp/TestDevice.java
index c50db95..c9156ed 100644
--- a/java/src/ch/ntb/usb/testApp/TestDevice.java
+++ b/java/src/ch/ntb/usb/testApp/TestDevice.java
@@ -14,9 +14,8 @@ import ch.ntb.usb.Device;
 import ch.ntb.usb.USB;
 import ch.ntb.usb.USBException;
 import ch.ntb.usb.logger.LogUtil;
-import ch.ntb.usb.test.AT90USB1287;
 
-public class TestDevice extends AT90USB1287 {
+public class TestDevice extends AbstractDeviceInfo {
 
 	private static final Logger logger = LogUtil.getLogger("ch.ntb.usb.test");
 
@@ -41,6 +40,23 @@ public class TestDevice extends AT90USB1287 {
 		outMode = TransferMode.Bulk;
 	}
 
+	@Override
+	public void initValues() {
+		setIdVendor((short) 0x8235);
+		setIdProduct((short) 0x0222);
+		setTimeout(2000);
+		setConfiguration(1);
+		setInterface(0);
+		setAltinterface(-1);
+		setOutEPBulk(0x01);
+		setInEPBulk(0x82);
+		setOutEPInt(0x03);
+		setInEPInt(0x84);
+		setSleepTimeout(2000);
+		setMaxDataSize(USB.FULLSPEED_MAX_BULK_PACKET_SIZE);
+		setMode(TransferMode.Bulk);
+	}
+
 	public void openUsbDevice() {
 		dev = USB.getDevice(getIdVendor(), getIdProduct());
 		try {
diff --git a/java/src/ch/ntb/usb/usbView/UsbView.java b/java/src/ch/ntb/usb/usbView/UsbView.java
index 21e86ec..99d5f8f 100644
--- a/java/src/ch/ntb/usb/usbView/UsbView.java
+++ b/java/src/ch/ntb/usb/usbView/UsbView.java
@@ -34,9 +34,9 @@ import ch.ntb.usb.Usb_Device;
 import ch.ntb.usb.Usb_Device_Descriptor;
 import ch.ntb.usb.Usb_Endpoint_Descriptor;
 import ch.ntb.usb.Usb_Interface_Descriptor;
-import ch.ntb.usb.test.AbstractDeviceInfo.TransferMode;
 import ch.ntb.usb.testApp.TestApp;
 import ch.ntb.usb.testApp.TestDevice;
+import ch.ntb.usb.testApp.AbstractDeviceInfo.TransferMode;
 
 public class UsbView extends JFrame {
 
diff --git a/java/test/ch/ntb/usb/test/AT90USB1287.java b/java/test/ch/ntb/usb/test/AT90USB1287.java
index ef05f42..dc799bd 100644
--- a/java/test/ch/ntb/usb/test/AT90USB1287.java
+++ b/java/test/ch/ntb/usb/test/AT90USB1287.java
@@ -7,6 +7,7 @@
 package ch.ntb.usb.test;
 
 import ch.ntb.usb.USB;
+import ch.ntb.usb.testApp.AbstractDeviceInfo;
 
 public class AT90USB1287 extends AbstractDeviceInfo {
 
diff --git a/java/test/ch/ntb/usb/test/CY7C68013A.java b/java/test/ch/ntb/usb/test/CY7C68013A.java
index 07291ad..f9a6ba1 100644
--- a/java/test/ch/ntb/usb/test/CY7C68013A.java
+++ b/java/test/ch/ntb/usb/test/CY7C68013A.java
@@ -7,6 +7,7 @@
 package ch.ntb.usb.test;
 
 import ch.ntb.usb.USB;
+import ch.ntb.usb.testApp.AbstractDeviceInfo;
 
 public class CY7C68013A extends AbstractDeviceInfo {
 
diff --git a/java/test/ch/ntb/usb/test/DeviceTest.java b/java/test/ch/ntb/usb/test/DeviceTest.java
index 811b1db..406c142 100644
--- a/java/test/ch/ntb/usb/test/DeviceTest.java
+++ b/java/test/ch/ntb/usb/test/DeviceTest.java
@@ -26,7 +26,8 @@ import ch.ntb.usb.USB;
 import ch.ntb.usb.USBException;
 import ch.ntb.usb.Usb_Config_Descriptor;
 import ch.ntb.usb.Usb_Device_Descriptor;
-import ch.ntb.usb.test.AbstractDeviceInfo.TransferMode;
+import ch.ntb.usb.testApp.AbstractDeviceInfo;
+import ch.ntb.usb.testApp.AbstractDeviceInfo.TransferMode;
 
 public class DeviceTest {