FreeChainXenon/gcc
1
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

86
libjava/classpath/javax/swing/text/DefaultCaret.java
View file

@ -221,9 +221,12 @@ public class DefaultCaret extends Rectangle
if (name.equals("document"))
{
Document oldDoc = (Document) e.getOldValue();
oldDoc.removeDocumentListener(documentListener);
if (oldDoc != null)
oldDoc.removeDocumentListener(documentListener);
Document newDoc = (Document) e.getNewValue();
newDoc.addDocumentListener(documentListener);
if (newDoc != null)
newDoc.addDocumentListener(documentListener);
}
else if (name.equals("editable"))
{
@ -549,7 +552,6 @@ public class DefaultCaret extends Rectangle
*/
public void mousePressed(MouseEvent event)
{
int button = event.getButton();
// The implementation assumes that consuming the event makes the AWT event
// mechanism forget about this event instance and not transfer focus.
@ -562,23 +564,37 @@ public class DefaultCaret extends Rectangle
// - a middle-click positions the caret and pastes the clipboard
// contents.
// - a middle-click when shift is held down is ignored
if (button == MouseEvent.BUTTON1)
if (event.isShiftDown())
moveCaret(event);
else
positionCaret(event);
else if(button == MouseEvent.BUTTON2)
if (event.isShiftDown())
event.consume();
if (SwingUtilities.isLeftMouseButton(event))
{
// Handle the caret.
if (event.isShiftDown() && getDot() != -1)
{
moveCaret(event);
}
else
{
positionCaret(event);
}
// Handle the focus.
if (textComponent != null && textComponent.isEnabled()
&& textComponent.isRequestFocusEnabled())
{
textComponent.requestFocus();
}
// TODO: Handle double click for selecting words.
}
else if(event.getButton() == MouseEvent.BUTTON2)
{
// Special handling for X11-style pasting.
if (! event.isShiftDown())
{
positionCaret(event);
textComponent.paste();
}
else
event.consume();
}
}
/**
@ -708,7 +724,11 @@ public class DefaultCaret extends Rectangle
propertyChangeListener = new PropertyChangeHandler();
textComponent.addPropertyChangeListener(propertyChangeListener);
documentListener = new DocumentHandler();
textComponent.getDocument().addDocumentListener(documentListener);
Document doc = textComponent.getDocument();
if (doc != null)
doc.addDocumentListener(documentListener);
active = textComponent.isEditable() && textComponent.isEnabled();
repaint();
@ -891,10 +911,10 @@ public class DefaultCaret extends Rectangle
}
catch (BadLocationException e)
{
AssertionError ae;
ae = new AssertionError("Unexpected bad caret location: " + dot);
ae.initCause(e);
throw ae;
// Let's ignore that. This shouldn't really occur. But if it
// does (it seems that this happens when the model is mutating),
// it causes no real damage. Uncomment this for debugging.
// e.printStackTrace();
}
if (rect == null)
@ -1128,10 +1148,10 @@ public class DefaultCaret extends Rectangle
}
catch (BadLocationException e)
{
AssertionError ae;
ae = new AssertionError("Unexpected bad caret location: " + dot);
ae.initCause(e);
throw ae;
// Let's ignore that. This shouldn't really occur. But if it
// does (it seems that this happens when the model is mutating),
// it causes no real damage. Uncomment this for debugging.
// e.printStackTrace();
}
if (area != null)
damage(area);
@ -1139,6 +1159,24 @@ public class DefaultCaret extends Rectangle
repaint();
}
/**
* Returns <code>true</code> if this <code>Caret</code> is blinking,
* and <code>false</code> if not. The returned value is independent of
* the visiblity of this <code>Caret</code> as returned by {@link #isVisible()}.
*
* @return <code>true</code> if this <code>Caret</code> is blinking,
* and <code>false</code> if not.
* @see #isVisible()
* @since 1.5
*/
public boolean isActive()
{
if (blinkTimer != null)
return blinkTimer.isRunning();
return false;
}
/**
* Returns <code>true</code> if this <code>Caret</code> is currently visible,
* and <code>false</code> if it is not.