rik/jlibusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- LibusbWin renamed to LibusbJava

Browse Source 
git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@208 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
schlaepfer
2006-11-24 13:05:08 +00:00
parent 48d62f7232
commit 17dcf1b09d
8 changed files with 70 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
java/src/ch/ntb/usb/usbView/UsbTreeModel.java
View File

@@ -17,7 +17,7 @@ import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreeModel;
import javax.swing.tree.TreePath;
import ch.ntb.usb.LibusbWin;
import ch.ntb.usb.LibusbJava;
import ch.ntb.usb.Usb_Bus;
import ch.ntb.usb.Usb_Config_Descriptor;
import ch.ntb.usb.Usb_Device;
@@ -226,14 +226,14 @@ public class UsbTreeModel implements TreeModel, TreeSelectionListener {
&& ((dev.descriptor.iManufacturer > 0)
|| (dev.descriptor.iProduct > 0) || (dev.descriptor.iSerialNumber > 0))) {
if (tmpDevDesc.equals(devDesc)) {
int handle = LibusbWin.usb_open(dev);
int handle = LibusbJava.usb_open(dev);
sb.append("\nString descriptors\n");
if (handle <= 0) {
sb.append("\terror opening the device\n");
break;
}
if (dev.descriptor.iManufacturer > 0) {
String manufacturer = LibusbWin
String manufacturer = LibusbJava
.usb_get_string_simple(handle,
devDesc.iManufacturer);
if (manufacturer == null)
@@ -242,7 +242,7 @@ public class UsbTreeModel implements TreeModel, TreeSelectionListener {
+ "\n");
}
if (dev.descriptor.iProduct > 0) {
String product = LibusbWin
String product = LibusbJava
.usb_get_string_simple(handle,
devDesc.iProduct);
if (product == null)
@@ -250,7 +250,7 @@ public class UsbTreeModel implements TreeModel, TreeSelectionListener {
sb.append("\tiProduct: " + product + "\n");
}
if (dev.descriptor.iSerialNumber > 0) {
String serialNumber = LibusbWin
String serialNumber = LibusbJava
.usb_get_string_simple(handle,
devDesc.iSerialNumber);
if (serialNumber == null)
@@ -258,7 +258,7 @@ public class UsbTreeModel implements TreeModel, TreeSelectionListener {
sb.append("\tiSerialNumber: " + serialNumber
+ "\n");
}
LibusbWin.usb_close(handle);
LibusbJava.usb_close(handle);
}
}
dev = dev.next;
@@ -296,13 +296,13 @@ public class UsbTreeModel implements TreeModel, TreeSelectionListener {
for (int i = 0; i < tmpConfDesc.length; i++) {
if ((tmpConfDesc.equals(confDesc))
&& (confDesc.iConfiguration > 0)) {
int handle = LibusbWin.usb_open(dev);
int handle = LibusbJava.usb_open(dev);
sb.append("\nString descriptors\n");
if (handle <= 0) {
sb.append("\terror opening the device\n");
break;
}
String configuration = LibusbWin
String configuration = LibusbJava
.usb_get_string_simple(handle,
confDesc.iConfiguration);
if (configuration == null)
@@ -310,7 +310,7 @@ public class UsbTreeModel implements TreeModel, TreeSelectionListener {
sb.append("\tiConfiguration: " + configuration
+ "\n");
LibusbWin.usb_close(handle);
LibusbJava.usb_close(handle);
}
}
@@ -366,21 +366,21 @@ public class UsbTreeModel implements TreeModel, TreeSelectionListener {
for (int k = 0; k < ints.length; k++) {
if (tmpIntDescs[i].equals(intDesc)
&& (intDesc.iInterface > 0)) {
int handle = LibusbWin.usb_open(dev);
int handle = LibusbJava.usb_open(dev);
sb.append("\nString descriptors\n");
if (handle <= 0) {
sb
.append("\terror opening the device\n");
break;
}
String interface_ = LibusbWin
String interface_ = LibusbJava
.usb_get_string_simple(handle,
intDesc.iInterface);
if (interface_ == null)
interface_ = "unable to fetch interface string";
sb.append("\tiInterface: " + interface_
+ "\n");
LibusbWin.usb_close(handle);
LibusbJava.usb_close(handle);
}
}
}

18
java/src/ch/ntb/usb/usbView/UsbView.java
View File

@@ -21,7 +21,7 @@ import javax.swing.JTextArea;
import javax.swing.JTree;
import javax.swing.KeyStroke;
import ch.ntb.usb.LibusbWin;
import ch.ntb.usb.LibusbJava;
import ch.ntb.usb.Usb_Bus;
public class UsbView extends JFrame {
@@ -144,11 +144,11 @@ public class UsbView extends JFrame {
.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
// open bus
LibusbWin.usb_init();
LibusbWin.usb_find_busses();
LibusbWin.usb_find_devices();
LibusbJava.usb_init();
LibusbJava.usb_find_busses();
LibusbJava.usb_find_devices();
Usb_Bus bus = LibusbWin.usb_get_busses();
Usb_Bus bus = LibusbJava.usb_get_busses();
if (bus != null) {
treeModel.fireTreeStructureChanged(bus);
}
@@ -166,11 +166,11 @@ public class UsbView extends JFrame {
private JTree getUsbTree() {
if (usbTree == null) {
// open bus
LibusbWin.usb_init();
LibusbWin.usb_find_busses();
LibusbWin.usb_find_devices();
LibusbJava.usb_init();
LibusbJava.usb_find_busses();
LibusbJava.usb_find_devices();
Usb_Bus bus = LibusbWin.usb_get_busses();
Usb_Bus bus = LibusbJava.usb_get_busses();
treeModel = new UsbTreeModel(bus, jPropertiesArea);
usbTree = new JTree(treeModel);