procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported GNU Classpath 0.92

Browse source 
2006-08-14  Mark Wielaard  <mark@klomp.org>

       Imported GNU Classpath 0.92
       * HACKING: Add more importing hints. Update automake version
       requirement.

       * configure.ac (gconf-peer): New enable AC argument.
       Add --disable-gconf-peer and --enable-default-preferences-peer
       to classpath configure when gconf is disabled.
       * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
       gnu/java/awt/dnd/peer/gtk to bc. Classify
       gnu/java/security/Configuration.java as generated source file.

       * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
       gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
       gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
       gnu/java/lang/management/VMThreadMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryMXBeanImpl.java,
       gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
       classes.
       * java/lang/management/VMManagementFactory.java: Likewise.
       * java/net/VMURLConnection.java: Likewise.
       * gnu/java/nio/VMChannel.java: Likewise.

       * java/lang/Thread.java (getState): Add stub implementation.
       * java/lang/Class.java (isEnum): Likewise.
       * java/lang/Class.h (isEnum): Likewise.

       * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.

       * javax/naming/spi/NamingManager.java: New override for StackWalker
       functionality.

       * configure, sources.am, Makefile.in, gcj/Makefile.in,
       include/Makefile.in, testsuite/Makefile.in: Regenerated.

From-SVN: r116139
This commit is contained in:
Mark Wielaard 2006-08-14 23:12:35 +00:00
parent abab460491
commit ac1ed908de
1294 changed files with 99479 additions and 35933 deletions
Download patch file Download diff file Expand all files Collapse all files

82
libjava/classpath/javax/swing/text/CompositeView.java
View file

@ -217,25 +217,43 @@ public abstract class CompositeView
public Shape modelToView(int pos, Shape a, Position.Bias bias)
throws BadLocationException
{
int childIndex = getViewIndex(pos, bias);
if (childIndex == -1)
throw new BadLocationException("Position " + pos + " is not represented by view.", pos);
boolean backward = bias == Position.Bias.Backward;
int testpos = backward ? Math.max(0, pos - 1) : pos;
Shape ret = null;
View child = getView(childIndex);
Shape childAlloc = getChildAllocation(childIndex, a);
if (childAlloc == null)
ret = createDefaultLocation(a, bias);
Shape result = child.modelToView(pos, childAlloc, bias);
if (result != null)
ret = result;
else
ret = createDefaultLocation(a, bias);
if (! backward || testpos >= getStartOffset())
{
int childIndex = getViewIndexAtPosition(testpos);
if (childIndex != -1 && childIndex < getViewCount())
{
View child = getView(childIndex);
if (child != null && testpos >= child.getStartOffset()
&& testpos < child.getEndOffset())
{
Shape childAlloc = getChildAllocation(childIndex, a);
if (childAlloc != null)
{
ret = child.modelToView(pos, childAlloc, bias);
// Handle corner case.
if (ret == null && child.getEndOffset() == pos)
{
childIndex++;
if (childIndex < getViewCount())
{
child = getView(childIndex);
childAlloc = getChildAllocation(childIndex, a);
ret = child.modelToView(pos, childAlloc, bias);
}
}
}
}
}
else
{
throw new BadLocationException("Position " + pos
+ " is not represented by view.", pos);
}
}
return ret;
}
@ -378,7 +396,10 @@ public abstract class CompositeView
{
if (b == Position.Bias.Backward && pos != 0)
pos -= 1;
return getViewIndexAtPosition(pos);
int i = -1;
if (pos >= getStartOffset() && pos < getEndOffset())
i = getViewIndexAtPosition(pos);
return i;
}
/**
@ -446,9 +467,13 @@ public abstract class CompositeView
*/
protected View getViewAtPosition(int pos, Rectangle a)
{
View view = null;
int i = getViewIndexAtPosition(pos);
View view = children[i];
childAllocation(i, a);
if (i >= 0 && i < getViewCount() && a != null)
{
view = getView(i);
childAllocation(i, a);
}
return view;
}
@ -464,17 +489,10 @@ public abstract class CompositeView
*/
protected int getViewIndexAtPosition(int pos)
{
int index = -1;
for (int i = 0; i < children.length; i++)
{
if (children[i].getStartOffset() <= pos
&& children[i].getEndOffset() > pos)
{
index = i;
break;
}
}
return index;
// We have a 1:1 mapping of elements to views here, so we forward
// this to the element.
Element el = getElement();
return el.getElementIndex(pos);
}
/**