diff options
author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-09 21:22:38 +0000 |
---|---|---|
committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-09 21:22:38 +0000 |
commit | 2cca7d61fb1ac27adf4b98db3696d99d0da79c8f (patch) | |
tree | a43f4e764414b21f8b6dbe754c3404ebb6b6ebbd /libjava/classpath | |
parent | d678a061a6f8aa28c05588bb5c4a3ffe6af495c9 (diff) |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114521 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath')
3 files changed, 3 insertions, 33 deletions
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; } |