[vassalengine-svn] SF.net SVN: vassalengine:[8606] VASSAL-src/trunk

[<uck...@us...>]

Revision: 8606
          http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8606&view=rev
Author:   uckelman
Date:     2013-03-28 20:46:05 +0000 (Thu, 28 Mar 2013)
Log Message:
-----------
Additional fix for Bug 9589: NPE in Embellishment.myGetKeyCommands()

Modified Paths:
--------------
    VASSAL-src/trunk/README
    VASSAL-src/trunk/src/VASSAL/counters/Embellishment.java

Modified: VASSAL-src/trunk/README
===================================================================
--- VASSAL-src/trunk/README	2013-03-25 22:13:58 UTC (rev 8605)
+++ VASSAL-src/trunk/README	2013-03-28 20:46:05 UTC (rev 8606)
@@ -184,6 +184,7 @@
 *  9700: Unit activation improperly recorded
 *  9681: NPE in Zone.getMutablePropertiesContainerId()
 *  9648: ConcurrentModificationException in Map.drawBoardsInRegion()
+*  9589: NPE in Embellishment.myGetKeyCommands()
 *  9555: NoSuchFieldError in ExpressionInterpreter.evaluate()
 *  4803: NoSuchElementException in Footprint.draw()
 *  2531: Change Global Property button missing configurable tooltip

Modified: VASSAL-src/trunk/src/VASSAL/counters/Embellishment.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/counters/Embellishment.java	2013-03-25 22:13:58 UTC (rev 8605)
+++ VASSAL-src/trunk/src/VASSAL/counters/Embellishment.java	2013-03-28 20:46:05 UTC (rev 8606)
@@ -537,31 +537,35 @@
       final ArrayList<KeyCommand> l = new ArrayList<KeyCommand>();
       final GamePiece outer = Decorator.getOutermost(this);
 
-      if (activateCommand != null && activateCommand.length() > 0 && !alwaysActive) {
+      if (activateCommand != null && activateCommand.length() > 0 &&
+          !alwaysActive)
+      {
         KeyCommand k;
         k = new KeyCommand(activateCommand, activateKeyStroke, outer, this);
         k.setEnabled(nValues > 0);
         l.add(k);
       }
 
-      if (upCommand != null && upCommand.length() > 0 &&
-          ! increaseKeyStroke.isNull() &&
-          nValues > 1 &&
-          !followProperty) {
-        up = new KeyCommand(upCommand, increaseKeyStroke, outer, this);
-        l.add(up);
-      }
+      if (!followProperty) {
+        if (nValues > 1) {
+          if (upCommand != null && upCommand.length() > 0 &&
+              increaseKeyStroke != null && !increaseKeyStroke.isNull())
+          {
+            up = new KeyCommand(upCommand, increaseKeyStroke, outer, this);
+            l.add(up);
+          }
 
-      if (downCommand != null && downCommand.length() > 0 &&
-          ! decreaseKeyStroke.isNull() &&
-          nValues > 1 &&
-          !followProperty) {
-        down = new KeyCommand(downCommand, decreaseKeyStroke, outer, this);
-        l.add(down);
-      }
+          if (downCommand != null && downCommand.length() > 0 &&
+              decreaseKeyStroke != null && !decreaseKeyStroke.isNull())
+          {
+            down = new KeyCommand(downCommand, decreaseKeyStroke, outer, this);
+            l.add(down);
+          }
+        }
 
-      if (!followProperty) {
-        if (resetKey != null && !resetKey.isNull() && resetCommand.length() > 0) {
+        if (resetKey != null && !resetKey.isNull() &&
+            resetCommand.length() > 0)
+        {
           l.add(new KeyCommand(resetCommand, resetKey, outer, this));
         }
 
@@ -574,12 +578,15 @@
 
       commands = l.toArray(new KeyCommand[l.size()]);
     }
+
     if (up != null) {
       up.setEnabled(loopLevels || Math.abs(value) < imageName.length);
     }
+
     if (down != null) {
       down.setEnabled(loopLevels || Math.abs(value) > 1);
     }
+
     return commands;
   }
 

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