X-Git-Url: https://git.hedgecode.org/?p=chesshog.git;a=blobdiff_plain;f=chesshog-graphics%2Fsrc%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fimg%2Fpiece%2FPieceSetLoader.java;h=8b0e7c84fe7533a2d39e93cebdf847ec0bc46ff6;hp=4cd68c05512605ca30aea21ae708328e6807d0bb;hb=0b24d5b71c19ba38060297084ad39685f76a8539;hpb=cc2bc357ce3c21a0b092af8b2ba3e174d10cac81

diff --git a/chesshog-graphics/src/main/java/org/hedgecode/chess/img/piece/PieceSetLoader.java b/chesshog-graphics/src/main/java/org/hedgecode/chess/img/piece/PieceSetLoader.java
index 4cd68c0..8b0e7c8 100644
--- a/chesshog-graphics/src/main/java/org/hedgecode/chess/img/piece/PieceSetLoader.java
+++ b/chesshog-graphics/src/main/java/org/hedgecode/chess/img/piece/PieceSetLoader.java
@@ -27,7 +27,7 @@ import org.hedgecode.chess.img.ImageException;
 import org.hedgecode.chess.img.ImageFilter;
 
 /**
- *
+ * Loader for chess piece's set of images.
  *
  * @author Dmitry Samoshin aka gotty
  */
@@ -45,7 +45,7 @@ public class PieceSetLoader extends AbstractImageLoader {
         if (Type.STATELESS.equals(loadType()) || !pieceSetMap.containsKey(name)) {
             String piecePath = FilenameUtils.getFullPath(PIECES_DIR, name);
             pieceSet = loadPieces(piecePath);
-            if (Type.STATEFUL.equals(loadType()) && pieceSet != null) {
+            if (Type.STATEFUL.equals(loadType())) {
                 pieceSetMap.put(name, pieceSet);
             }
         } else {
@@ -79,9 +79,10 @@ public class PieceSetLoader extends AbstractImageLoader {
                     images.get(name)
             );
         }
-        return pieceSet.isFull()
-                ? pieceSet
-                : null; // todo: ImageException
+        if (!pieceSet.isFilled()) {
+            throw new ImageException("image.incomplete.piece.set", piecePath);
+        }
+        return pieceSet;
     }
 
 }