diff options
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java | 11 | ||||
| -rw-r--r-- | libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java | 13 | ||||
| -rw-r--r-- | libjava/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 e9fd646..a0a782a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,14 @@ 2006-06-09 Thomas Fitzsimmons <fitzsim@redhat.com> + * 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 <fitzsim@redhat.com> + * java/lang/String.java, classpath/native/jni/classpath/jcl.h, classpath/native/jni/qt-peer/eventmethods.h, classpath/native/jni/qt-peer/qtmenupeer.cpp, diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java index e1c076c..035819d 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 58b2dec..4e6181f 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 688af00..163fc52 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; } |