From 1bc49a5eeadc62028665b7a35979d23e4a26dd63 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Fri, 9 Jun 2006 21:22:38 +0000 Subject: [PATCH] 2006-06-09 Thomas Fitzsimmons * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java (getDefaultScreenDevice): Remove unnecessary GCJ local hack. * gnu/java/awt/peer/gtk/GtkToolkit.java (getSystemEventQueueImpl): Likewise. * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (registerFormat): Likewise. From-SVN: r114521 --- libjava/ChangeLog | 9 +++++++++ .../java/awt/peer/gtk/GdkGraphicsEnvironment.java | 11 +---------- .../gnu/java/awt/peer/gtk/GdkPixbufDecoder.java | 13 +------------ .../classpath/gnu/java/awt/peer/gtk/GtkToolkit.java | 12 +----------- 4 files changed, 12 insertions(+), 33 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e9fd6467220..a0a782ab486 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2006-06-09 Thomas Fitzsimmons + + * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java + (getDefaultScreenDevice): Remove unnecessary GCJ local hack. + * gnu/java/awt/peer/gtk/GtkToolkit.java (getSystemEventQueueImpl): + Likewise. + * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (registerFormat): + Likewise. + 2006-06-09 Thomas Fitzsimmons * java/lang/String.java, classpath/native/jni/classpath/jcl.h, diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java index e1c076c042a..035819d1c4b 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java @@ -88,22 +88,13 @@ public class GdkGraphicsEnvironment extends GraphicsEnvironment if (GraphicsEnvironment.isHeadless ()) throw new HeadlessException (); - // GCJ LOCAL: workaround a GCJ problem accessing - // GdkGraphicsEnvironment.class - try - { - synchronized (Class.forName ("gnu.java.awt.peer.gtk.GdkGraphicsEnvironment")) + synchronized (GdkGraphicsEnvironment.class) { if (defaultDevice == null) { defaultDevice = nativeGetDefaultScreenDevice(); } } - } - catch (Exception e) - { - e.printStackTrace(); - } return defaultDevice; } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java index 58b2decc527..4e6181f0e58 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java @@ -247,23 +247,12 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder public static ImageFormatSpec registerFormat(String name, boolean writable) { ImageFormatSpec ifs = new ImageFormatSpec(name, writable); - - // GCJ LOCAL: workaround a GCJ problem accessing - // GdkPixbufDecoder.class - try - { - synchronized(Class.forName ("gnu.java.awt.peer.gtk.GdkPixbufDecoder")) + synchronized(GdkPixbufDecoder.class) { if (imageFormatSpecs == null) imageFormatSpecs = new ArrayList(); imageFormatSpecs.add(ifs); } - } - catch (Exception e) - { - e.printStackTrace(); - } - return ifs; } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java index 688af00e445..163fc52f78a 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java @@ -536,23 +536,13 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit protected EventQueue getSystemEventQueueImpl() { - // GCJ LOCAL: workaround a GCJ problem accessing - // GtkToolkit.class - try - { - synchronized (Class.forName ("gnu.java.awt.peer.gtk.GtkToolkit")) + synchronized (GtkToolkit.class) { if (q == null) { q = new EventQueue(); } } - } - catch (Exception e) - { - e.printStackTrace(); - } - return q; }