/[classpath]/classpath/javax/swing/text/StyleContext.java
ViewVC logotype

Diff of /classpath/javax/swing/text/StyleContext.java

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

revision 1.6 by rabbit78, Tue Sep 13 23:44:50 2005 UTC revision 1.7 by abalkiss, Fri Sep 30 15:04:31 2005 UTC
# Line 306  public class StyleContext Line 306  public class StyleContext
306              return attrs[i+1];              return attrs[i+1];
307          }          }
308                            
309        Object p = getResolveParent();        // Check the resolve parent, unless we're looking for the
310        if (p != null && p instanceof AttributeSet)        // ResolveAttribute, which would cause an infinite loop
311          return (((AttributeSet)p).getAttribute(key));        if (!(key.equals(ResolveAttribute)))
312              {
313                Object p = getResolveParent();
314                if (p != null && p instanceof AttributeSet)
315                  return (((AttributeSet)p).getAttribute(key));
316              }
317                
318        return null;        return null;
319      }      }

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

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