[Japi-cvs] SF.net SVN: japi: [468] libs/util/trunk/src/net/sf/japi/util

[<chr...@us...>]

Revision: 468
          http://svn.sourceforge.net/japi/?rev=468&view=rev
Author:   christianhujer
Date:     2007-06-30 02:50:04 -0700 (Sat, 30 Jun 2007)

Log Message:
-----------
Added missing @NotNull / @Nullable annotations.

Modified Paths:
--------------
    libs/util/trunk/src/net/sf/japi/util/EnumerationIterator.java
    libs/util/trunk/src/net/sf/japi/util/IteratorEnumeration.java
    libs/util/trunk/src/net/sf/japi/util/IteratorIterable.java
    libs/util/trunk/src/net/sf/japi/util/LocaleComparator.java
    libs/util/trunk/src/net/sf/japi/util/NotNullIterator.java
    libs/util/trunk/src/net/sf/japi/util/ThrowableHandler.java

Modified: libs/util/trunk/src/net/sf/japi/util/EnumerationIterator.java
===================================================================
--- libs/util/trunk/src/net/sf/japi/util/EnumerationIterator.java	2007-06-30 09:42:09 UTC (rev 467)
+++ libs/util/trunk/src/net/sf/japi/util/EnumerationIterator.java	2007-06-30 09:50:04 UTC (rev 468)
@@ -22,6 +22,7 @@
 import java.util.Iterator;
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
+import org.jetbrains.annotations.NotNull;
 
 /** Combined Iterator/Iterable proxy for enumerations.
  * Instances are not reusable.
@@ -30,17 +31,17 @@
 public class EnumerationIterator<T> implements Iterable<T>, Iterator<T> {
 
     /** Enumeration to iterate over. */
-    private final Enumeration<T> enumeration;
+    @NotNull private final Enumeration<T> enumeration;
 
     /** Create an Iterable based on an Enumeration, useful for foreach-loops.
      * @param enumeration Enumeration to iterate over
      */
-    public EnumerationIterator(final Enumeration<T> enumeration) {
+    public EnumerationIterator(@NotNull final Enumeration<T> enumeration) {
         this.enumeration = enumeration;
     }
 
     /** {@inheritDoc} */
-    public Iterator<T> iterator() {
+    @NotNull public Iterator<T> iterator() {
         return this;
     }
 

Modified: libs/util/trunk/src/net/sf/japi/util/IteratorEnumeration.java
===================================================================
--- libs/util/trunk/src/net/sf/japi/util/IteratorEnumeration.java	2007-06-30 09:42:09 UTC (rev 467)
+++ libs/util/trunk/src/net/sf/japi/util/IteratorEnumeration.java	2007-06-30 09:50:04 UTC (rev 468)
@@ -21,6 +21,7 @@
 
 import java.util.Enumeration;
 import java.util.Iterator;
+import org.jetbrains.annotations.NotNull;
 
 /** Enumeration proxy for Iterators.
  * Instances are not reusable.
@@ -29,12 +30,12 @@
 public class IteratorEnumeration<T> implements Enumeration<T> {
 
     /** Iterator to enumerate. */
-    private final Iterator<T> iterator;
+    @NotNull private final Iterator<T> iterator;
 
     /** Create an Enumeration for an Iterator.
      * @param iterator Iterator to create Enumeration for
      */
-    public IteratorEnumeration(final Iterator<T> iterator) {
+    public IteratorEnumeration(@NotNull final Iterator<T> iterator) {
         this.iterator = iterator;
     }
 

Modified: libs/util/trunk/src/net/sf/japi/util/IteratorIterable.java
===================================================================
--- libs/util/trunk/src/net/sf/japi/util/IteratorIterable.java	2007-06-30 09:42:09 UTC (rev 467)
+++ libs/util/trunk/src/net/sf/japi/util/IteratorIterable.java	2007-06-30 09:50:04 UTC (rev 468)
@@ -20,6 +20,7 @@
 package net.sf.japi.util;
 
 import java.util.Iterator;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Iterable that wraps an Iterator.
@@ -28,18 +29,18 @@
 public class IteratorIterable<T> implements Iterable<T> {
 
     /** The wrapped Iterator. */
-    private Iterator<T> iterator;
+    @NotNull private Iterator<T> iterator;
 
     /**
      * Wrap an Iterator in an Iterable.
      * @param iterator Iterator to wrap
      */
-    public IteratorIterable(final Iterator<T> iterator) {
+    public IteratorIterable(@NotNull final Iterator<T> iterator) {
         this.iterator = iterator;
     }
 
     /** {@inheritDoc} */
-    public Iterator<T> iterator() {
+    @NotNull public Iterator<T> iterator() {
         return iterator;
     }
 

Modified: libs/util/trunk/src/net/sf/japi/util/LocaleComparator.java
===================================================================
--- libs/util/trunk/src/net/sf/japi/util/LocaleComparator.java	2007-06-30 09:42:09 UTC (rev 467)
+++ libs/util/trunk/src/net/sf/japi/util/LocaleComparator.java	2007-06-30 09:50:04 UTC (rev 468)
@@ -22,6 +22,8 @@
 import java.util.Comparator;
 import java.util.Locale;
 import java.text.Collator;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /** Implementation of {@link Comparator} that is able to compare {@link Locale} instances by their names (allowing <code>null</code>).
  * The Locale for sorting the Locales is determined at creation time.
@@ -30,14 +32,14 @@
 public final class LocaleComparator implements Comparator<Locale> {
 
     /** Collator for comparing the names. */
-    private final Collator collator = Collator.getInstance();
+    @NotNull private final Collator collator = Collator.getInstance();
 
     /** Create a LocaleComparator. */
     public LocaleComparator() {
     }
 
     /** {@inheritDoc} */
-    public int compare(final Locale o1, final Locale o2) {
+    public int compare(@Nullable final Locale o1, @Nullable final Locale o2) {
         if (o1 == null && o2 == null) {
             return 0;
         } else if (o1 == null) {

Modified: libs/util/trunk/src/net/sf/japi/util/NotNullIterator.java
===================================================================
--- libs/util/trunk/src/net/sf/japi/util/NotNullIterator.java	2007-06-30 09:42:09 UTC (rev 467)
+++ libs/util/trunk/src/net/sf/japi/util/NotNullIterator.java	2007-06-30 09:50:04 UTC (rev 468)
@@ -21,6 +21,8 @@
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /** Iterator / Iterable decorator that skips elements which are <code>null</code>.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
@@ -28,15 +30,15 @@
 public class NotNullIterator<T> implements Iterator<T> {
 
     /** The iterator to use. */
-    private final Iterator<T> iterator;
+    @NotNull private final Iterator<T> iterator;
 
     /** Prefetched next element. */
-    private T next;
+    @Nullable private T next;
 
     /** Create a NotNullIterator over another Iterator.
-     * @param iterator
+     * @param iterator Iterator to wrap / decorate.
      */
-    public NotNullIterator(final Iterator<T> iterator) {
+    public NotNullIterator(@NotNull final Iterator<T> iterator) {
         this.iterator = iterator;
         prefetchNext();
     }
@@ -53,7 +55,7 @@
     }
 
     /** {@inheritDoc} */
-    public T next() {
+    @NotNull public T next() {
         if (next == null) {
             throw new NoSuchElementException();
         }
@@ -73,14 +75,14 @@
     public static class NotNullIterable<T> implements Iterable<T> {
 
         /** The iterable to iterate over. */
-        private final Iterable<T> iterable;
+        @NotNull private final Iterable<T> iterable;
 
-        public NotNullIterable(final Iterable<T> iterable) {
+        public NotNullIterable(@NotNull final Iterable<T> iterable) {
             this.iterable = iterable;
         }
 
         /** {@inheritDoc} */
-        public Iterator<T> iterator() {
+        @NotNull public Iterator<T> iterator() {
             return new NotNullIterator<T>(iterable.iterator());
         }
 

Modified: libs/util/trunk/src/net/sf/japi/util/ThrowableHandler.java
===================================================================
--- libs/util/trunk/src/net/sf/japi/util/ThrowableHandler.java	2007-06-30 09:42:09 UTC (rev 467)
+++ libs/util/trunk/src/net/sf/japi/util/ThrowableHandler.java	2007-06-30 09:50:04 UTC (rev 468)
@@ -20,6 +20,7 @@
 package net.sf.japi.util;
 
 import java.util.EventListener;
+import org.jetbrains.annotations.NotNull;
 
 /** Interface that is implemented by classes that handle exceptions via callbacks.
  * This is useful during operations that can throw more than one exception during an operation.
@@ -31,6 +32,6 @@
     /** Handle a Throwable.
      * @param t Throwable to handle
      */
-    void handleThrowable(final T t);
+    void handleThrowable(@NotNull T t);
 
 } // interface ThrowableHandler


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.