gridarta-commit Mailing List for gridarta (Page 64)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 8160
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8160&view=rev
Author:   akirschbaum
Date:     2010-06-05 19:45:56 +0000 (Sat, 05 Jun 2010)

Log Message:
-----------
Add @NotNull/@Nullable annotations; fix related issues.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java

Modified: trunk/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java
===================================================================

--- trunk/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java	2010-06-05 19:33:32 UTC (rev 8159)
+++ trunk/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java	2010-06-05 19:45:56 UTC (rev 8160)
@@ -50,46 +50,55 @@
     /**
      * The filter to make gray-scaled images.
      */
+    @NotNull
     private static final ImageFilter GRAY_FILTER = new GrayFilter(false, GRAY_PERCENTAGE);
 
     /**
      * The face provider for GRAY faces.
      */
+    @NotNull
     private static final FilterFaceProvider GRAY = new FilterFaceProvider(GRAY_FILTER);
 
     /**
      * The filter to make images red.
      */
+    @NotNull
     private static final ImageFilter RED_FILTER = new ColourFilter(ColourFilter.RED_MASK);
 
     /**
      * The face provider for red faces.
      */
+    @NotNull
     private static final FilterFaceProvider RED = new FilterFaceProvider(RED_FILTER);
 
     /**
      * The filter to make images green.
      */
+    @NotNull
     private static final ImageFilter GREEN_FILTER = new ColourFilter(ColourFilter.GREEN_MASK);
 
     /**
      * The face provider for green faces.
      */
+    @NotNull
     private static final FilterFaceProvider GREEN = new FilterFaceProvider(GREEN_FILTER);
 
     /**
      * The filter to make images blue.
      */
+    @NotNull
     private static final ImageFilter BLUE_FILTER = new ColourFilter(ColourFilter.BLUE_MASK);
 
     /**
      * The face provider for blue faces.
      */
+    @NotNull
     private static final FilterFaceProvider BLUE = new FilterFaceProvider(BLUE_FILTER);
 
     /**
      * The filter using a full alpha grid instead of alpha blending.
      */
+    @NotNull
     private static final ImageFilter GRID_FILTER = new RGBImageFilter() {
 
         /**
@@ -113,16 +122,19 @@
     /**
      * The face provider for grid faces.
      */
+    @NotNull
     private static final FilterFaceProvider GRID = new FilterFaceProvider(GRID_FILTER);
 
     /**
      * The face provider for normal faces.
      */
-    private FaceProvider normalFaceProvider;
+    @Nullable
+    private FaceProvider normalFaceProvider = null;
 
     /**
      * The face provider for alpha faces.
      */
+    @NotNull
     private static final FilterFaceProvider ALPHA = new FilterFaceProvider(AlphaImageFilterInstance.ALPHA_FILTER);
 
     /**
@@ -140,7 +152,8 @@
     /**
      * The {@link FaceObjects} instance for looking up face names.
      */
-    private FaceObjects faceObjects = null;
+    @NotNull
+    private final FaceObjects faceObjects;
 
     /**
      * The {@link SystemIcons} for creating icons.
@@ -165,7 +178,10 @@
      * Reloads all providers provided by this FaceObjects.
      */
     public void reloadAll() {
-        for (final FaceProvider faceProvider : new FaceProvider[] { normalFaceProvider, GRAY, RED, GREEN, BLUE, ALPHA, GRID, doubleFaceProvider, doubleAlphaFaceProvider }) {
+        if (normalFaceProvider != null) {
+            normalFaceProvider.reload();
+        }
+        for (final FaceProvider faceProvider : new FaceProvider[] { GRAY, RED, GREEN, BLUE, ALPHA, GRID, doubleFaceProvider, doubleAlphaFaceProvider }) {
             faceProvider.reload();
         }
     }
@@ -195,6 +211,10 @@
      */
     @NotNull
     public <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> ImageIcon getFace(@NotNull final BaseObject<G, A, R, ?> baseObject) {
+        if (normalFaceProvider == null) {
+            throw new IllegalStateException();
+        }
+
         final boolean[] undefinedArchetype = new boolean[1];
         baseObject.visit(new BaseObjectVisitor<G, A, R>() {
 
@@ -215,6 +235,7 @@
             }
 
         });
+        //noinspection ConstantConditions
         return getFace(baseObject.getFaceObjName(), undefinedArchetype[0], normalFaceProvider, normalFaceProvider);
     }
 
@@ -237,6 +258,10 @@
      */
     @NotNull
     public ImageIcon getDouble(@NotNull final GameObject<?, ?, ?> gameObject) {
+        if (normalFaceProvider == null) {
+            throw new IllegalStateException();
+        }
+        //noinspection ConstantConditions
         return getFace(gameObject.getFaceObjName(), gameObject.hasUndefinedArchetype(), normalFaceProvider, doubleFaceProvider);
     }
 


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




2006	Jan	Feb	Mar	Apr	May (103)	Jun (121)	Jul (16)	Aug (67)	Sep (126)	Oct (161)	Nov (164)	Dec (588)
2007	Jan (394)	Feb (181)	Mar (131)	Apr (180)	May (255)	Jun (11)	Jul (79)	Aug (70)	Sep (274)	Oct (138)	Nov (195)	Dec (8)
2008	Jan (3)	Feb (142)	Mar (162)	Apr (124)	May (148)	Jun (157)	Jul (425)	Aug (373)	Sep (264)	Oct (315)	Nov (225)	Dec (6)
2009	Jan (67)	Feb (78)	Mar (279)	Apr (294)	May (92)	Jun (65)	Jul (134)	Aug (41)	Sep (138)	Oct (125)	Nov (126)	Dec (122)
2010	Jan (15)	Feb (48)	Mar (9)	Apr (195)	May (373)	Jun (507)	Jul (42)	Aug (16)	Sep (38)	Oct (81)	Nov (64)	Dec (18)
2011	Jan (13)	Feb (12)	Mar (39)	Apr (1)	May (2)	Jun (27)	Jul (27)	Aug (31)	Sep (14)	Oct (102)	Nov (20)	Dec (37)
2012	Jan (22)	Feb (1)	Mar (1)	Apr (2)	May (2)	Jun (18)	Jul (6)	Aug (1)	Sep (1)	Oct	Nov	Dec
2013	Jan (1)	Feb (2)	Mar (1)	Apr (1)	May (47)	Jun (7)	Jul (107)	Aug	Sep	Oct (112)	Nov (31)	Dec (17)
2014	Jan (29)	Feb (111)	Mar (34)	Apr	May (1)	Jun	Jul	Aug	Sep	Oct (2)	Nov (18)	Dec (10)

gridarta-commit Mailing List for gridarta (Page 64)

gridarta-commit — svn commit digest list (high traffic)