From 11f8d930941848561871da5c1af67ca9752f0f97 Mon Sep 17 00:00:00 2001
From: spandi <spandi@94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c>
Date: Mon, 19 Feb 2007 19:22:46 +0000
Subject: [PATCH] - print extra descriptors as hex array

git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@244 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
---
 java/src/ch/ntb/usb/usbView/UsbTreeModel.java | 19 ++++++++++++++++---
 java/src/ch/ntb/usb/usbView/UsbView.java      |  4 +---
 java/version.properties                       |  2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/java/src/ch/ntb/usb/usbView/UsbTreeModel.java b/java/src/ch/ntb/usb/usbView/UsbTreeModel.java
index 21045ca..bca4e8f 100644
--- a/java/src/ch/ntb/usb/usbView/UsbTreeModel.java
+++ b/java/src/ch/ntb/usb/usbView/UsbTreeModel.java
@@ -309,7 +309,7 @@ public class UsbTreeModel implements TreeModel, TreeSelectionListener {
 					+ confDesc.getMaxPower() + ")\n");
 			sb.append("\textralen: 0x"
 					+ Integer.toHexString(confDesc.getExtralen()) + "\n");
-			sb.append("\textra: " + confDesc.getExtra() + "\n");
+			sb.append("\textra: " + extraDescriptorToString(confDesc.getExtra()) + "\n");
 			// get device handle to retrieve string descriptors
 			Usb_Bus bus = rootBus;
 			while (bus != null) {
@@ -382,7 +382,7 @@ public class UsbTreeModel implements TreeModel, TreeSelectionListener {
 					+ Integer.toHexString(intDesc.getIInterface()) + "\n");
 			sb.append("\textralen: 0x"
 					+ Integer.toHexString(intDesc.getExtralen()) + "\n");
-			sb.append("\textra: " + intDesc.getExtra() + "\n");
+			sb.append("\textra: " + extraDescriptorToString(intDesc.getExtra()) + "\n");
 			// get device handle to retrieve string descriptors
 			Usb_Bus bus = rootBus;
 			while (bus != null) {
@@ -446,8 +446,21 @@ public class UsbTreeModel implements TreeModel, TreeSelectionListener {
 					+ Integer.toHexString(epDesc.getBSynchAddress()) + "\n");
 			sb.append("\textralen: 0x"
 					+ Integer.toHexString(epDesc.getExtralen()) + "\n");
-			sb.append("\textra: " + epDesc.getExtra() + "\n");
+			sb.append("\textra: " + extraDescriptorToString(epDesc.getExtra()) + "\n");
 			textArea.setText(sb.toString());
 		}
 	}
+
+	private String extraDescriptorToString(byte[] extra) {
+		if (extra != null) {
+			StringBuffer sb = new StringBuffer();
+			for (int i = 0; i < extra.length; i++) {
+				sb.append("0x");
+				sb.append(Integer.toHexString(extra[i] & 0xff));
+				sb.append(' ');
+			}
+			return sb.toString();
+		}
+		return null;
+	}
 }
diff --git a/java/src/ch/ntb/usb/usbView/UsbView.java b/java/src/ch/ntb/usb/usbView/UsbView.java
index 274b25d..56e2990 100644
--- a/java/src/ch/ntb/usb/usbView/UsbView.java
+++ b/java/src/ch/ntb/usb/usbView/UsbView.java
@@ -402,10 +402,8 @@ public class UsbView extends JFrame {
 	}
 
 	void expandAll(JTree tree) {
-		int row = 0;
-		while (row < tree.getRowCount()) {
+		for (int row = 0; row < tree.getRowCount(); row++) {
 			tree.expandRow(row);
-			row++;
 		}
 	}
 }
diff --git a/java/version.properties b/java/version.properties
index b2b156a..f1e1f3b 100644
--- a/java/version.properties
+++ b/java/version.properties
@@ -1,4 +1,4 @@
 #Thu Aug 24 14:28:28 CEST 2006
 version.major=0
 version.minor=5
-version.release=2
+version.release=3