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

Imported GNU Classpath gcj-import-20051117.

Browse source 
* gnu/java/net/protocol/file/Connection.java: Removed, fully merged.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r107153
This commit is contained in:
Mark Wielaard 2005-11-18 00:59:33 +00:00
parent fb3a09c214
commit ca9e049bc1
102 changed files with 6716 additions and 1722 deletions
Download patch file Download diff file Expand all files Collapse all files

33
libjava/classpath/javax/swing/text/BoxView.java
View file

@ -476,7 +476,6 @@ public class BoxView
protected View getViewAtPoint(int x, int y, Rectangle r)
{
View result = null;
int count = getViewCount();
Rectangle copy = new Rectangle(r);
@ -490,7 +489,9 @@ public class BoxView
break;
}
}
if (result == null && count > 0)
return getView(count - 1);
return result;
}
@ -498,10 +499,12 @@ public class BoxView
* Computes the allocation for a child <code>View</code>. The parameter
* <code>a</code> stores the allocation of this <code>CompositeView</code>
* and is then adjusted to hold the allocation of the child view.
*
* @param index the index of the child <code>View</code>
* @param a the allocation of this <code>CompositeView</code> before the
* call, the allocation of the child on exit
*
* @param index
* the index of the child <code>View</code>
* @param a
* the allocation of this <code>CompositeView</code> before the
* call, the allocation of the child on exit
*/
protected void childAllocation(int index, Rectangle a)
{
@ -737,4 +740,22 @@ public class BoxView
yLayoutValid = false;
super.preferenceChanged(child, width, height);
}
/**
* Maps the document model position <code>pos</code> to a Shape
* in the view coordinate space. This method overrides CompositeView's
* method to make sure the children are allocated properly before
* calling the super's behaviour.
*/
public Shape modelToView(int pos, Shape a, Position.Bias bias)
throws BadLocationException
{
// Make sure everything is allocated properly and then call super
if (!isAllocationValid())
{
Rectangle bounds = a.getBounds();
setSize(bounds.width, bounds.height);
}
return super.modelToView(pos, a, bias);
}
}