OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* java/awt/Container.java: Typo and indentation fixes.

Browse Source 
From-SVN: r76004
This commit is contained in:
Tom Tromey 2004-01-17 00:01:59 +00:00 committed by Tom Tromey
parent b54a271561
commit d440f6424f
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libjava/ChangeLog
View File

@ -1,5 +1,7 @@
2004-01-16 Tom Tromey <tromey@redhat.com>
* java/awt/Container.java: Typo and indentation fixes.
* java/lang/natClassLoader.cc: Moved VMClassLoader methods...
* java/lang/natVMClassLoader.cc: ...here. New file.
* Makefile.in: Rebuilt.

38
libjava/java/awt/Container.java
View File

@ -1,5 +1,5 @@
/* Container.java -- parent container class in AWT
Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation
Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation
This file is part of GNU Classpath.
@ -1516,7 +1516,7 @@ public class Container extends Component
(ACCESSIBLE_CHILD_PROPERTY, e.getChild(), null);
}
} // class AccessibleContainerHandler
} // class AccessibleAWTPanel
} // class AccessibleAWTContainer
} // class Container
/**
@ -1562,26 +1562,26 @@ class LightweightDispatcher implements Serializable
Component candidate = mouseEventTarget;
boolean candidate_is_container_with_children =
((candidate != null)
&& (candidate instanceof Container)
&& (((Container)candidate).getComponentCount () > 0));
((candidate != null)
&& (candidate instanceof Container)
&& (((Container)candidate).getComponentCount () > 0));
boolean candidate_does_not_contain_point =
((candidate != null)
&& (! candidate.contains (x - candidate.getX (),
((candidate != null)
&& (! candidate.contains (x - candidate.getX (),
y - candidate.getY ())));
if (candidate == null
|| candidate_is_container_with_children
|| candidate_does_not_contain_point)
{
{
// Try to reacquire.
candidate = nativeContainer.findComponentAt (x, y);
}
}
if (mouseEventTarget != null
&& mouseEventTarget != candidate)
{
{
int nx = x - mouseEventTarget.getX ();
int ny = y - mouseEventTarget.getY ();
MouseEvent exited = new MouseEvent (mouseEventTarget,
@ -1594,15 +1594,15 @@ class LightweightDispatcher implements Serializable
me.getButton ());
mouseEventTarget.dispatchEvent (exited);
mouseEventTarget = null;
}
}
if (candidate != null)
{
{
// Possibly set new state.
if (candidate.isLightweight()
&& candidate != nativeContainer
&& candidate != mouseEventTarget)
{
{
mouseEventTarget = candidate;
@ -1620,16 +1620,16 @@ class LightweightDispatcher implements Serializable
me.getButton ());
mouseEventTarget.dispatchEvent (entered);
}
}
}
}
boolean handleEvent (AWTEvent e)
{
if ((eventMask & e.getID ()) == 0)
return false;
return false;
if (e instanceof MouseEvent)
{
{
MouseEvent me = (MouseEvent) e;
acquireComponentForMouseEvent (me);
@ -1640,11 +1640,11 @@ class LightweightDispatcher implements Serializable
mouseEventTarget.dispatchEvent (me);
me.setSource (oldSource);
}
}
}
else if (e instanceof KeyEvent && focus != null)
{
{
focus.processKeyEvent ((KeyEvent) e);
}
}
return e.isConsumed();
}