stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8021286: Improve MacOS resourcing

Browse Source 
Reviewed-by: okutsu
This commit is contained in:
Naoto Sato 2013-08-01 14:09:39 -07:00
parent 63af2166ea
commit adf52d0164
7 changed files with 1 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jdk/make/sun/awt/FILES_c_macosx.gmk
View File

@ -1,28 +0,0 @@
#
# Copyright (c) 1995, 2012, 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# 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.
#
FILES_AWT_objc = \
$(TARGDIR)MacOSXResourceBundle.m

29
jdk/make/sun/awt/FILES_export_macosx.gmk
View File

@ -1,29 +0,0 @@
#
# Copyright (c) 1995, 2012, 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. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# 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.
#
# FILES_export definitions for Mac OS X
FILES_export += \
com/apple/resources/MacOSXResourceBundle.java

2
jdk/make/sun/awt/Makefile
View File

@ -145,8 +145,6 @@ ifeq ($(PLATFORM), macosx)
# #
# Files # Files
# #
include FILES_c_macosx.gmk
include FILES_export_macosx.gmk
FILES_objc = $(FILES_AWT_objc) FILES_objc = $(FILES_AWT_objc)
OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM) \ OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM) \

4
jdk/makefiles/CompileNativeLibraries.gmk
View File

@ -558,11 +558,7 @@ endif
ifeq ($(OPENJDK_TARGET_OS),macosx) ifeq ($(OPENJDK_TARGET_OS),macosx)
LIBAWT_FILES += awt_LoadLibrary.c img_colors.c LIBAWT_FILES += awt_LoadLibrary.c img_colors.c
LIBAWT_DIRS += $(JDK_TOPDIR)/src/macosx/native/com/apple/resources
LIBAWT_FILES += awt_LoadLibrary.c MacOSXResourceBundle.m
LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks
LIBAWT_MacOSXResourceBundle.m_CFLAGS:=-O0
endif endif
ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)

4
jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java
View File

@ -37,8 +37,6 @@ import javax.swing.plaf.basic.BasicLookAndFeel;
import sun.swing.*; import sun.swing.*;
import apple.laf.*; import apple.laf.*;
import com.apple.resources.MacOSXResourceBundle;
public class AquaLookAndFeel extends BasicLookAndFeel { public class AquaLookAndFeel extends BasicLookAndFeel {
static final String sOldPropertyPrefix = "com.apple.macos."; // old prefix for things like 'useScreenMenuBar' static final String sOldPropertyPrefix = "com.apple.macos."; // old prefix for things like 'useScreenMenuBar'
static final String sPropertyPrefix = "apple.laf."; // new prefix for things like 'useScreenMenuBar' static final String sPropertyPrefix = "apple.laf."; // new prefix for things like 'useScreenMenuBar'
@ -252,7 +250,7 @@ public class AquaLookAndFeel extends BasicLookAndFeel {
table.setDefaultLocale(Locale.getDefault()); table.setDefaultLocale(Locale.getDefault());
table.addResourceBundle(PKG_PREFIX + "resources.aqua"); table.addResourceBundle(PKG_PREFIX + "resources.aqua");
try { try {
final ResourceBundle aquaProperties = MacOSXResourceBundle.getMacResourceBundle(PKG_PREFIX + "resources.aqua"); final ResourceBundle aquaProperties = ResourceBundle.getBundle(PKG_PREFIX + "resources.aqua");
final Enumeration<String> propertyKeys = aquaProperties.getKeys(); final Enumeration<String> propertyKeys = aquaProperties.getKeys();
while (propertyKeys.hasMoreElements()) { while (propertyKeys.hasMoreElements()) {

110
jdk/src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java
View File

@ -1,110 +0,0 @@
/*
* Copyright (c) 2011, 2012, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
package com.apple.resources;
import java.security.*;
import java.util.PropertyResourceBundle;
import java.util.ResourceBundle;
import java.io.*;
public class MacOSXResourceBundle extends PropertyResourceBundle {
MacOSXResourceBundle(InputStream stream) throws IOException {
super(stream);
}
void setItsParent(ResourceBundle rb) {
setParent(rb);
}
public static ResourceBundle getMacResourceBundle(String baseJavaBundle) throws Exception {
return getMacResourceBundle(baseJavaBundle, null);
}
public static ResourceBundle getMacResourceBundle(String baseJavaBundle, String filename) throws Exception {
LoadNativeBundleAction lnba = new LoadNativeBundleAction(baseJavaBundle, filename);
return (ResourceBundle)java.security.AccessController.doPrivileged(lnba);
}
}
class LoadNativeBundleAction implements PrivilegedExceptionAction {
String mBaseJavaBundle;
String mFilenameOverride;
LoadNativeBundleAction(String baseJavaBundle, String filenameOverride) {
mBaseJavaBundle = baseJavaBundle;
mFilenameOverride = filenameOverride;
}
public Object run() {
java.util.ResourceBundle returnValue = null;
MacOSXResourceBundle macOSrb = null;
// Load the Mac OS X resources.
// Use a base filename if we were given one. Otherwise, we will look for the last piece of the bundle path
// with '.properties' appended. Either way, the native method will take care of the extension.
String filename = mFilenameOverride;
if (filename == null) {
filename = mBaseJavaBundle.substring(mBaseJavaBundle.lastIndexOf('.') + 1);
}
File propsFile = null;
String propertyFileName = getPathToBundleFile(filename);
InputStream stream = null;
try {
propsFile = new File(propertyFileName);
stream = new FileInputStream(propsFile);
stream = new java.io.BufferedInputStream(stream);
macOSrb = new MacOSXResourceBundle(stream);
} catch (Exception e) {
//e.printStackTrace();
//System.out.println("Failed to create resources from application bundle. Using Java-based resources.");
} finally {
try {
if (stream != null) stream.close();
stream = null;
} catch (Exception e) {
e.printStackTrace();
}
}
returnValue = ResourceBundle.getBundle(mBaseJavaBundle);
// If we have a platform-specific bundle, make it the parent of the generic bundle, so failures propagate up to the parent.
if (returnValue != null) {
if (macOSrb != null) {
macOSrb.setItsParent(returnValue);
returnValue = macOSrb;
}
}
return returnValue;
}
private static native String getPathToBundleFile(String filename);
}

110
jdk/src/macosx/native/com/apple/resources/MacOSXResourceBundle.m
View File

@ -1,110 +0,0 @@
/*
* Copyright (c) 2011, 2012, 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. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* 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.
*/
#import <dlfcn.h>
#import <Cocoa/Cocoa.h>
#import <JavaNativeFoundation/JavaNativeFoundation.h>
#ifndef MAXPATHLEN
#define MAXPATHLEN PATH_MAX
#endif
static jboolean
GetPathFromCurrentBinary(char *buf, jint bufsize)
{
Dl_info dlinfo;
dladdr((void *)GetPathFromCurrentBinary, &dlinfo);
if (realpath(dlinfo.dli_fname, buf) == NULL) {
// fprintf(stderr, "Error: realpath(`%s') failed.\n", dlinfo.dli_fname);
return JNI_FALSE;
}
const char *libawt = "lib/libawt.dylib";
int strLen, libawtLen;
strLen = strlen(buf);
libawtLen = strlen(libawt);
if (strLen < libawtLen ||
strcmp(buf + strLen - libawtLen, libawt) != 0) {
return JNI_FALSE;
}
buf[strLen - libawtLen] = '\0';
return JNI_TRUE;
}
#define JAVA_DLL "libjava.dylib"
static jboolean
GetJREPath(char *buf, jint bufsize)
{
/* try to get the path from the current binary, if not, bail to the framework */
if (GetPathFromCurrentBinary(buf, bufsize) == JNI_TRUE) {
/* does the rest of the JRE exist? */
char libjava[MAXPATHLEN];
snprintf(libjava, MAXPATHLEN, "%s/lib/" JAVA_DLL, buf);
if (access(libjava, F_OK) == 0) {
return JNI_TRUE;
}
}
return JNI_FALSE;
}
static NSString *getRunningJavaBundle()
{
char path[MAXPATHLEN];
GetJREPath(path, MAXPATHLEN);
return [[NSString alloc] initWithFormat:@"%@/bundle", [NSString stringWithUTF8String:path]];
}
/*
* Class: com_apple_resources_LoadNativeBundleAction
* Method: getPathToBundleFile
* Signature: (Ljava/lang/String)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL
Java_com_apple_resources_LoadNativeBundleAction_getPathToBundleFile
(JNIEnv *env, jclass klass, jstring filename)
{
jstring returnVal = NULL;
if (filename == NULL) {
return NULL;
}
JNF_COCOA_ENTER(env);
NSBundle *javaBundle = [NSBundle bundleWithPath:getRunningJavaBundle()];
NSString *baseFilename = JNFJavaToNSString(env, filename);
NSString *propertyFilePath = [javaBundle pathForResource:baseFilename ofType:@"properties"];
if (propertyFilePath != nil) {
returnVal = JNFNSToJavaString(env, propertyFilePath);
}
JNF_COCOA_EXIT(env);
return returnVal;
}