[Rails-commits] rails/ui

[Frederick W. <fre...@us...>]

 rails/ui/swing/MessagePanel.java |    4 ++--
 rails/ui/swing/ORPanel.java      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0c3a97d2c55df8ab8e8d06064e5d909bc89448fa
Author: Frederick Weld <fre...@gm...>
Date:   Sat Jan 21 19:26:03 2012 +0100

    Fixed MessagePanel's revalidate invocation

diff --git a/rails/ui/swing/MessagePanel.java b/rails/ui/swing/MessagePanel.java
index 6c50471..3b3d2cc 100644
--- a/rails/ui/swing/MessagePanel.java
+++ b/rails/ui/swing/MessagePanel.java
@@ -74,7 +74,7 @@ public class MessagePanel extends JPanel {
         if (showDetails) {
             showDetails = false;
             parentSlider.setPreferredSize(new Dimension(minWidth,defaultHeight));
-            parentSlider.getParent().revalidate();
+            ((JComponent)parentSlider.getParent()).revalidate();
         }
     }
     
@@ -82,7 +82,7 @@ public class MessagePanel extends JPanel {
         if (!showDetails && currentDetails != null) {
             showDetails = true;
             parentSlider.setPreferredSize(new Dimension(minWidth,fullHeight));
-            parentSlider.getParent().revalidate();
+            ((JComponent)parentSlider.getParent()).revalidate();
         }
     }
     
diff --git a/rails/ui/swing/ORPanel.java b/rails/ui/swing/ORPanel.java
index f3b8b18..c8193ac 100644
--- a/rails/ui/swing/ORPanel.java
+++ b/rails/ui/swing/ORPanel.java
@@ -1037,7 +1037,7 @@ implements ActionListener, KeyListener, RevenueListener {
         setHighlight(tokens[orCompIndex],true);
         setHighlight(tokenCost[orCompIndex],true);
         setHighlight(tokensLeft[orCompIndex],true);
-        setHighlight(tokenBonus[orCompIndex],true);
+        if (tokenBonus != null) setHighlight(tokenBonus[orCompIndex],true);
         button1.setEnabled(false);
         button1.setVisible(false);
         button3.setEnabled(false);