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

167
libjava/classpath/gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
View file

@ -40,20 +40,32 @@ package gnu.java.awt.peer.gtk;
import java.awt.Checkbox;
import java.awt.CheckboxGroup;
import java.awt.peer.CheckboxPeer;
import java.awt.event.ItemEvent;
import java.awt.peer.CheckboxPeer;
import java.util.WeakHashMap;
/**
* This class wraps either a GtkCheckButton or a GtkOptionButton
* depending on if this peer's owner belongs to a CheckboxGroup.
*/
public class GtkCheckboxPeer extends GtkComponentPeer
implements CheckboxPeer
{
// Group from last time it was set.
public GtkCheckboxGroupPeer old_group;
// The CheckboxGroup to which this GtkCheckboxPeer's owner belongs.
public CheckboxGroup current_group;
// The current state of the GTK checkbox.
private boolean currentState;
private boolean currentState;
public native void create (GtkCheckboxGroupPeer group);
public native void nativeSetCheckboxGroup (GtkCheckboxGroupPeer group);
// A map from CheckboxGroup to GSList* GTK option group pointer.
private static WeakHashMap groupMap = new WeakHashMap();
public native void createCheckButton ();
public native void createRadioButton (long groupPointer);
public native void addToGroup (long groupPointer);
public native void removeFromGroup ();
public native void switchToGroup (long groupPointer);
public native void connectSignals ();
/**
@ -68,17 +80,47 @@ public class GtkCheckboxPeer extends GtkComponentPeer
super (c);
}
// FIXME: we must be able to switch between a checkbutton and a
// radiobutton dynamically.
public void create ()
{
Checkbox checkbox = (Checkbox) awtComponent;
CheckboxGroup g = checkbox.getCheckboxGroup ();
old_group = GtkCheckboxGroupPeer.getCheckboxGroupPeer (g);
create (old_group);
current_group = checkbox.getCheckboxGroup ();
if (current_group == null)
{
// Initially we're not part of a group so we're backed by a
// GtkCheckButton.
createCheckButton();
}
else
{
// Initially we're part of a group.
// See if this group is already stored in our map.
Long groupPointer = null;
synchronized (groupMap)
{
groupPointer = (Long) groupMap.get(current_group);
}
if (groupPointer == null)
{
// We don't know about this group. Create a new native
// group pointer for this group and store it in our map.
createRadioButton(0);
}
else
{
// We already know about this group. Pass the
// corresponding native group pointer value to the native
// create method.
createRadioButton(groupPointer.longValue());
}
}
currentState = checkbox.getState();
gtkToggleButtonSetActive(currentState);
gtkButtonSetLabel (checkbox.getLabel ());
String label = checkbox.getLabel();
if (label != null)
gtkButtonSetLabel(label);
}
/**
@ -87,7 +129,7 @@ public class GtkCheckboxPeer extends GtkComponentPeer
* event since events should only be posted for user initiated
* clicks on the GtkCheckButton.
*/
synchronized public void setState (boolean state)
public synchronized void setState (boolean state)
{
if (currentState != state)
{
@ -103,21 +145,87 @@ public class GtkCheckboxPeer extends GtkComponentPeer
public void setCheckboxGroup (CheckboxGroup group)
{
GtkCheckboxGroupPeer gp
= GtkCheckboxGroupPeer.getCheckboxGroupPeer (group);
if (gp != old_group)
if (current_group == null && group != null)
{
if (old_group != null)
old_group.remove (this);
nativeSetCheckboxGroup (gp);
old_group = gp;
// This peer's owner is currently not in a group, and now
// we're adding it to a group. This means that the backing
// GtkWidget will change from a GtkCheckButton to a
// GtkRadioButton.
current_group = group;
// See if the new group is already stored in our map.
Long groupPointer = null;
synchronized (groupMap)
{
groupPointer = (Long) groupMap.get(current_group);
}
if (groupPointer == null)
{
// We don't know about this group. Create a new native
// group pointer for this group and store it in our map.
addToGroup(0);
}
else
{
// We already know about this group. Pass the
// corresponding native group pointer value to the native
// create method.
addToGroup(groupPointer.longValue());
}
}
else if (current_group != null && group == null)
{
// This peer's owner is currently in a group, and now we're
// removing it from a group. This means that the backing
// GtkWidget will change from a GtkRadioButton to a
// GtkCheckButton.
removeFromGroup();
current_group = null;
}
else if (current_group == null && group == null)
{
// This peer's owner is currently not in a group, and we're
// not adding it to a group, so simply return.
return;
}
else if (current_group != group)
{
// This peer's owner is currently in a group, and now we're
// putting it in another group. This means that we must
// remove the backing GtkRadioButton from one group and add it
// to the other group.
current_group = group;
// See if the new group is already stored in our map.
Long groupPointer = null;
synchronized (groupMap)
{
groupPointer = (Long) groupMap.get(current_group);
}
if (groupPointer == null)
{
// We don't know about this group. Create a new native
// group pointer for this group and store it in our map.
switchToGroup(0);
}
else
{
// We already know about this group. Pass the
// corresponding native group pointer value to the native
// create method.
switchToGroup(groupPointer.longValue());
}
}
}
// Override the superclass postItemEvent so that the peer doesn't
// need information that we have.
// called back by native side: item_toggled_cb
synchronized public void postItemEvent(Object item, boolean state)
public synchronized void postItemEvent(Object item, boolean state)
{
// Only fire event is state actually changed.
if (currentState != state)
@ -127,13 +235,20 @@ public class GtkCheckboxPeer extends GtkComponentPeer
state ? ItemEvent.SELECTED : ItemEvent.DESELECTED);
}
}
public void addToGroupMap(long groupPointer)
{
synchronized (groupMap)
{
groupMap.put(current_group, new Long (groupPointer));
}
}
public void dispose ()
{
// Notify the group so that the native state can be cleaned up
// appropriately.
if (old_group != null)
old_group.remove (this);
groupMap.clear();
current_group = null;
currentState = false;
super.dispose ();
}
}