Index: trunk/src/com/drew/lang/CompoundException.java
===================================================================
--- trunk/src/com/drew/lang/CompoundException.java	(revision 4231)
+++ trunk/src/com/drew/lang/CompoundException.java	(revision 6127)
@@ -1,17 +1,26 @@
 /*
- * This is public domain software - that is, you can do whatever you want
- * with it, and include it software that is licensed under the GNU or the
- * BSD license, or whatever other licence you choose, including proprietary
- * closed source licenses.  I do ask that you leave this header in tact.
+ * Copyright 2002-2012 Drew Noakes
  *
- * If you make modifications to this code that you think would benefit the
- * wider community, please send me a copy and I'll post it on my site.
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
  *
- * If you make use of this code, I'd appreciate hearing about it.
- *   drew@drewnoakes.com
- * Latest version of this software kept at
- *   http://drewnoakes.com/
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ * More information about this project is available at:
+ *
+ *    http://drewnoakes.com/code/exif/
+ *    http://code.google.com/p/metadata-extractor/
  */
 package com.drew.lang;
+
+import com.drew.lang.annotations.NotNull;
+import com.drew.lang.annotations.Nullable;
 
 import java.io.PrintStream;
@@ -22,58 +31,65 @@
  * unavailable in previous versions.  This class allows support
  * of these previous JDK versions.
+ *
+ * @author Drew Noakes http://drewnoakes.com
  */
 public class CompoundException extends Exception
 {
-    private final Throwable _innnerException;
+    private static final long serialVersionUID = -9207883813472069925L;
 
-    public CompoundException(String msg)
+    @Nullable
+    private final Throwable _innerException;
+
+    public CompoundException(@Nullable String msg)
     {
         this(msg, null);
     }
 
-    public CompoundException(Throwable exception)
+    public CompoundException(@Nullable Throwable exception)
     {
         this(null, exception);
     }
 
-    public CompoundException(String msg, Throwable innerException)
+    public CompoundException(@Nullable String msg, @Nullable Throwable innerException)
     {
         super(msg);
-        _innnerException = innerException;
+        _innerException = innerException;
     }
 
+    @Nullable
     public Throwable getInnerException()
     {
-        return _innnerException;
+        return _innerException;
     }
 
+    @NotNull
     public String toString()
     {
-        StringBuffer sbuffer = new StringBuffer();
-        sbuffer.append(super.toString());
-        if (_innnerException != null) {
-            sbuffer.append("\n");
-            sbuffer.append("--- inner exception ---");
-            sbuffer.append("\n");
-            sbuffer.append(_innnerException.toString());
+        StringBuilder string = new StringBuilder();
+        string.append(super.toString());
+        if (_innerException != null) {
+            string.append("\n");
+            string.append("--- inner exception ---");
+            string.append("\n");
+            string.append(_innerException.toString());
         }
-        return sbuffer.toString();
+        return string.toString();
     }
 
-    public void printStackTrace(PrintStream s)
+    public void printStackTrace(@NotNull PrintStream s)
     {
         super.printStackTrace(s);
-        if (_innnerException != null) {
+        if (_innerException != null) {
             s.println("--- inner exception ---");
-            _innnerException.printStackTrace(s);
+            _innerException.printStackTrace(s);
         }
     }
 
-    public void printStackTrace(PrintWriter s)
+    public void printStackTrace(@NotNull PrintWriter s)
     {
         super.printStackTrace(s);
-        if (_innnerException != null) {
+        if (_innerException != null) {
             s.println("--- inner exception ---");
-            _innnerException.printStackTrace(s);
+            _innerException.printStackTrace(s);
         }
     }
@@ -82,7 +98,7 @@
     {
         super.printStackTrace();
-        if (_innnerException != null) {
+        if (_innerException != null) {
             System.err.println("--- inner exception ---");
-            _innnerException.printStackTrace();
+            _innerException.printStackTrace();
         }
     }