Merge
This commit is contained in:
commit
ba6e52f984
jdk
src/solaris
test/sun/java2d/pipe
@ -44,11 +44,27 @@ import java.awt.peer.DesktopPeer;
|
||||
public class XDesktopPeer implements DesktopPeer {
|
||||
|
||||
private static boolean nativeLibraryLoaded = false;
|
||||
static {
|
||||
nativeLibraryLoaded = init();
|
||||
private static boolean initExecuted = false;
|
||||
|
||||
private static void initWithLock(){
|
||||
XToolkit.awtLock();
|
||||
try {
|
||||
if (!initExecuted) {
|
||||
nativeLibraryLoaded = init();
|
||||
}
|
||||
} finally {
|
||||
initExecuted = true;
|
||||
XToolkit.awtUnlock();
|
||||
}
|
||||
}
|
||||
|
||||
//package-private
|
||||
XDesktopPeer(){
|
||||
initWithLock();
|
||||
}
|
||||
|
||||
static boolean isDesktopSupported() {
|
||||
initWithLock();
|
||||
return nativeLibraryLoaded;
|
||||
}
|
||||
|
||||
@ -83,12 +99,17 @@ public class XDesktopPeer implements DesktopPeer {
|
||||
}
|
||||
|
||||
private void launch(URI uri) throws IOException {
|
||||
if (!nativeLibraryLoaded) {
|
||||
throw new IOException("Failed to load native libraries.");
|
||||
}
|
||||
|
||||
byte[] uriByteArray = ( uri.toString() + '\0' ).getBytes();
|
||||
boolean result = gnome_url_show(uriByteArray);
|
||||
boolean result = false;
|
||||
XToolkit.awtLock();
|
||||
try {
|
||||
if (!nativeLibraryLoaded) {
|
||||
throw new IOException("Failed to load native libraries.");
|
||||
}
|
||||
result = gnome_url_show(uriByteArray);
|
||||
} finally {
|
||||
XToolkit.awtUnlock();
|
||||
}
|
||||
if (!result) {
|
||||
throw new IOException("Failed to show URI:" + uri);
|
||||
}
|
||||
|
@ -48,9 +48,15 @@ int init(){
|
||||
}
|
||||
dlerror(); /* Clear errors */
|
||||
gnome_vfs_init = (GNOME_VFS_INIT_TYPE*)dlsym(vfs_handle, "gnome_vfs_init");
|
||||
if (gnome_vfs_init == NULL){
|
||||
#ifdef INTERNAL_BUILD
|
||||
fprintf(stderr, "dlsym( gnome_vfs_init) returned NULL\n");
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
if ((errmsg = dlerror()) != NULL) {
|
||||
#ifdef INTERNAL_BUILD
|
||||
fprintf(stderr, "can not find symble gnome_vfs_init\n");
|
||||
fprintf(stderr, "can not find symbol gnome_vfs_init %s \n", errmsg);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
@ -1,3 +1,26 @@
|
||||
/*
|
||||
* Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test %W% %E%
|
||||
* @bug 6504874
|
||||
|
Loading…
x
Reference in New Issue
Block a user