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

2006-06-09 Thomas Fitzsimmons <fitzsim@redhat.com>

Browse Source 
* 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
This commit is contained in:
Thomas Fitzsimmons 2006-06-09 21:22:38 +00:00 committed by Thomas Fitzsimmons
parent cd75853e1d
commit 1bc49a5eea
4 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libjava/ChangeLog
View File

@ -1,3 +1,12 @@
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> 2006-06-09 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/lang/String.java, classpath/native/jni/classpath/jcl.h, * java/lang/String.java, classpath/native/jni/classpath/jcl.h,

11
libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
View File

@ -88,22 +88,13 @@ public class GdkGraphicsEnvironment extends GraphicsEnvironment
if (GraphicsEnvironment.isHeadless ()) if (GraphicsEnvironment.isHeadless ())
throw new HeadlessException (); throw new HeadlessException ();
// GCJ LOCAL: workaround a GCJ problem accessing synchronized (GdkGraphicsEnvironment.class)
// GdkGraphicsEnvironment.class
try
{
synchronized (Class.forName ("gnu.java.awt.peer.gtk.GdkGraphicsEnvironment"))
{ {
if (defaultDevice == null) if (defaultDevice == null)
{ {
defaultDevice = nativeGetDefaultScreenDevice(); defaultDevice = nativeGetDefaultScreenDevice();
} }
} }
}
catch (Exception e)
{
e.printStackTrace();
}
return defaultDevice; return defaultDevice;
} }

13
libjava/classpath/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
View File

@ -247,23 +247,12 @@ public class GdkPixbufDecoder extends gnu.java.awt.image.ImageDecoder
public static ImageFormatSpec registerFormat(String name, boolean writable) public static ImageFormatSpec registerFormat(String name, boolean writable)
{ {
ImageFormatSpec ifs = new ImageFormatSpec(name, writable); ImageFormatSpec ifs = new ImageFormatSpec(name, writable);
synchronized(GdkPixbufDecoder.class)
// GCJ LOCAL: workaround a GCJ problem accessing
// GdkPixbufDecoder.class
try
{
synchronized(Class.forName ("gnu.java.awt.peer.gtk.GdkPixbufDecoder"))
{ {
if (imageFormatSpecs == null) if (imageFormatSpecs == null)
imageFormatSpecs = new ArrayList(); imageFormatSpecs = new ArrayList();
imageFormatSpecs.add(ifs); imageFormatSpecs.add(ifs);
} }
}
catch (Exception e)
{
e.printStackTrace();
}
return ifs; return ifs;
} }

12
libjava/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java
View File

@ -536,23 +536,13 @@ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit
protected EventQueue getSystemEventQueueImpl() protected EventQueue getSystemEventQueueImpl()
{ {
// GCJ LOCAL: workaround a GCJ problem accessing synchronized (GtkToolkit.class)
// GtkToolkit.class
try
{
synchronized (Class.forName ("gnu.java.awt.peer.gtk.GtkToolkit"))
{ {
if (q == null) if (q == null)
{ {
q = new EventQueue(); q = new EventQueue();
} }
} }
}
catch (Exception e)
{
e.printStackTrace();
}
return q; return q;
} }