Fixes rjohnsondev#14

Author: rjohnsondev

src/main/java/com/pff/PSTObject.java

@@ -670,8 +670,7 @@ static PSTMessage createAppropriatePSTMessageObject(PSTFile theFile, DescriptorI
 
 		PSTTableBCItem item = table.getItems().get(0x001a);
 		String messageClass = "";
-		if ( item != null )
-		{
+		if ( item != null ) {
 			messageClass = item.getStringValue();
 		}
 

src/main/java/com/pff/PSTTableItem.java

@@ -78,10 +78,10 @@ public String getStringValue(int stringType) {
 		if (stringType == VALUE_TYPE_PT_UNICODE) {
 			// we are a nice little-endian unicode string.
 			try {
-				if (isExternalValueReference ) {
+				if (isExternalValueReference) {
 					return "External string reference!";
 				}
-				return new String(data, "UTF-16LE");
+				return new String(data, "UTF-16LE").trim();
 			} catch (UnsupportedEncodingException e) {
 
 				System.err.println("Error decoding string: " + data.toString());
@@ -91,7 +91,7 @@ public String getStringValue(int stringType) {
 
 		if (stringType == VALUE_TYPE_PT_STRING8 ) {
 			//System.out.println("Warning! decoding string8 without charset: "+this.entryType + " - "+ Integer.toHexString(this.entryType));
-			return new String(data, Charset.forName("UTF-8"));
+			return new String(data, Charset.forName("UTF-8")).trim();
 		}
 
 		StringBuffer outputBuffer = new StringBuffer();

src/main/java/example/Test.java

@@ -43,7 +43,7 @@ public void processFolder(PSTFolder folder)
 			PSTMessage email = (PSTMessage)folder.getNextChild();
 			while (email != null) {
 				printDepth();
-				System.out.println("Email: "+email.getSubject());
+				System.out.println("Email: "+ email.getDescriptorNodeId() + " - " + email.getSubject());
 				email = (PSTMessage)folder.getNextChild();
 			}
 			depth--;