[Rails-commits] rails/ui

[Erik V. <ev...@us...>]

 rails/ui/swing/ORUIManager.java |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit ce10cb981aa82985380177433571aed4789f75ae
Author: Erik Vos <eri...@xs...>
Date:   Thu Jun 14 15:44:15 2012 +0200

    Fix to 1835 (etc.) token relay fix (previous commit).
    
    It failed in a typical 1830 Erie case.

diff --git a/rails/ui/swing/ORUIManager.java b/rails/ui/swing/ORUIManager.java
index 2252757..f3b6049 100644
--- a/rails/ui/swing/ORUIManager.java
+++ b/rails/ui/swing/ORUIManager.java
@@ -963,12 +963,14 @@ public class ORUIManager implements DialogOwner {
         if (stopsToQuery.size() == 2) {
             Collections.sort(stopsToQuery, new Comparator<Stop>() {
                 public int compare (Stop s1, Stop s2) {
-                    // Home stops on this hex go first.
-                    boolean home1 = ((BaseToken)s1.getTokens().get(0)).getCompany().getHomeHexes().contains(hex);
-                    boolean home2 = ((BaseToken)s2.getTokens().get(0)).getCompany().getHomeHexes().contains(hex);
-                    if (home1 && !home2) {
+                    List<TokenI> tokens;
+                    boolean stop1IsHome = !((tokens = s1.getTokens()).isEmpty())
+                    && ((BaseToken)tokens.get(0)).getCompany().getHomeHexes().contains(hex);
+                    boolean stop2IsHome = !((tokens = s2.getTokens()).isEmpty())
+                    && ((BaseToken)tokens.get(0)).getCompany().getHomeHexes().contains(hex);
+                    if (stop1IsHome && !stop2IsHome) {
                         return -1;
-                    } else if (home2 && !home1) {
+                    } else if (stop2IsHome && !stop1IsHome) {
                         return 1;
                     } else {
                         return 0; // Doesn't matter