/[classpath]/classpath/javax/swing/SwingUtilities.java
ViewVC logotype

Diff of /classpath/javax/swing/SwingUtilities.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.15.2.15 by tromey, Sat Nov 26 05:29:42 2005 UTC revision 1.15.2.16 by gnu_andrew, Sun Nov 27 21:00:38 2005 UTC
# Line 1138  public class SwingUtilities Line 1138  public class SwingUtilities
1138      else      else
1139        {        {
1140          ActionMap parent = child.getParent();          ActionMap parent = child.getParent();
1141          while(parent != null)          while (parent != null && !(parent instanceof ActionMapUIResource))
1142            {            {
1143              child = parent;              child = parent;
1144              parent = child.getParent();              parent = child.getParent();
1145            }            }
1146            child.setParent(uiActionMap);
         if (child != null)  
           child.setParent(uiActionMap);  
1147        }        }
1148    }    }
1149    
# Line 1181  public class SwingUtilities Line 1179  public class SwingUtilities
1179        component.setInputMap(condition, uiInputMap);        component.setInputMap(condition, uiInputMap);
1180      else      else
1181        {        {
1182          while(child.getParent() != null          InputMap parent = child.getParent();
1183                && !(child.getParent() instanceof InputMapUIResource))          while (parent != null && !(parent instanceof InputMapUIResource))
1184            child = child.getParent();            {
1185          if (child != null)              child = parent;
1186            child.setParent(uiInputMap);              parent = parent.getParent();
1187              }
1188            child.setParent(uiInputMap);
1189        }        }
1190    }    }
1191    

Legend:
Removed from v.1.15.2.15  
changed lines
  Added in v.1.15.2.16

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26