FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported GNU Classpath 0.19 + gcj-import-20051115.

Browse source 
* sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.

From-SVN: r107049
This commit is contained in:
Mark Wielaard 2005-11-15 23:20:01 +00:00
parent 02e549bfaa
commit 8f523f3a10
1241 changed files with 97711 additions and 25284 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libjava/classpath/javax/swing/SwingUtilities.java
View file

@ -840,7 +840,7 @@ public class SwingUtilities
iconR.width = icon.getIconWidth();
iconR.height = icon.getIconHeight();
}
if (text == null)
if (text == null || text.equals(""))
{
textIconGap = 0;
textR.width = 0;
@ -890,7 +890,7 @@ public class SwingUtilities
iconR.y = 0;
textR.y = (horizontalTextPosition == CENTER
? iconR.height + textIconGap
: iconR.height - textR.height);
: Math.max(iconR.height - textR.height, 0));
break;
case CENTER:
int centerLine = Math.max(textR.height, iconR.height) / 2;
@ -1116,7 +1116,7 @@ public class SwingUtilities
* <pre>
* [{@link javax.swing.JComponent#getActionMap()}]
* --&gt; [{@link javax.swing.ActionMap}]
* parent --&gt; [{@link javax.swing.text.KeymapActionMap}]
* parent --&gt; [{@link javax.swing.text.JTextComponent.KeymapActionMap}]
* parent --&gt; [{@link javax.swing.plaf.ActionMapUIResource}]
* </pre>
*
@ -1138,14 +1138,12 @@ public class SwingUtilities
else
{
ActionMap parent = child.getParent();
while(parent != null)
while (parent != null && !(parent instanceof ActionMapUIResource))
{
child = parent;
parent = child.getParent();
}
if (child != null)
child.setParent(uiActionMap);
child.setParent(uiActionMap);
}
}
@ -1159,7 +1157,7 @@ public class SwingUtilities
* <pre>
* [{@link javax.swing.JComponent#getInputMap()}]
* --&gt; [{@link javax.swing.InputMap}]
* parent --&gt; [{@link javax.swing.text.KeymapWrapper}]
* parent --&gt; [{@link javax.swing.text.JTextComponent.KeymapWrapper}]
* parent --&gt; [{@link javax.swing.plaf.InputMapUIResource}]
* </pre>
*
@ -1181,11 +1179,13 @@ public class SwingUtilities
component.setInputMap(condition, uiInputMap);
else
{
while(child.getParent() != null
&& !(child.getParent() instanceof InputMapUIResource))
child = child.getParent();
if (child != null)
child.setParent(uiInputMap);
InputMap parent = child.getParent();
while (parent != null && !(parent instanceof InputMapUIResource))
{
child = parent;
parent = parent.getParent();
}
child.setParent(uiInputMap);
}
}