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

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

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

revision 1.46 by rabbit78, Mon Jun 20 14:35:53 2005 UTC revision 1.47 by rabbit78, Mon Jun 27 15:35:09 2005 UTC
# Line 1022  public abstract class JComponent extends Line 1022  public abstract class JComponent extends
1022      if (preferredSize != null)      if (preferredSize != null)
1023        prefSize = preferredSize;        prefSize = preferredSize;
1024    
1025      if (ui != null)      else if (ui != null)
1026        {        {
1027          Dimension s = ui.getPreferredSize(this);          Dimension s = ui.getPreferredSize(this);
1028          if (s != null)          if (s != null)
1029            prefSize = s;            prefSize = s;
1030        }        }
1031    
1032      if (prefSize == null)      if (prefSize == null)
1033        prefSize = super.getPreferredSize();        prefSize = super.getPreferredSize();
1034      // make sure that prefSize is not smaller than minSize      // make sure that prefSize is not smaller than minSize

Legend:
Removed from v.1.46  
changed lines
  Added in v.1.47

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