1.1 --- a/samples/componentinjection/anagram-modular/src-app-serviceloader/org/apidesign/anagram/app/serviceloader/AnagramsWithServiceLoader.java	Sat Jun 14 10:08:35 2008 +0200
     1.2 +++ b/samples/componentinjection/anagram-modular/src-app-serviceloader/org/apidesign/anagram/app/serviceloader/AnagramsWithServiceLoader.java	Sat Jun 14 10:08:42 2008 +0200
     1.3 @@ -1,5 +1,6 @@
     1.4  package org.apidesign.anagram.app.serviceloader;
     1.5  
     1.6 +import java.util.Iterator;
     1.7  import org.apidesign.anagram.api.Scrambler;
     1.8  import org.apidesign.anagram.api.WordLibrary;
     1.9  import org.apidesign.anagram.gui.Anagrams;
    1.10 @@ -13,12 +14,14 @@
    1.11  
    1.12      @Override
    1.13      protected WordLibrary getWordLibrary() {
    1.14 -        return ServiceLoader.load(WordLibrary.class).iterator().next();
    1.15 +        Iterator<WordLibrary> it = ServiceLoader.load(WordLibrary.class).iterator();
    1.16 +        return it.hasNext() ? it.next() : null;
    1.17      }
    1.18  
    1.19      @Override
    1.20      protected Scrambler getScrambler() {
    1.21 -        return ServiceLoader.load(Scrambler.class).iterator().next();
    1.22 +        Iterator<Scrambler> it = ServiceLoader.load(Scrambler.class).iterator();
    1.23 +        return it.hasNext() ? it.next() : null;
    1.24      }
    1.25  
    1.26  }