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

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

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

revision 1.15.2.9 by gnu_andrew, Thu Nov 3 05:14:24 2005 UTC revision 1.15.2.10 by gnu_andrew, Sun Nov 27 21:00:38 2005 UTC
# Line 132  public class UIManager implements Serial Line 132  public class UIManager implements Serial
132        
133    static UIDefaults currentUIDefaults;    static UIDefaults currentUIDefaults;
134    
135      /**
136       * UIDefaults set by the user.
137       */
138      static UIDefaults userUIDefaults;
139    
140    /** Property change listener mechanism. */    /** Property change listener mechanism. */
141    static SwingPropertyChangeSupport listeners    static SwingPropertyChangeSupport listeners
142        = new SwingPropertyChangeSupport(UIManager.class);        = new SwingPropertyChangeSupport(UIManager.class);
# Line 305  public class UIManager implements Serial Line 310  public class UIManager implements Serial
310     */     */
311    public static Object get(Object key)    public static Object get(Object key)
312    {    {
313      return getLookAndFeelDefaults().get(key);      Object val = null;
314        if (userUIDefaults != null)
315          val = userUIDefaults.get(key);
316        if (val == null)
317          val = getLookAndFeelDefaults().get(key);
318        return val;
319    }    }
320    
321    /**    /**
# Line 318  public class UIManager implements Serial Line 328  public class UIManager implements Serial
328     */     */
329    public static Object get(Object key, Locale locale)    public static Object get(Object key, Locale locale)
330    {    {
331      return getLookAndFeelDefaults().get(key ,locale);      Object val = null;
332        if (userUIDefaults != null)
333          val = userUIDefaults.get(key, locale);
334        if (val == null)
335          val = getLookAndFeelDefaults().get(key, locale);
336        return val;
337    }    }
338    
339    /**    /**
# Line 329  public class UIManager implements Serial Line 344  public class UIManager implements Serial
344     */     */
345    public static boolean getBoolean(Object key)    public static boolean getBoolean(Object key)
346    {    {
347      Boolean value = (Boolean) getLookAndFeelDefaults().get(key);      Boolean value = (Boolean) get(key);
348      return value != null ? value.booleanValue() : false;      return value != null ? value.booleanValue() : false;
349    }    }
350        
# Line 341  public class UIManager implements Serial Line 356  public class UIManager implements Serial
356     */     */
357    public static boolean getBoolean(Object key, Locale locale)    public static boolean getBoolean(Object key, Locale locale)
358    {    {
359      Boolean value = (Boolean) getLookAndFeelDefaults().get(key, locale);      Boolean value = (Boolean) get(key, locale);
360      return value != null ? value.booleanValue() : false;      return value != null ? value.booleanValue() : false;
361    }    }
362            
# Line 350  public class UIManager implements Serial Line 365  public class UIManager implements Serial
365     */     */
366    public static Border getBorder(Object key)    public static Border getBorder(Object key)
367    {    {
368      return (Border) getLookAndFeelDefaults().get(key);      return (Border) get(key);
369    }    }
370            
371    /**    /**
# Line 360  public class UIManager implements Serial Line 375  public class UIManager implements Serial
375     */     */
376    public static Border getBorder(Object key, Locale locale)    public static Border getBorder(Object key, Locale locale)
377    {    {
378      return (Border) getLookAndFeelDefaults().get(key, locale);      return (Border) get(key, locale);
379    }    }
380            
381    /**    /**
# Line 368  public class UIManager implements Serial Line 383  public class UIManager implements Serial
383     */     */
384    public static Color getColor(Object key)    public static Color getColor(Object key)
385    {    {
386      return (Color) getLookAndFeelDefaults().get(key);      return (Color) get(key);
387    }    }
388    
389    /**    /**
# Line 376  public class UIManager implements Serial Line 391  public class UIManager implements Serial
391     */     */
392    public static Color getColor(Object key, Locale locale)    public static Color getColor(Object key, Locale locale)
393    {    {
394      return (Color) getLookAndFeelDefaults().get(key);      return (Color) get(key);
395    }    }
396    
397    /**    /**
# Line 405  public class UIManager implements Serial Line 420  public class UIManager implements Serial
420     */     */
421    public static Dimension getDimension(Object key)    public static Dimension getDimension(Object key)
422    {    {
423      return (Dimension) getLookAndFeelDefaults().get(key);      return (Dimension) get(key);
424    }    }
425    
426    /**    /**
# Line 413  public class UIManager implements Serial Line 428  public class UIManager implements Serial
428     */     */
429    public static Dimension getDimension(Object key, Locale locale)    public static Dimension getDimension(Object key, Locale locale)
430    {    {
431      return (Dimension) getLookAndFeelDefaults().get(key, locale);      return (Dimension) get(key, locale);
432    }    }
433    
434    /**    /**
# Line 426  public class UIManager implements Serial Line 441  public class UIManager implements Serial
441     */     */
442    public static Font getFont(Object key)    public static Font getFont(Object key)
443    {    {
444      return (Font) getLookAndFeelDefaults().get(key);      return (Font) get(key);
445    }    }
446    
447    /**    /**
# Line 439  public class UIManager implements Serial Line 454  public class UIManager implements Serial
454     */     */
455    public static Font getFont(Object key, Locale locale)    public static Font getFont(Object key, Locale locale)
456    {    {
457      return (Font) getLookAndFeelDefaults().get(key ,locale);      return (Font) get(key ,locale);
458    }    }
459    
460    /**    /**
# Line 447  public class UIManager implements Serial Line 462  public class UIManager implements Serial
462     */     */
463    public static Icon getIcon(Object key)    public static Icon getIcon(Object key)
464    {    {
465      return (Icon) getLookAndFeelDefaults().get(key);      return (Icon) get(key);
466    }    }
467        
468    /**    /**
# Line 455  public class UIManager implements Serial Line 470  public class UIManager implements Serial
470     */     */
471    public static Icon getIcon(Object key, Locale locale)    public static Icon getIcon(Object key, Locale locale)
472    {    {
473      return (Icon) getLookAndFeelDefaults().get(key, locale);      return (Icon) get(key, locale);
474    }    }
475        
476    /**    /**
# Line 463  public class UIManager implements Serial Line 478  public class UIManager implements Serial
478     */     */
479    public static Insets getInsets(Object key)    public static Insets getInsets(Object key)
480    {    {
481      return getLookAndFeelDefaults().getInsets(key);      Object o = get(key);
482        if (o instanceof Insets)
483          return (Insets) o;
484        else
485          return null;
486    }    }
487    
488    /**    /**
# Line 471  public class UIManager implements Serial Line 490  public class UIManager implements Serial
490     */     */
491    public static Insets getInsets(Object key, Locale locale)    public static Insets getInsets(Object key, Locale locale)
492    {    {
493      return getLookAndFeelDefaults().getInsets(key, locale);      Object o = get(key, locale);
494        if (o instanceof Insets)
495          return (Insets) o;
496        else
497          return null;
498    }    }
499    
500    /**    /**
# Line 487  public class UIManager implements Serial Line 510  public class UIManager implements Serial
510    
511    public static int getInt(Object key)    public static int getInt(Object key)
512    {    {
513      Integer x = (Integer) getLookAndFeelDefaults().get(key);      Integer x = (Integer) get(key);
514      if (x == null)      if (x == null)
515        return 0;        return 0;
516      return x.intValue();      return x.intValue();
# Line 495  public class UIManager implements Serial Line 518  public class UIManager implements Serial
518    
519    public static int getInt(Object key, Locale locale)    public static int getInt(Object key, Locale locale)
520    {    {
521      Integer x = (Integer) getLookAndFeelDefaults().get(key, locale);      Integer x = (Integer) get(key, locale);
522      if (x == null)      if (x == null)
523        return 0;        return 0;
524      return x.intValue();      return x.intValue();
# Line 529  public class UIManager implements Serial Line 552  public class UIManager implements Serial
552     */     */
553    public static String getString(Object key)    public static String getString(Object key)
554    {    {
555      return (String) getLookAndFeelDefaults().get(key);      return (String) get(key);
556    }    }
557        
558    /**    /**
# Line 537  public class UIManager implements Serial Line 560  public class UIManager implements Serial
560     */     */
561    public static String getString(Object key, Locale locale)    public static String getString(Object key, Locale locale)
562    {    {
563      return (String) getLookAndFeelDefaults().get(key, locale);      return (String) get(key, locale);
564    }    }
565        
566    /**    /**
# Line 562  public class UIManager implements Serial Line 585  public class UIManager implements Serial
585     */     */
586    public static ComponentUI getUI(JComponent target)    public static ComponentUI getUI(JComponent target)
587    {    {
588      return getLookAndFeelDefaults().getUI(target);      ComponentUI ui = null;
589        if (userUIDefaults != null
590            && userUIDefaults.get(target.getUIClassID()) != null)
591          ui = userUIDefaults.getUI(target);
592        if (ui == null)
593          ui = currentUIDefaults.getUI(target);
594        return ui;
595    }    }
596    
597    /**    /**
# Line 591  public class UIManager implements Serial Line 620  public class UIManager implements Serial
620     */     */
621    public static Object put(Object key, Object value)    public static Object put(Object key, Object value)
622    {    {
623      return getLookAndFeelDefaults().put(key,value);      Object old = get(key);
624        if (userUIDefaults == null)
625          userUIDefaults = new UIDefaults();
626        userUIDefaults.put(key, value);
627        return old;
628    }    }
629    
630    /**    /**
# Line 617  public class UIManager implements Serial Line 650  public class UIManager implements Serial
650    {    {
651      if (newLookAndFeel != null && ! newLookAndFeel.isSupportedLookAndFeel())      if (newLookAndFeel != null && ! newLookAndFeel.isSupportedLookAndFeel())
652        throw new UnsupportedLookAndFeelException(newLookAndFeel.getName());        throw new UnsupportedLookAndFeelException(newLookAndFeel.getName());
       
653      LookAndFeel oldLookAndFeel = currentLookAndFeel;      LookAndFeel oldLookAndFeel = currentLookAndFeel;
654      if (oldLookAndFeel != null)      if (oldLookAndFeel != null)
655        oldLookAndFeel.uninitialize();        oldLookAndFeel.uninitialize();

Legend:
Removed from v.1.15.2.9  
changed lines
  Added in v.1.15.2.10

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