PIVOT-1027:  Add the @UnsupportedOperation annotation to all the methods in
various packages that throw this exception.
Clean up some error messages from this exception and some related Javadoc.


git-svn-id: https://svn.apache.org/repos/asf/pivot/trunk@1840587 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/charts/src/org/apache/pivot/charts/ChartView.java b/charts/src/org/apache/pivot/charts/ChartView.java
index 65bcbbb..0c8481d 100644
--- a/charts/src/org/apache/pivot/charts/ChartView.java
+++ b/charts/src/org/apache/pivot/charts/ChartView.java
@@ -18,6 +18,7 @@
 
 import java.util.Comparator;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
 import org.apache.pivot.beans.DefaultProperty;
 import org.apache.pivot.charts.content.ValueMarker;
 import org.apache.pivot.collections.ArrayList;
@@ -173,6 +174,7 @@
         }
 
         @Override
+        @UnsupportedOperation
         public Category update(final int index, final Category category) {
             throw new UnsupportedOperationException();
         }
diff --git a/core/src/org/apache/pivot/beans/BXMLSerializer.java b/core/src/org/apache/pivot/beans/BXMLSerializer.java
index 77b0b89..222a2d8 100644
--- a/core/src/org/apache/pivot/beans/BXMLSerializer.java
+++ b/core/src/org/apache/pivot/beans/BXMLSerializer.java
@@ -45,6 +45,7 @@
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.util.StreamReaderDelegate;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
 import org.apache.pivot.collections.Dictionary;
 import org.apache.pivot.collections.HashMap;
 import org.apache.pivot.collections.LinkedList;
@@ -1512,7 +1513,11 @@
         exception.printStackTrace(System.err);
     }
 
+    /**
+     * @throws UnsupportedOperationException because we don't support writing BXML objects.
+     */
     @Override
+    @UnsupportedOperation
     public void writeObject(final Object object, final OutputStream outputStream) throws IOException,
         SerializationException {
         throw new UnsupportedOperationException();
@@ -1681,16 +1686,19 @@
     protected final XMLStreamReader getXMLStreamReader() {
         return new StreamReaderDelegate(xmlStreamReader) {
             @Override
+            @UnsupportedOperation
             public void close() {
                 throw new UnsupportedOperationException();
             }
 
             @Override
+            @UnsupportedOperation
             public int next() {
                 throw new UnsupportedOperationException();
             }
 
             @Override
+            @UnsupportedOperation
             public int nextTag() {
                 throw new UnsupportedOperationException();
             }
diff --git a/core/src/org/apache/pivot/beans/BeanAdapter.java b/core/src/org/apache/pivot/beans/BeanAdapter.java
index 009d1b8..6875055 100644
--- a/core/src/org/apache/pivot/beans/BeanAdapter.java
+++ b/core/src/org/apache/pivot/beans/BeanAdapter.java
@@ -364,7 +364,7 @@
     }
 
     /**
-     * @throws UnsupportedOperationException This method is not supported.
+     * @throws UnsupportedOperationException This operation is not supported.
      */
     @Override
     @UnsupportedOperation
@@ -373,7 +373,7 @@
     }
 
     /**
-     * @throws UnsupportedOperationException This method is not supported.
+     * @throws UnsupportedOperationException This operation is not supported.
      */
     @Override
     @UnsupportedOperation
@@ -402,7 +402,7 @@
     }
 
     /**
-     * @throws UnsupportedOperationException This method is not supported.
+     * @throws UnsupportedOperationException This operation is not supported.
      */
     @Override
     @UnsupportedOperation
@@ -411,7 +411,7 @@
     }
 
     /**
-     * @throws UnsupportedOperationException This method is not supported.
+     * @throws UnsupportedOperationException This operation is not supported.
      */
     @Override
     @UnsupportedOperation
@@ -425,7 +425,7 @@
     }
 
     /**
-     * @throws UnsupportedOperationException This method is not supported.
+     * @throws UnsupportedOperationException This operation is not supported.
      */
     @Override
     @UnsupportedOperation
diff --git a/core/src/org/apache/pivot/collections/ArrayAdapter.java b/core/src/org/apache/pivot/collections/ArrayAdapter.java
index 99a571b..46881cd 100644
--- a/core/src/org/apache/pivot/collections/ArrayAdapter.java
+++ b/core/src/org/apache/pivot/collections/ArrayAdapter.java
@@ -18,10 +18,11 @@
 
 import java.io.Serializable;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
 import org.apache.pivot.util.Utils;
 
 /**
- * Implementation of the {@link Sequence} interface that wraps an array.
+ * A read-only implementation of the {@link Sequence} interface that wraps an array.
  */
 public class ArrayAdapter<T> implements Sequence<T>, Serializable {
     private static final long serialVersionUID = 1143706808122308239L;
@@ -36,26 +37,31 @@
     }
 
     @Override
+    @UnsupportedOperation
     public int add(T item) {
         throw new UnsupportedOperationException();
     }
 
     @Override
+    @UnsupportedOperation
     public void insert(T item, int index) {
         throw new UnsupportedOperationException();
     }
 
     @Override
+    @UnsupportedOperation
     public T update(int index, T item) {
         throw new UnsupportedOperationException();
     }
 
     @Override
+    @UnsupportedOperation
     public int remove(T item) {
         throw new UnsupportedOperationException();
     }
 
     @Override
+    @UnsupportedOperation
     public Sequence<T> remove(int index, int count) {
         throw new UnsupportedOperationException();
     }
diff --git a/core/src/org/apache/pivot/collections/EnumList.java b/core/src/org/apache/pivot/collections/EnumList.java
index 26df23b..3a7a402 100644
--- a/core/src/org/apache/pivot/collections/EnumList.java
+++ b/core/src/org/apache/pivot/collections/EnumList.java
@@ -22,15 +22,18 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
 import org.apache.pivot.util.ListenerList;
 import org.apache.pivot.util.Utils;
 
 /**
- * Implementation of the {@link List} interface that is backed by an enum.
+ * A read-only implementation of the {@link List} interface that is backed by an enum.
  */
 public class EnumList<E extends Enum<E>> implements List<E>, Serializable {
     private static final long serialVersionUID = 5104856822133576300L;
 
+    private static final String ERROR_MSG = "An Enum List cannot be modified.";
+
     private class ItemIterator implements Iterator<E> {
         private int i = 0;
 
@@ -49,8 +52,9 @@
         }
 
         @Override
+        @UnsupportedOperation
         public void remove() {
-            throw new UnsupportedOperationException();
+            throw new UnsupportedOperationException(ERROR_MSG);
         }
     }
 
@@ -69,33 +73,39 @@
     }
 
     @Override
+    @UnsupportedOperation
     public int add(E item) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public void insert(E item, int index) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public E update(int index, E item) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public int remove(E item) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public Sequence<E> remove(int index, int count) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public void clear() {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
@@ -130,8 +140,9 @@
     }
 
     @Override
+    @UnsupportedOperation
     public void setComparator(Comparator<E> comparator) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
diff --git a/core/src/org/apache/pivot/collections/EnumMap.java b/core/src/org/apache/pivot/collections/EnumMap.java
index 97e3322..437367d 100644
--- a/core/src/org/apache/pivot/collections/EnumMap.java
+++ b/core/src/org/apache/pivot/collections/EnumMap.java
@@ -20,12 +20,12 @@
 import java.util.Comparator;
 import java.util.Iterator;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
 import org.apache.pivot.util.ListenerList;
 import org.apache.pivot.util.Utils;
 
 /**
- * Implementation of the {@link Set} interface whose keys are backed by a set of
- * enum values.
+ * Implementation of the {@link Map} interface whose keys are backed by an enum.
  */
 public class EnumMap<E extends Enum<E>, V> implements Map<E, V>, Serializable {
     private static final long serialVersionUID = -8446839779287452516L;
@@ -116,8 +116,10 @@
     }
 
     @Override
+    @UnsupportedOperation
     public void setComparator(Comparator<E> comparator) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(
+            "Cannot set a comparator because an Enum Map is always ordered by its underlying enum.");
     }
 
     @Override
diff --git a/core/src/org/apache/pivot/collections/EnumSet.java b/core/src/org/apache/pivot/collections/EnumSet.java
index 085e1d4..b2c4fab 100644
--- a/core/src/org/apache/pivot/collections/EnumSet.java
+++ b/core/src/org/apache/pivot/collections/EnumSet.java
@@ -21,6 +21,7 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
 import org.apache.pivot.util.ListenerList;
 
 /**
@@ -67,6 +68,7 @@
         }
 
         @Override
+        @UnsupportedOperation
         public void remove() {
             throw new UnsupportedOperationException();
         }
@@ -152,8 +154,10 @@
     }
 
     @Override
+    @UnsupportedOperation
     public void setComparator(final Comparator<E> comparator) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(
+            "Cannot set a comparator because an Enum Set is always ordered by its underlying enum.");
     }
 
     @Override
diff --git a/core/src/org/apache/pivot/collections/Sequence.java b/core/src/org/apache/pivot/collections/Sequence.java
index 6141600..6a16e8e 100644
--- a/core/src/org/apache/pivot/collections/Sequence.java
+++ b/core/src/org/apache/pivot/collections/Sequence.java
@@ -270,7 +270,7 @@
             @Override
             public Path getPath() {
                 if (previousPath == null) {
-                    throw new IllegalStateException();
+                    throw new IllegalStateException("'getPath' called before 'next' during iteration");
                 }
 
                 return previousPath;
diff --git a/core/src/org/apache/pivot/collections/immutable/ImmutableList.java b/core/src/org/apache/pivot/collections/immutable/ImmutableList.java
index 189caed..22991ef 100644
--- a/core/src/org/apache/pivot/collections/immutable/ImmutableList.java
+++ b/core/src/org/apache/pivot/collections/immutable/ImmutableList.java
@@ -19,6 +19,7 @@
 import java.util.Comparator;
 import java.util.Iterator;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
 import org.apache.pivot.collections.List;
 import org.apache.pivot.collections.ListListener;
 import org.apache.pivot.collections.Sequence;
@@ -35,7 +36,7 @@
 
     private ListListenerList<T> listListeners = new ListListenerList<>();
 
-    private static final String ERROR_MSG = "Immutable list cannot be modified.";
+    private static final String ERROR_MSG = "An Immutable List cannot be modified.";
 
     public ImmutableList(final List<T> list) {
         Utils.checkNull(list, "list");
@@ -44,31 +45,37 @@
     }
 
     @Override
+    @UnsupportedOperation
     public int add(final T item) {
         throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public void insert(final T item, final int index) {
         throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public T update(final int index, final T item) {
         throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public int remove(final T item) {
         throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public Sequence<T> remove(final int index, final int count) {
         throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public void clear() {
         throw new UnsupportedOperationException(ERROR_MSG);
     }
@@ -99,6 +106,7 @@
     }
 
     @Override
+    @UnsupportedOperation
     public void setComparator(final Comparator<T> comparator) {
         throw new UnsupportedOperationException(ERROR_MSG);
     }
diff --git a/core/src/org/apache/pivot/collections/immutable/ImmutableMap.java b/core/src/org/apache/pivot/collections/immutable/ImmutableMap.java
index 91edd6d..937683c 100644
--- a/core/src/org/apache/pivot/collections/immutable/ImmutableMap.java
+++ b/core/src/org/apache/pivot/collections/immutable/ImmutableMap.java
@@ -19,6 +19,7 @@
 import java.util.Comparator;
 import java.util.Iterator;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
 import org.apache.pivot.collections.Map;
 import org.apache.pivot.collections.MapListener;
 import org.apache.pivot.util.ImmutableIterator;
@@ -35,6 +36,8 @@
 
     private MapListener.Listeners<K, V> mapListeners = new MapListener.Listeners<>();
 
+    private static final String ERROR_MSG = "An Immutable Map cannot be modified.";
+
     public ImmutableMap(final Map<K, V> map) {
         Utils.checkNull(map, "map");
 
@@ -47,18 +50,21 @@
     }
 
     @Override
+    @UnsupportedOperation
     public V put(final K key, final V value) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public V remove(final K key) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public void clear() {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
@@ -82,8 +88,9 @@
     }
 
     @Override
+    @UnsupportedOperation
     public void setComparator(final Comparator<K> comparator) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
diff --git a/core/src/org/apache/pivot/collections/immutable/ImmutableSet.java b/core/src/org/apache/pivot/collections/immutable/ImmutableSet.java
index 0c17b1b..90b0866 100644
--- a/core/src/org/apache/pivot/collections/immutable/ImmutableSet.java
+++ b/core/src/org/apache/pivot/collections/immutable/ImmutableSet.java
@@ -19,6 +19,7 @@
 import java.util.Comparator;
 import java.util.Iterator;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
 import org.apache.pivot.collections.Set;
 import org.apache.pivot.collections.SetListener;
 import org.apache.pivot.util.ImmutableIterator;
@@ -34,6 +35,8 @@
 
     private SetListener.Listeners<E> setListeners = new SetListener.Listeners<>();
 
+    private static final String ERROR_MSG = "An Immutable Set cannot be modified.";
+
     public ImmutableSet(final Set<E> set) {
         Utils.checkNull(set, "set");
 
@@ -41,18 +44,21 @@
     }
 
     @Override
+    @UnsupportedOperation
     public boolean add(final E element) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public boolean remove(final E element) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public void clear() {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
@@ -76,8 +82,9 @@
     }
 
     @Override
+    @UnsupportedOperation
     public void setComparator(final Comparator<E> comparator) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
diff --git a/core/src/org/apache/pivot/functional/monad/Option.java b/core/src/org/apache/pivot/functional/monad/Option.java
index 557c69e..3e7d944 100644
--- a/core/src/org/apache/pivot/functional/monad/Option.java
+++ b/core/src/org/apache/pivot/functional/monad/Option.java
@@ -17,6 +17,7 @@
 package org.apache.pivot.functional.monad;

 

 import java.util.Iterator;

+import org.apache.pivot.annotations.UnsupportedOperation;

 

 /**

  * Definition of a generic Option container, to hold an invariant value (derived from Monad).

@@ -132,6 +133,7 @@
         }

 

         @Override

+        @UnsupportedOperation

         public void remove() {

             throw new UnsupportedOperationException();

         }

diff --git a/core/src/org/apache/pivot/functional/monad/Try.java b/core/src/org/apache/pivot/functional/monad/Try.java
index f62c743..bd1c8ec 100644
--- a/core/src/org/apache/pivot/functional/monad/Try.java
+++ b/core/src/org/apache/pivot/functional/monad/Try.java
@@ -17,6 +17,7 @@
 package org.apache.pivot.functional.monad;

 

 import java.util.Iterator;

+import org.apache.pivot.annotations.UnsupportedOperation;

 

 /**

  * Definition of a generic Monad.

@@ -90,6 +91,7 @@
         }

 

         @Override

+        @UnsupportedOperation

         public void remove() {

             throw new UnsupportedOperationException();

         }

diff --git a/core/src/org/apache/pivot/io/FileList.java b/core/src/org/apache/pivot/io/FileList.java
index d79904b..50f02bf 100644
--- a/core/src/org/apache/pivot/io/FileList.java
+++ b/core/src/org/apache/pivot/io/FileList.java
@@ -20,6 +20,7 @@
 import java.io.Serializable;
 import java.util.Comparator;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
 import org.apache.pivot.collections.adapter.ListAdapter;
 
 /**
@@ -65,16 +66,19 @@
     }
 
     @Override
+    @UnsupportedOperation
     public void insert(File file, int index) {
         throw new UnsupportedOperationException();
     }
 
     @Override
+    @UnsupportedOperation
     public File update(int index, File file) {
         throw new UnsupportedOperationException();
     }
 
     @Override
+    @UnsupportedOperation
     public void setComparator(Comparator<File> comparator) {
         throw new UnsupportedOperationException();
     }
diff --git a/core/src/org/apache/pivot/io/FileObjectList.java b/core/src/org/apache/pivot/io/FileObjectList.java
index 0bf633d..498c014 100644
--- a/core/src/org/apache/pivot/io/FileObjectList.java
+++ b/core/src/org/apache/pivot/io/FileObjectList.java
@@ -20,18 +20,18 @@
 import java.util.Comparator;

 

 import org.apache.commons.vfs2.FileObject;

+import org.apache.pivot.annotations.UnsupportedOperation;

 import org.apache.pivot.collections.adapter.ListAdapter;

 

 /**

  * Collection representing a list of files. Each entry in the list is unique;

- * i.e. a single file can't be added to the list more than once. TODO: compute

- * new serailVersionUIDs

+ * i.e. a single file can't be added to the list more than once.

  */

 public class FileObjectList extends ListAdapter<FileObject> {

-    private static final long serialVersionUID = -6741822480264805279L;

+    private static final long serialVersionUID = 1327073299912864048L;

 

     private static class FilePathComparator implements Comparator<FileObject>, Serializable {

-        private static final long serialVersionUID = 6341769187574031281L;

+        private static final long serialVersionUID = -4470959470309721902L;

 

         @Override

         public int compare(FileObject file1, FileObject file2) {

@@ -66,16 +66,19 @@
     }

 

     @Override

+    @UnsupportedOperation

     public void insert(FileObject file, int index) {

         throw new UnsupportedOperationException();

     }

 

     @Override

+    @UnsupportedOperation

     public FileObject update(int index, FileObject file) {

         throw new UnsupportedOperationException();

     }

 

     @Override

+    @UnsupportedOperation

     public void setComparator(Comparator<FileObject> comparator) {

         throw new UnsupportedOperationException();

     }

diff --git a/core/src/org/apache/pivot/sql/ResultList.java b/core/src/org/apache/pivot/sql/ResultList.java
index 0098be2..8263bd7 100644
--- a/core/src/org/apache/pivot/sql/ResultList.java
+++ b/core/src/org/apache/pivot/sql/ResultList.java
@@ -23,6 +23,7 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
 import org.apache.pivot.collections.ArrayAdapter;
 import org.apache.pivot.collections.ArrayList;
 import org.apache.pivot.collections.HashMap;
@@ -160,6 +161,7 @@
         }
 
         @Override
+        @UnsupportedOperation
         public void remove() {
             throw new UnsupportedOperationException();
         }
@@ -171,6 +173,9 @@
 
     private ListListenerList<Map<String, Object>> listListeners = new ListListenerList<>();
 
+    private static final String ERROR_MSG =
+        "Result List is not suited for random access or modification, but must be used via an iterator.";
+
     public ResultList(ResultSet resultSet) {
         Utils.checkNull(resultSet, "resultSet");
 
@@ -206,48 +211,57 @@
     }
 
     @Override
+    @UnsupportedOperation
     public int add(Map<String, Object> item) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public void insert(Map<String, Object> item, int index) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public Map<String, Object> update(int index, Map<String, Object> item) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public int remove(Map<String, Object> item) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public Sequence<Map<String, Object>> remove(int index, int count) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public void clear() {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public Map<String, Object> get(int index) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public int indexOf(Map<String, Object> item) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
+    @UnsupportedOperation
     public boolean isEmpty() {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
@@ -261,8 +275,9 @@
     }
 
     @Override
+    @UnsupportedOperation
     public void setComparator(Comparator<Map<String, Object>> comparator) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
diff --git a/core/src/org/apache/pivot/text/FileSizeFormat.java b/core/src/org/apache/pivot/text/FileSizeFormat.java
index 0675ecc..e93e29f 100644
--- a/core/src/org/apache/pivot/text/FileSizeFormat.java
+++ b/core/src/org/apache/pivot/text/FileSizeFormat.java
@@ -21,9 +21,11 @@
 import java.text.NumberFormat;
 import java.text.ParsePosition;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
+
 /**
  * Converts a file size into a human-readable representation using binary
- * prefixes (1KB = 1024 bytes).
+ * prefixes (1KB = 1024 bytes).  Only supports display and not parsing.
  */
 public final class FileSizeFormat extends Format {
     private static final long serialVersionUID = 9126510513247641698L;
@@ -84,6 +86,7 @@
      * @throws UnsupportedOperationException always.
      */
     @Override
+    @UnsupportedOperation
     public Object parseObject(final String arg0, final ParsePosition arg1) {
         throw new UnsupportedOperationException();
     }
diff --git a/core/src/org/apache/pivot/util/Resources.java b/core/src/org/apache/pivot/util/Resources.java
index a7a9dcf..dd4fb3f 100644
--- a/core/src/org/apache/pivot/util/Resources.java
+++ b/core/src/org/apache/pivot/util/Resources.java
@@ -42,6 +42,8 @@
 
     public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;
 
+    private static final String ERROR_MSG = "Resources are immutable.";
+
     public Resources(final String baseName) throws IOException, SerializationException {
         this(null, baseName, Locale.getDefault(), DEFAULT_CHARSET);
     }
@@ -170,12 +172,12 @@
 
     @Override
     public Object put(final String key, final Object value) {
-        throw new UnsupportedOperationException("Resources are immutable.");
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
     public Object remove(final String key) {
-        throw new UnsupportedOperationException("Resources are immutable.");
+        throw new UnsupportedOperationException(ERROR_MSG);
     }
 
     @Override
diff --git a/web-server/src/org/apache/pivot/web/server/QueryServlet.java b/web-server/src/org/apache/pivot/web/server/QueryServlet.java
index 1b01e5b..550dcc4 100644
--- a/web-server/src/org/apache/pivot/web/server/QueryServlet.java
+++ b/web-server/src/org/apache/pivot/web/server/QueryServlet.java
@@ -32,6 +32,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.pivot.annotations.UnsupportedOperation;
 import org.apache.pivot.collections.ArrayList;
 import org.apache.pivot.collections.Sequence;
 import org.apache.pivot.serialization.SerializationException;
@@ -63,21 +64,25 @@
         }
 
         @Override
+        @UnsupportedOperation
         public int add(final String element) {
             throw new UnsupportedOperationException();
         }
 
         @Override
+        @UnsupportedOperation
         public void insert(String element, int index) {
             throw new UnsupportedOperationException();
         }
 
         @Override
+        @UnsupportedOperation
         public String update(final int index, final String element) {
             throw new UnsupportedOperationException();
         }
 
         @Override
+        @UnsupportedOperation
         public int remove(final String element) {
             throw new UnsupportedOperationException();
         }