Merge

.hgtags

@@ -158,3 +158,6 @@ ddfe5562f61f54ed2121ac0c73b688b94f3e66b5 jdk8-b32
 29b680393f33bf953688c17d93aca7a870ca4024 jdk8-b34
 2e3e1356ffbddb2ae95c08da72830ba9ab8b3181 jdk8-b35
 45da9cb055ee258dc09e69c1718e27eadea38e45 jdk8-b36
+9e82ac15ab80370d6e021aea7b98c7c9626adb5e jdk8-b37
+c45f3509a70796c54b48f32910d1caf435763416 jdk8-b38
+b6f52911752110a2889681923992c7a0baa52ccc jdk8-b39

make/common/Defs-macosx.gmk

 #
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
@@ -111,10 +111,10 @@ CC_OPT          = $(CC_OPT/$(OPTIMIZATION_LEVEL))
 
 # For all platforms, do not omit the frame pointer register usage. 
 #    We need this frame pointer to make it easy to walk the stacks.
-#    This should be the default on X86, but ia64 and amd64 may not have this
-#    as the default.
-CFLAGS_REQUIRED_amd64   += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
-LDFLAGS_COMMON_amd64    += -m64
+#    This should be the default on X86, but ia64, and x86_64
+#    may not have this as the default.
+CFLAGS_REQUIRED_x86_64  += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
+LDFLAGS_COMMON_x86_64   += -m64
 CFLAGS_REQUIRED_i586    += -m32 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
 LDFLAGS_COMMON_i586     += -m32
 CFLAGS_REQUIRED_ia64    += -m64 -fno-omit-frame-pointer -D_LITTLE_ENDIAN
@@ -168,7 +168,7 @@ PIC_CODE_LARGE = -fPIC
 PIC_CODE_SMALL = -fpic
 GLOBAL_KPIC = $(PIC_CODE_LARGE)
 CFLAGS_COMMON   += $(GLOBAL_KPIC) $(GCC_WARNINGS)
-ifeq ($(ARCH), amd64)
+ifeq ($(ARCH), x86_64)
  CFLAGS_COMMON += -pipe
 endif
 

make/common/Release-macosx.gmk

@@ -29,14 +29,14 @@ JA_DIRNAME=ja_JP.UTF-8
 
 # Defines the release targets for Mac OS X build products
 
-JDK_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-bundle/$(THIS_JDK_VERSION).jdk/Contents
-JRE_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2re-bundle/$(THIS_JDK_VERSION).jre/Contents
+JDK_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents
+JRE_BUNDLE_DIR = $(ABS_OUTPUTDIR)/j2re-bundle/jre$(JDK_VERSION).jre/Contents
 
 MACOSX_SRC	 = $(JDK_TOPDIR)/src/macosx
 
 BUNDLE_ID ?= net.java.openjdk
-BUNLDE_ID_JRE ?= $(BUNDLE_ID).jre
-BUNLDE_ID_JDK ?= $(BUNDLE_ID).jdk
+BUNDLE_ID_JRE ?= $(BUNDLE_ID).jre
+BUNDLE_ID_JDK ?= $(BUNDLE_ID).jdk
 
 BUNDLE_NAME ?= OpenJDK $(JDK_MINOR_VERSION)
 BUNDLE_NAME_JRE ?= $(BUNDLE_NAME)

make/common/Release.gmk

@@ -156,6 +156,7 @@ JDK_MAN_PAGES =            \
         jstack.1           \
         jstat.1            \
         jstatd.1           \
+        jvisualvm.1        \
 	native2ascii.1     \
 	rmic.1             \
         schemagen.1        \
@@ -1311,8 +1312,8 @@ $(TEMP_PREV_JDK_COMPARISON): install-previous-jdk $(DIRDIFF_JARFILE)
 	@$(java-vm-cleanup)
 
 # Clean up names in the messages printed out
-CAT_FILTER = $(SED) -e "s@$(JDK_IMAGE_DIR)@JDK_IMAGE@g" \
-	            -e "s@$(JRE_IMAGE_DIR)@JRE_IMAGE@g"
+CAT_FILTER = $(SED) -e "s|$(JDK_IMAGE_DIR)|JDK_IMAGE|g" \
+	            -e "s|$(JRE_IMAGE_DIR)|JRE_IMAGE|g"
 
 # Report on the jre image comparison
 compare-image-jre: $(TEMP_PREV_JRE_COMPARISON)

make/common/shared/Platform.gmk

 #
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 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
@@ -264,7 +264,7 @@ ifeq ($(PLATFORM), macosx)
                     echo sparc \
                     ;; \
                 x86_64) \
-                    echo amd64 \
+                    echo x86_64 \
                     ;; \
                 universal) \
                     echo universal \

make/launchers/Makefile.launcher

@@ -81,6 +81,7 @@ endif
 # SA tools
 ifeq ($(PROGRAM),jstack)
   SA_TOOL=true
+  INFO_PLIST_FILE=Info-privileged.plist
 endif
 ifeq ($(PROGRAM),jsadebugd)
   SA_TOOL=true

src/macosx/bin/java_md_macosx.c

@@ -906,11 +906,41 @@ SetXDockArgForAWT(const char *arg)
 {
     char envVar[80];
     if (strstr(arg, "-Xdock:name=") == arg) {
+        /*
+         * The APP_NAME_<pid> environment variable is used to pass
+         * an application name as specified with the -Xdock:name command
+         * line option from Java launcher code to the AWT code in order
+         * to assign this name to the app's dock tile on the Mac.
+         * The _<pid> part is added to avoid collisions with child processes.
+         *
+         * WARNING: This environment variable is an implementation detail and
+         * isn't meant for use outside of the core platform. The mechanism for
+         * passing this information from Java launcher to other modules may
+         * change drastically between update release, and it may even be
+         * removed or replaced with another mechanism.
+         *
+         * NOTE: It is used by SWT, and JavaFX.
+         */
         snprintf(envVar, sizeof(envVar), "APP_NAME_%d", getpid());
         setenv(envVar, (arg + 12), 1);
     }
 
     if (strstr(arg, "-Xdock:icon=") == arg) {
+        /*
+         * The APP_ICON_<pid> environment variable is used to pass
+         * an application icon as specified with the -Xdock:icon command
+         * line option from Java launcher code to the AWT code in order
+         * to assign this icon to the app's dock tile on the Mac.
+         * The _<pid> part is added to avoid collisions with child processes.
+         *
+         * WARNING: This environment variable is an implementation detail and
+         * isn't meant for use outside of the core platform. The mechanism for
+         * passing this information from Java launcher to other modules may
+         * change drastically between update release, and it may even be
+         * removed or replaced with another mechanism.
+         *
+         * NOTE: It is used by SWT, and JavaFX.
+         */
         snprintf(envVar, sizeof(envVar), "APP_ICON_%d", getpid());
         setenv(envVar, (arg + 12), 1);
     }
@@ -931,6 +961,22 @@ SetMainClassForAWT(JNIEnv *env, jclass mainClass) {
     NULL_CHECK(mainClassName = (*env)->GetStringUTFChars(env, mainClassString, NULL));
 
     char envVar[80];
+    /*
+     * The JAVA_MAIN_CLASS_<pid> environment variable is used to pass
+     * the name of a Java class whose main() method is invoked by
+     * the Java launcher code to start the application, to the AWT code
+     * in order to assign the name to the Apple menu bar when the app
+     * is active on the Mac.
+     * The _<pid> part is added to avoid collisions with child processes.
+     *
+     * WARNING: This environment variable is an implementation detail and
+     * isn't meant for use outside of the core platform. The mechanism for
+     * passing this information from Java launcher to other modules may
+     * change drastically between update release, and it may even be
+     * removed or replaced with another mechanism.
+     *
+     * NOTE: It is used by SWT, and JavaFX.
+     */
     snprintf(envVar, sizeof(envVar), "JAVA_MAIN_CLASS_%d", getpid());
     setenv(envVar, mainClassName, 1);
 

src/macosx/classes/apple/launcher/JavaAppLauncher.java

@@ -27,7 +27,6 @@ package apple.launcher;
 
 import java.io.*;
 import java.lang.reflect.*;
-import java.security.PrivilegedAction;
 import java.text.MessageFormat;
 import java.util.*;
 import java.util.jar.*;
@@ -36,7 +35,13 @@ import javax.swing.*;
 
 class JavaAppLauncher implements Runnable {
     static {
-        java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osx"));
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("osx");
+                    return null;
+                }
+            });
     }
 
     private static native <T> T nativeConvertAndRelease(final long ptr);

src/macosx/classes/apple/security/KeychainStore.java

@@ -103,7 +103,13 @@ public final class KeychainStore extends KeyStoreSpi {
     private static final int SALT_LEN = 20;
 
     static {
-        java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osx"));
+        AccessController.doPrivileged(
+            new PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("osx");
+                    return null;
+                }
+            });
         try {
             PKCS8ShroudedKeyBag_OID = new ObjectIdentifier(keyBag);
             pbeWithSHAAnd3KeyTripleDESCBC_OID = new ObjectIdentifier(pbeWithSHAAnd3KeyTripleDESCBC);

src/macosx/classes/com/apple/concurrent/LibDispatchNative.java

@@ -26,17 +26,23 @@
 package com.apple.concurrent;
 
 final class LibDispatchNative {
-        static {
-                java.security.AccessController.doPrivileged((java.security.PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osx"));
-        }
+    static {
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("osx");
+                    return null;
+                }
+            });
+    }
 
-        static native boolean nativeIsDispatchSupported();
-        static native long nativeGetMainQueue();
-        static native long nativeCreateConcurrentQueue(int priority);
-        static native long nativeCreateSerialQueue(String name);
-        static native void nativeReleaseQueue(long nativeQueue);
-        static native void nativeExecuteAsync(long nativeQueue, Runnable task);
-        static native void nativeExecuteSync(long nativeQueue, Runnable task);
+    static native boolean nativeIsDispatchSupported();
+    static native long nativeGetMainQueue();
+    static native long nativeCreateConcurrentQueue(int priority);
+    static native long nativeCreateSerialQueue(String name);
+    static native void nativeReleaseQueue(long nativeQueue);
+    static native void nativeExecuteAsync(long nativeQueue, Runnable task);
+    static native void nativeExecuteSync(long nativeQueue, Runnable task);
 
-        private LibDispatchNative() { }
+    private LibDispatchNative() { }
 }

src/macosx/classes/com/apple/eawt/Application.java

@@ -28,7 +28,6 @@ package com.apple.eawt;
 import java.awt.*;
 import java.awt.peer.*;
 import java.beans.Beans;
-import java.security.PrivilegedAction;
 
 import javax.swing.JMenuBar;
 
@@ -59,7 +58,13 @@ public class Application {
     static Application sApplication = null;
 
     static {
-        java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("awt"));
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("awt");
+                    return null;
+                }
+            });
 
         checkSecurity();
         if (!Beans.isDesignTime()) {

src/macosx/classes/com/apple/eio/FileManager.java

@@ -55,7 +55,13 @@ import java.io.*;
  */
 public class FileManager {
     static {
-        java.security.AccessController.doPrivileged((java.security.PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osx"));
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("osx");
+                    return null;
+                }
+            });
     }
 
     /**

src/macosx/classes/com/apple/laf/AquaFileView.java

@@ -26,7 +26,6 @@
 package com.apple.laf;
 
 import java.io.*;
-import java.security.PrivilegedAction;
 import java.util.*;
 import java.util.Map.Entry;
 
@@ -57,7 +56,13 @@ class AquaFileView extends FileView {
     static final int kLSItemInfoExtensionIsHidden  = 0x00100000; /* Item has a hidden extension*/
 
     static {
-        java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osxui"));
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("osxui");
+                    return null;
+                }
+            });
     }
 
     // TODO: Un-comment this out when the native version exists

src/macosx/classes/com/apple/laf/AquaLookAndFeel.java

@@ -134,10 +134,16 @@ public class AquaLookAndFeel extends BasicLookAndFeel {
      * @see UIManager#setLookAndFeel
      */
     public void initialize() {
-        java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osxui"));
-        java.security.AccessController.doPrivileged(new PrivilegedAction<Object>(){
+        java.security.AccessController.doPrivileged(new PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("osxui");
+                    return null;
+                }
+            });
+
+        java.security.AccessController.doPrivileged(new PrivilegedAction<Void>(){
             @Override
-            public Object run() {
+            public Void run() {
                 JRSUIControl.initJRSUI();
                 return null;
             }

src/macosx/classes/com/apple/laf/AquaNativeResources.java

@@ -27,7 +27,6 @@ package com.apple.laf;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.security.PrivilegedAction;
 
 import javax.swing.plaf.UIResource;
 
@@ -35,7 +34,13 @@ import com.apple.laf.AquaUtils.RecyclableSingleton;
 
 public class AquaNativeResources {
     static {
-        java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osxui"));
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("osxui");
+                    return null;
+                }
+            });
     }
 
     // TODO: removing CColorPaint for now

src/macosx/classes/com/apple/laf/ScreenMenu.java

@@ -28,7 +28,6 @@ package com.apple.laf;
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.peer.MenuComponentPeer;
-import java.security.PrivilegedAction;
 import java.util.Hashtable;
 
 import javax.swing.*;
@@ -38,7 +37,13 @@ import sun.lwawt.macosx.*;
 
 class ScreenMenu extends Menu implements ContainerListener, ComponentListener, ScreenMenuPropertyHandler {
     static {
-        java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("awt"));
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("awt");
+                    return null;
+                }
+            });
     }
 
     // screen menu stuff

src/macosx/classes/com/apple/laf/ScreenPopupFactory.java

@@ -26,15 +26,19 @@
 package com.apple.laf;
 
 import java.awt.*;
-import java.security.PrivilegedAction;
-
 import javax.swing.*;
 
 import sun.lwawt.macosx.CPlatformWindow;
 
 class ScreenPopupFactory extends PopupFactory {
     static {
-        java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("osxui"));
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("osxui");
+                    return null;
+                }
+            });
     }
 
     static final Float TRANSLUCENT = new Float(248f/255f);

src/macosx/classes/java/util/prefs/MacOSXPreferences.java

@@ -25,6 +25,8 @@
 
 package java.util.prefs;
 
+import java.util.Objects;
+
 class MacOSXPreferences extends AbstractPreferences {
     // fixme need security checks?
 
@@ -147,6 +149,7 @@ class MacOSXPreferences extends AbstractPreferences {
     // AbstractPreferences implementation
     protected void removeSpi(String key)
     {
+        Objects.requireNonNull(key, "Specified key cannot be null");
         file.removeKeyFromNode(path, key);
     }
 
@@ -228,8 +231,14 @@ class MacOSXPreferences extends AbstractPreferences {
             if (isRemoved())
                 throw new IllegalStateException("Node has been removed");
             // fixme! overkill
-            if (!MacOSXPreferencesFile.syncWorld()) {
-                throw new BackingStoreException("Synchronization failed for node '" + path + "'");
+            if (isUser) {
+                if (!MacOSXPreferencesFile.syncUser()) {
+                    throw new BackingStoreException("Synchronization failed for node '" + path + "'");
+                }
+            } else {
+                if (!MacOSXPreferencesFile.syncWorld()) {
+                    throw new BackingStoreException("Synchronization failed for node '" + path + "'");
+                }
             }
         }
     }

src/macosx/classes/java/util/prefs/MacOSXPreferencesFile.java

@@ -79,7 +79,13 @@ import java.lang.ref.WeakReference;
 class MacOSXPreferencesFile {
 
     static {
-        java.security.AccessController.doPrivileged(new sun.security.action.LoadLibraryAction("osx"));
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("osx");
+                    return null;
+                }
+            });
     }
 
     private class FlushTask extends TimerTask {
@@ -192,6 +198,39 @@ class MacOSXPreferencesFile {
     }
 
 
+    // Sync only current user preferences
+    static synchronized boolean syncUser() {
+        boolean ok = true;
+        if (cachedFiles != null  &&  !cachedFiles.isEmpty()) {
+            Iterator<WeakReference> iter = cachedFiles.values().iterator();
+            while (iter.hasNext()) {
+                WeakReference ref = iter.next();
+                MacOSXPreferencesFile f = (MacOSXPreferencesFile)ref.get();
+                if (f != null && f.user == cfCurrentUser) {
+                    if (!f.synchronize()) {
+                        ok = false;
+                    }
+                } else {
+                    iter.remove();
+                }
+            }
+        }
+        // Remove synchronized file from changed file list. The changed files were
+        // guaranteed to have been in the cached file list (because there was a strong
+        // reference from changedFiles.
+        if (changedFiles != null) {
+            Iterator<MacOSXPreferencesFile> iterChanged = changedFiles.iterator();
+            while (iterChanged.hasNext()) {
+                MacOSXPreferencesFile f = iterChanged.next();
+                if (f != null && f.user == cfCurrentUser)
+                    iterChanged.remove();
+             }
+        }
+        return ok;
+    }
+
+
+
     // Write all prefs changes to disk, but do not clear all cached prefs
     // values. Also kills any scheduled flush task.
     // There's no CFPreferencesFlush() (<rdar://problem/3049129>), so lots of cached prefs

src/macosx/classes/sun/awt/CGraphicsEnvironment.java

@@ -58,9 +58,15 @@ public class CGraphicsEnvironment extends SunGraphicsEnvironment {
     public static void init() { }
 
     static {
-        java.security.AccessController.doPrivileged(new sun.security.action.LoadLibraryAction("awt"));
-        java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<Object>() {
-            public Object run() {
+        java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<Void>() {
+            public Void run() {
+                System.loadLibrary("awt");
+                return null;
+            }
+        });
+
+        java.security.AccessController.doPrivileged(new java.security.PrivilegedAction<Void>() {
+            public Void run() {
                 if (isHeadless()) return null;
                 initCocoa();
                 return null;

src/macosx/classes/sun/lwawt/LWTextAreaPeer.java

@@ -210,6 +210,15 @@ final class LWTextAreaPeer
                 super();
             }
 
+            @Override
+            public void replaceSelection(String content) {
+                getDocument().removeDocumentListener(LWTextAreaPeer.this);
+                super.replaceSelection(content);
+                // post only one text event in this case
+                postTextEvent();
+                getDocument().addDocumentListener(LWTextAreaPeer.this);
+            }
+
             @Override
             public boolean hasFocus() {
                 return getTarget().hasFocus();

src/macosx/classes/sun/lwawt/LWTextComponentPeer.java

@@ -187,7 +187,7 @@ abstract class LWTextComponentPeer<T extends TextComponent, D extends JComponent
         }
     }
 
-    private void sendTextEvent(final DocumentEvent e) {
+    protected final void postTextEvent() {
         postEvent(new TextEvent(getTarget(), TextEvent.TEXT_VALUE_CHANGED));
         synchronized (getDelegateLock()) {
             revalidate();
@@ -196,17 +196,17 @@ abstract class LWTextComponentPeer<T extends TextComponent, D extends JComponent
 
     @Override
     public final void changedUpdate(final DocumentEvent e) {
-        sendTextEvent(e);
+        postTextEvent();
     }
 
     @Override
     public final void insertUpdate(final DocumentEvent e) {
-        sendTextEvent(e);
+        postTextEvent();
     }
 
     @Override
     public final void removeUpdate(final DocumentEvent e) {
-        sendTextEvent(e);
+        postTextEvent();
     }
 
     @Override

src/macosx/classes/sun/lwawt/LWTextFieldPeer.java

@@ -95,7 +95,7 @@ final class LWTextFieldPeer
     @Override
     public void actionPerformed(final ActionEvent e) {
         postEvent(new ActionEvent(getTarget(), ActionEvent.ACTION_PERFORMED,
-                                  getText(), e.getWhen(), e.getModifiers()));
+                getText(), e.getWhen(), e.getModifiers()));
     }
 
     /**
@@ -121,6 +121,15 @@ final class LWTextFieldPeer
             super();
         }
 
+        @Override
+        public void replaceSelection(String content) {
+            getDocument().removeDocumentListener(LWTextFieldPeer.this);
+            super.replaceSelection(content);
+            // post only one text event in this case
+            postTextEvent();
+            getDocument().addDocumentListener(LWTextFieldPeer.this);
+        }
+
         @Override
         public boolean hasFocus() {
             return getTarget().hasFocus();

src/macosx/classes/sun/lwawt/LWWindowPeer.java

@@ -669,39 +669,42 @@ public class LWWindowPeer
             }
         } else {
             if (targetPeer != lastMouseEventPeer) {
-                // lastMouseEventPeer may be null if mouse was out of Java windows
-                if (lastMouseEventPeer != null && lastMouseEventPeer.isEnabled()) {
-                    // Sometimes, MOUSE_EXITED is not sent by delegate (or is sent a bit
-                    // later), in which case lastWindowPeer is another window
-                    if (lastWindowPeer != this) {
-                        Point oldp = lastMouseEventPeer.windowToLocal(x, y, lastWindowPeer);
-                        // Additionally translate from this to lastWindowPeer coordinates
-                        Rectangle lr = lastWindowPeer.getBounds();
-                        oldp.x += r.x - lr.x;
-                        oldp.y += r.y - lr.y;
-                        postEvent(new MouseEvent(lastMouseEventPeer.getTarget(),
-                                                 MouseEvent.MOUSE_EXITED,
-                                                 when, modifiers,
-                                                 oldp.x, oldp.y, screenX, screenY,
-                                                 clickCount, popupTrigger, button));
-                    } else {
-                        Point oldp = lastMouseEventPeer.windowToLocal(x, y, this);
-                        postEvent(new MouseEvent(lastMouseEventPeer.getTarget(),
-                                                 MouseEvent.MOUSE_EXITED,
+
+                if (id != MouseEvent.MOUSE_DRAGGED || lastMouseEventPeer == null) {
+                    // lastMouseEventPeer may be null if mouse was out of Java windows
+                    if (lastMouseEventPeer != null && lastMouseEventPeer.isEnabled()) {
+                        // Sometimes, MOUSE_EXITED is not sent by delegate (or is sent a bit
+                        // later), in which case lastWindowPeer is another window
+                        if (lastWindowPeer != this) {
+                            Point oldp = lastMouseEventPeer.windowToLocal(x, y, lastWindowPeer);
+                            // Additionally translate from this to lastWindowPeer coordinates
+                            Rectangle lr = lastWindowPeer.getBounds();
+                            oldp.x += r.x - lr.x;
+                            oldp.y += r.y - lr.y;
+                            postEvent(new MouseEvent(lastMouseEventPeer.getTarget(),
+                                                     MouseEvent.MOUSE_EXITED,
+                                                     when, modifiers,
+                                                     oldp.x, oldp.y, screenX, screenY,
+                                                     clickCount, popupTrigger, button));
+                        } else {
+                            Point oldp = lastMouseEventPeer.windowToLocal(x, y, this);
+                            postEvent(new MouseEvent(lastMouseEventPeer.getTarget(),
+                                                     MouseEvent.MOUSE_EXITED,
+                                                     when, modifiers,
+                                                     oldp.x, oldp.y, screenX, screenY,
+                                                     clickCount, popupTrigger, button));
+                        }
+                    }
+                    if (targetPeer != null && targetPeer.isEnabled() && id != MouseEvent.MOUSE_ENTERED) {
+                        Point newp = targetPeer.windowToLocal(x, y, curWindowPeer);
+                        postEvent(new MouseEvent(targetPeer.getTarget(),
+                                                 MouseEvent.MOUSE_ENTERED,
                                                  when, modifiers,
-                                                 oldp.x, oldp.y, screenX, screenY,
+                                                 newp.x, newp.y, screenX, screenY,
                                                  clickCount, popupTrigger, button));
                     }
                 }
                 lastMouseEventPeer = targetPeer;
-                if (targetPeer != null && targetPeer.isEnabled() && id != MouseEvent.MOUSE_ENTERED) {
-                    Point newp = targetPeer.windowToLocal(x, y, curWindowPeer);
-                    postEvent(new MouseEvent(targetPeer.getTarget(),
-                                             MouseEvent.MOUSE_ENTERED,
-                                             when, modifiers,
-                                             newp.x, newp.y, screenX, screenY,
-                                             clickCount, popupTrigger, button));
-                }
             }
             // TODO: fill "bdata" member of AWTEvent
 

src/macosx/classes/sun/lwawt/macosx/CAccessibility.java

@@ -29,7 +29,6 @@ import java.awt.*;
 import java.beans.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
-import java.security.PrivilegedAction;
 import java.util.*;
 import java.util.concurrent.Callable;
 
@@ -41,7 +40,13 @@ class CAccessibility implements PropertyChangeListener {
 
     static {
         // Need to load the native library for this code.
-        java.security.AccessController.doPrivileged((PrivilegedAction<?>)new sun.security.action.LoadLibraryAction("awt"));
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("awt");
+                    return null;
+                }
+            });
     }
 
     static CAccessibility sAccessibility;

src/macosx/classes/sun/lwawt/macosx/CCursorManager.java

@@ -36,6 +36,7 @@ final class CCursorManager extends LWCursorManager {
     private static native Point2D nativeGetCursorPosition();
     private static native void nativeSetBuiltInCursor(final int type, final String name);
     private static native void nativeSetCustomCursor(final long imgPtr, final double x, final double y);
+    public static native void nativeSetAllowsCursorSetInBackground(final boolean allows);
 
     private static final int NAMED_CURSOR = -1;
 

src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java

@@ -76,6 +76,12 @@ public class CEmbeddedFrame extends EmbeddedFrame {
         int screenX = locationOnScreen.x + x;
         int screenY = locationOnScreen.y + y;
 
+        if (eventType == CocoaConstants.NPCocoaEventMouseEntered) {
+            CCursorManager.nativeSetAllowsCursorSetInBackground(true);
+        } else if (eventType == CocoaConstants.NPCocoaEventMouseExited) {
+            CCursorManager.nativeSetAllowsCursorSetInBackground(false);
+        }
+
         responder.handleMouseEvent(eventType, modifierFlags, buttonNumber,
                                    clickCount, x, y, screenX, screenY);
     }

src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java

@@ -61,6 +61,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
     private static native void nativeSetNSWindowMinimizedIcon(long nsWindowPtr, long nsImage);
     private static native void nativeSetNSWindowRepresentedFilename(long nsWindowPtr, String representedFilename);
     private static native void nativeSetNSWindowSecurityWarningPositioning(long nsWindowPtr, double x, double y, float biasX, float biasY);
+    private static native void nativeSynthesizeMouseEnteredExitedEvents(long nsWindowPtr);
 
     private static native int nativeGetScreenNSWindowIsOn_AppKitThread(long nsWindowPtr);
 
@@ -582,6 +583,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
             }
         }
 
+        nativeSynthesizeMouseEnteredExitedEvents(nsWindowPtr);
+
         // 6. Configure stuff #2
         updateFocusabilityForAutoRequestFocus(true);
 
@@ -791,6 +794,8 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
                 throw new RuntimeException("Unknown window state: " + windowState);
         }
 
+        nativeSynthesizeMouseEnteredExitedEvents(nsWindowPtr);
+
         // NOTE: the SWP.windowState field gets updated to the newWindowState
         //       value when the native notification comes to us
     }

src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java

 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -656,6 +656,14 @@ public class LWCToolkit extends LWToolkit {
         return ((mods & (InputEvent.META_MASK | InputEvent.CTRL_MASK)) == 0);
     }
 
+    /**
+     * Returns whether popup is allowed to be shown above the task bar.
+     */
+    @Override
+    public boolean canPopupOverlapTaskBar() {
+        return false;
+    }
+
     // Extends PeerEvent because we want to pass long an ObjC mediator object and because we want these events to be posted early
     // Typically, rather than relying on the notifier to call notifyAll(), we use the mediator to stop the runloop
     public static class CPeerEvent extends PeerEvent {

src/macosx/native/sun/awt/AWTView.h

@@ -52,9 +52,12 @@
     BOOL fPAHNeedsToSelect;
 
     id cglLayer; // is a sublayer of view.layer
+
+    BOOL mouseIsOver;
 }
 
 @property (nonatomic, retain) id cglLayer;
+@property (nonatomic) BOOL mouseIsOver;
 
 - (id) initWithRect:(NSRect) rect platformView:(jobject)cPlatformView windowLayer:(CALayer*)windowLayer;
 - (void) deliverJavaMouseEvent: (NSEvent *) event;

src/macosx/native/sun/awt/AWTView.m

@@ -61,6 +61,7 @@ static BOOL shouldUsePressAndHold() {
 @synthesize _dropTarget;
 @synthesize _dragSource;
 @synthesize cglLayer;
+@synthesize mouseIsOver;
 
 // Note: Must be called on main (AppKit) thread only
 - (id) initWithRect: (NSRect) rect
@@ -80,6 +81,8 @@ AWT_ASSERT_APPKIT_THREAD;
     fEnablePressAndHold = shouldUsePressAndHold();
     fInPressAndHold = NO;
     fPAHNeedsToSelect = NO;
+    
+    mouseIsOver = NO;
 
     if (windowLayer != nil) {
         self.cglLayer = windowLayer;
@@ -299,6 +302,16 @@ AWT_ASSERT_APPKIT_THREAD;
  */
 
 -(void) deliverJavaMouseEvent: (NSEvent *) event {
+    
+    NSEventType type = [event type];    
+    
+    // check synthesized mouse entered/exited events
+    if ((type == NSMouseEntered && mouseIsOver) || (type == NSMouseExited && !mouseIsOver)) {
+        return;
+    }else if ((type == NSMouseEntered && !mouseIsOver) || (type == NSMouseExited && mouseIsOver)) {
+        mouseIsOver = !mouseIsOver;
+    }
+    
     [AWTToolkit eventCountPlusPlus];
 
     JNIEnv *env = [ThreadUtilities getJNIEnv];
@@ -306,7 +319,6 @@ AWT_ASSERT_APPKIT_THREAD;
     NSPoint eventLocation = [event locationInWindow];
     NSPoint localPoint = [self convertPoint: eventLocation fromView: nil];
     NSPoint absP = [NSEvent mouseLocation];
-    NSEventType type = [event type];
 
     // Convert global numbers between Cocoa's coordinate system and Java.
     // TODO: need consitent way for doing that both with global as well as with local coordinates.

src/macosx/native/sun/awt/AWTWindow.h

@@ -56,6 +56,7 @@
                   contentView:(NSView *)contentView;
 
 - (void) adjustGrowBoxWindow;
+- (BOOL) isTopmostWindowUnderMouse;
 @end
 
 #endif _AWTWINDOW_H

src/macosx/native/sun/awt/AWTWindow.m

@@ -170,6 +170,66 @@ AWT_ASSERT_APPKIT_THREAD;
     return self;
 }
 
+// checks that this window is under the mouse cursor and this point is not overlapped by others windows 
+- (BOOL) isTopmostWindowUnderMouse {
+    
+    int currentWinID = [self windowNumber]; 
+    
+    NSRect screenRect = [[NSScreen mainScreen] frame];    
+    NSPoint nsMouseLocation = [NSEvent mouseLocation];
+    CGPoint cgMouseLocation = CGPointMake(nsMouseLocation.x, screenRect.size.height - nsMouseLocation.y);    
+    
+    NSMutableArray *windows = (NSMutableArray *)CGWindowListCopyWindowInfo(kCGWindowListOptionOnScreenOnly | kCGWindowListExcludeDesktopElements, kCGNullWindowID);
+    
+    
+    for (NSDictionary *window in windows) {
+        int layer = [[window objectForKey:(id)kCGWindowLayer] intValue];
+        if (layer == 0) {
+            int winID = [[window objectForKey:(id)kCGWindowNumber] intValue];            
+            CGRect rect;
+            CGRectMakeWithDictionaryRepresentation((CFDictionaryRef)[window objectForKey:(id)kCGWindowBounds], &rect);
+            if (CGRectContainsPoint(rect, cgMouseLocation)) {
+                return currentWinID == winID;
+            } else if (currentWinID == winID) {
+                return NO;
+            }
+        }
+    }
+    return NO;
+}
+
+- (void) synthesizeMouseEnteredExitedEvents {
+    
+    int eventType = 0;
+    BOOL isUnderMouse = [self isTopmostWindowUnderMouse];
+    BOOL mouseIsOver = [[self contentView] mouseIsOver];
+    
+    if (isUnderMouse && !mouseIsOver) {
+        eventType = NSMouseEntered;
+    } else if (!isUnderMouse && mouseIsOver) {
+        eventType = NSMouseExited;        
+    } else {
+        return;
+    }
+    
+    NSPoint screenLocation = [NSEvent mouseLocation];        
+    NSPoint windowLocation = [self convertScreenToBase: screenLocation];        
+    int modifierFlags = (eventType == NSMouseEntered) ? NSMouseEnteredMask : NSMouseExitedMask;
+    
+    NSEvent *mouseEvent = [NSEvent enterExitEventWithType: eventType
+                                                  location: windowLocation
+                                             modifierFlags: modifierFlags
+                                                 timestamp: 0
+                                              windowNumber: [self windowNumber]
+                                                   context: nil
+                                               eventNumber: 0
+                                            trackingNumber: 0
+                                                  userData: nil
+                            ];
+    
+    [[self contentView] deliverJavaMouseEvent: mouseEvent];
+}
+
 - (void) dealloc {
 AWT_ASSERT_APPKIT_THREAD;
 
@@ -669,6 +729,8 @@ AWT_ASSERT_NOT_APPKIT_THREAD;
         // ensure we repaint the whole window after the resize operation
         // (this will also re-enable screen updates, which were disabled above)
         // TODO: send PaintEvent
+        
+        [window synthesizeMouseEnteredExitedEvents];
     }];
 
 JNF_COCOA_EXIT(env);
@@ -897,6 +959,27 @@ AWT_ASSERT_NOT_APPKIT_THREAD;
 JNF_COCOA_EXIT(env);
 }
 
+/*
+ * Class:     sun_lwawt_macosx_CPlatformWindow
+ * Method:    nativeSynthesizeMouseEnteredExitedEvents
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSynthesizeMouseEnteredExitedEvents
+(JNIEnv *env, jclass clazz, jlong windowPtr)
+{
+    JNF_COCOA_ENTER(env);
+    AWT_ASSERT_NOT_APPKIT_THREAD;
+    
+    AWTWindow *window = OBJC(windowPtr);
+    [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^(){
+        AWT_ASSERT_APPKIT_THREAD;
+        
+        [window synthesizeMouseEnteredExitedEvents];
+    }];
+    
+    JNF_COCOA_EXIT(env);
+}
+
 /*
  * Class:     sun_lwawt_macosx_CPlatformWindow
  * Method:    nativeGetScreenNSWindowIsOn_AppKitThread

src/macosx/native/sun/awt/CCursorManager.m

@@ -137,3 +137,30 @@ JNF_COCOA_EXIT(env);
 
     return jpt;
 }
+
+
+JNIEXPORT void JNICALL
+Java_sun_lwawt_macosx_CCursorManager_nativeSetAllowsCursorSetInBackground
+(JNIEnv *env, jclass class, jboolean allows)
+{
+
+JNF_COCOA_ENTER(env);
+AWT_ASSERT_NOT_APPKIT_THREAD;
+
+    SEL allowsSetInBackground_SEL = @selector(javaSetAllowsCursorSetInBackground:);
+    if ([[NSCursor class] respondsToSelector:allowsSetInBackground_SEL]) {
+        [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
+            NSMethodSignature *allowsSetInBackground_sig =
+                [[NSCursor class] methodSignatureForSelector:allowsSetInBackground_SEL];
+            NSInvocation *invocation =
+                [NSInvocation invocationWithMethodSignature:allowsSetInBackground_sig];
+            BOOL arg = (BOOL)allows;
+            [invocation setSelector:allowsSetInBackground_SEL];
+            [invocation setArgument:&arg atIndex:2];
+            [invocation invokeWithTarget:[NSCursor class]];
+        }];
+    }
+
+JNF_COCOA_EXIT(env);
+
+}

src/macosx/native/sun/awt/PrinterView.m

@@ -27,6 +27,7 @@
 
 #import "java_awt_print_Pageable.h"
 #import "java_awt_print_Printable.h"
+#import "java_awt_print_PageFormat.h"
 
 #import <JavaNativeFoundation/JavaNativeFoundation.h>
 
@@ -35,6 +36,7 @@
 
 
 static JNF_CLASS_CACHE(sjc_CPrinterJob, "sun/lwawt/macosx/CPrinterJob");
+static JNF_CLASS_CACHE(sjc_PageFormat, "java/awt/print/PageFormat");
 
 @implementation PrinterView
 
@@ -152,6 +154,7 @@ static JNF_CLASS_CACHE(sjc_CPrinterJob, "sun/lwawt/macosx/CPrinterJob");
 
     static JNF_MEMBER_CACHE(jm_getPageformatPrintablePeekgraphics, sjc_CPrinterJob, "getPageformatPrintablePeekgraphics", "(I)[Ljava/lang/Object;");
     static JNF_MEMBER_CACHE(jm_printAndGetPageFormatArea, sjc_CPrinterJob, "printAndGetPageFormatArea", "(Ljava/awt/print/Printable;Ljava/awt/Graphics;Ljava/awt/print/PageFormat;I)Ljava/awt/geom/Rectangle2D;");
+    static JNF_MEMBER_CACHE(jm_getOrientation, sjc_PageFormat, "getOrientation", "()I");
 
     // Assertions removed, and corresponding JNFDeleteGlobalRefs added, for radr://3962543
     // Actual fix that will keep these assertions from being true is radr://3205462 ,
@@ -201,6 +204,26 @@ static JNF_CLASS_CACHE(sjc_CPrinterJob, "sun/lwawt/macosx/CPrinterJob");
         // Actually print and get the PageFormatArea
         jobject pageFormatArea = JNFCallObjectMethod(env, fPrinterJob, jm_printAndGetPageFormatArea, fCurPainter, fCurPeekGraphics, fCurPageFormat, jPageNumber); // AWT_THREADING Safe (AWTRunLoopMode)
         if (pageFormatArea != NULL) {
+            NSPrintingOrientation currentOrientation = 
+                    [[[NSPrintOperation currentOperation] printInfo] orientation];
+            // set page orientation
+            switch (JNFCallIntMethod(env, fCurPageFormat, jm_getOrientation)) { 
+                case java_awt_print_PageFormat_PORTRAIT:
+                default:
+                    if (currentOrientation != NSPortraitOrientation) {
+                        [[[NSPrintOperation currentOperation] printInfo] 
+                                            setOrientation:NSPortraitOrientation];
+                    }
+                    break;
+
+                case java_awt_print_PageFormat_LANDSCAPE:
+                case java_awt_print_PageFormat_REVERSE_LANDSCAPE:
+                    if (currentOrientation != NSLandscapeOrientation) {
+                        [[[NSPrintOperation currentOperation] printInfo] 
+                                            setOrientation:NSLandscapeOrientation];
+                    }
+                    break;
+                }
             result = JavaToNSRect(env, pageFormatArea);
             (*env)->DeleteLocalRef(env, pageFormatArea);
         } else {

src/share/bin/java.c

@@ -695,6 +695,13 @@ SetClassPath(const char *s)
     char *def;
     const char *orig = s;
     static const char format[] = "-Djava.class.path=%s";
+    /*
+     * usually we should not get a null pointer, but there are cases where
+     * we might just get one, in which case we simply ignore it, and let the
+     * caller deal with it
+     */
+    if (s == NULL)
+        return;
     s = JLI_WildcardExpandClasspath(s);
     def = JLI_MemAlloc(sizeof(format)
                        - 2 /* strlen("%s") */

src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java

@@ -87,7 +87,12 @@ public class JPEGImageReader extends ImageReader {
 
     static {
         java.security.AccessController.doPrivileged(
-            new sun.security.action.LoadLibraryAction("jpeg"));
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("jpeg");
+                    return null;
+                }
+            });
         initReaderIDs(ImageInputStream.class,
                       JPEGQTable.class,
                       JPEGHuffmanTable.class);

src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java

@@ -177,7 +177,12 @@ public class JPEGImageWriter extends ImageWriter {
 
     static {
         java.security.AccessController.doPrivileged(
-            new sun.security.action.LoadLibraryAction("jpeg"));
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("jpeg");
+                    return null;
+                }
+            });
         initWriterIDs(ImageOutputStream.class,
                       JPEGQTable.class,
                       JPEGHuffmanTable.class);

src/share/classes/com/sun/java/util/jar/pack/Attribute.java

 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -166,6 +166,7 @@ class Attribute implements Comparable<Attribute> {
         define(sd, ATTR_CONTEXT_CLASS, "SourceFile", "RUH");
         define(sd, ATTR_CONTEXT_CLASS, "EnclosingMethod", "RCHRDNH");
         define(sd, ATTR_CONTEXT_CLASS, "InnerClasses", "NH[RCHRCNHRUNHFH]");
+        define(sd, ATTR_CONTEXT_CLASS, "BootstrapMethods", "NH[RMHNH[KLH]]");
 
         define(sd, ATTR_CONTEXT_FIELD, "Signature", "RSH");
         define(sd, ATTR_CONTEXT_FIELD, "Synthetic", "");
@@ -203,6 +204,8 @@ class Attribute implements Comparable<Attribute> {
         // Their layout specs. are given here for completeness.
         // The Code spec is incomplete, in that it does not distinguish
         // bytecode bytes or locate CP references.
+        // The BootstrapMethods attribute is also special-cased
+        // elsewhere as an appendix to the local constant pool.
     }
 
     // Metadata.
@@ -822,9 +825,9 @@ class Attribute implements Comparable<Attribute> {
   reference_type:
         ( constant_ref | schema_ref | utf8_ref | untyped_ref )
   constant_ref:
-        ( 'KI' | 'KJ' | 'KF' | 'KD' | 'KS' | 'KQ' )
+        ( 'KI' | 'KJ' | 'KF' | 'KD' | 'KS' | 'KQ' | 'KM' | 'KT' | 'KL' )
   schema_ref:
-        ( 'RC' | 'RS' | 'RD' | 'RF' | 'RM' | 'RI' )
+        ( 'RC' | 'RS' | 'RD' | 'RF' | 'RM' | 'RI' | 'RY' | 'RB' | 'RN' )
   utf8_ref:
         'RU'
   untyped_ref:
@@ -1012,7 +1015,12 @@ class Attribute implements Comparable<Attribute> {
                 case 'F': e.refKind = CONSTANT_Float; break;
                 case 'D': e.refKind = CONSTANT_Double; break;
                 case 'S': e.refKind = CONSTANT_String; break;
-                case 'Q': e.refKind = CONSTANT_Literal; break;
+                case 'Q': e.refKind = CONSTANT_FieldSpecific; break;
+
+                // new in 1.7:
+                case 'M': e.refKind = CONSTANT_MethodHandle; break;
+                case 'T': e.refKind = CONSTANT_MethodType; break;
+                case 'L': e.refKind = CONSTANT_LoadableValue; break;
                 default: { i = -i; continue; } // fail
                 }
                 break;
@@ -1029,6 +1037,11 @@ class Attribute implements Comparable<Attribute> {
                 case 'U': e.refKind = CONSTANT_Utf8; break; //utf8_ref
                 case 'Q': e.refKind = CONSTANT_All; break; //untyped_ref
 
+                // new in 1.7:
+                case 'Y': e.refKind = CONSTANT_InvokeDynamic; break;
+                case 'B': e.refKind = CONSTANT_BootstrapMethod; break;
+                case 'N': e.refKind = CONSTANT_AnyMember; break;
+
                 default: { i = -i; continue; } // fail
                 }
                 break;
@@ -1279,10 +1292,12 @@ class Attribute implements Comparable<Attribute> {
                         // Cf. ClassReader.readSignatureRef.
                         String typeName = globalRef.stringValue();
                         globalRef = ConstantPool.getSignatureEntry(typeName);
-                    } else if (e.refKind == CONSTANT_Literal) {
+                    } else if (e.refKind == CONSTANT_FieldSpecific) {
                         assert(globalRef.getTag() >= CONSTANT_Integer);
-                        assert(globalRef.getTag() <= CONSTANT_String);
-                    } else if (e.refKind != CONSTANT_All) {
+                        assert(globalRef.getTag() <= CONSTANT_String ||
+                               globalRef.getTag() >= CONSTANT_MethodHandle);
+                        assert(globalRef.getTag() <= CONSTANT_MethodType);
+                    } else if (e.refKind < CONSTANT_GroupFirst) {
                         assert(e.refKind == globalRef.getTag());
                     }
                 }
@@ -1462,27 +1477,29 @@ class Attribute implements Comparable<Attribute> {
                 "NH[PHPOHIIH]",         // CharacterRangeTable
                 "NH[PHHII]",            // CoverageTable
                 "NH[RCHRCNHRUNHFH]",    // InnerClasses
+                "NH[RMHNH[KLH]]",       // BootstrapMethods
                 "HHNI[B]NH[PHPOHPOHRCNH]NH[RUHNI[B]]", // Code
                 "=AnnotationDefault",
                 // Like metadata, but with a compact tag set:
                 "[NH[(1)]]"
-                +"[NH[(2)]]"
-                +"[RSHNH[RUH(3)]]"
-                +"[TB(0,1,3)[KIH](2)[KDH](5)[KFH](4)[KJH](7)[RSH](8)[RSHRUH](9)[RUH](10)[(2)](6)[NH[(3)]]()[]]",
+                +"[NH[(1)]]"
+                +"[RSHNH[RUH(1)]]"
+                +"[TB(0,1,3)[KIH](2)[KDH](5)[KFH](4)[KJH](7)[RSH](8)[RSHRUH](9)[RUH](10)[(-1)](6)[NH[(0)]]()[]]",
                 ""
             };
             ap = 0;
         }
+        Utils.currentInstance.set(new PackerImpl());
         final int[][] counts = new int[2][3];  // int bci ref
         final Entry[] cpMap = new Entry[maxVal+1];
         for (int i = 0; i < cpMap.length; i++) {
             if (i == 0)  continue;  // 0 => null
             cpMap[i] = ConstantPool.getLiteralEntry(new Integer(i));
         }
-        Class cls = new Package().new Class("");
+        Package.Class cls = new Package().new Class("");
         cls.cpMap = cpMap;
         class TestValueStream extends ValueStream {
-            Random rand = new Random(0);
+            java.util.Random rand = new java.util.Random(0);
             ArrayList history = new ArrayList();
             int ckidx = 0;
             int maxVal;
@@ -1570,8 +1587,7 @@ class Attribute implements Comparable<Attribute> {
                 String layout = av[i];
                 if (layout.startsWith("=")) {
                     String name = layout.substring(1);
-                    for (Iterator j = standardDefs.values().iterator(); j.hasNext(); ) {
-                        Attribute a = (Attribute) j.next();
+                    for (Attribute a : standardDefs.values()) {
                         if (a.name().equals(name)) {
                             layout = a.layout().layout();
                             break;
@@ -1604,7 +1620,7 @@ class Attribute implements Comparable<Attribute> {
                 if (verbose) {
                     System.out.print("  parse: {");
                 }
-                self.parse(0, cls, bytes, 0, bytes.length, tts);
+                self.parse(cls, bytes, 0, bytes.length, tts);
                 if (verbose) {
                     System.out.println("}");
                 }

src/share/classes/com/sun/java/util/jar/pack/BandStructure.java

 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -1372,17 +1372,17 @@ class BandStructure {
     protected long archiveSize1; // size reported in archive_header
     protected int  archiveNextCount; // reported in archive_header
 
-    static final int AH_LENGTH_0 = 3; //minver, majver, options
-    static final int AH_ARCHIVE_SIZE_HI = 0;
-    static final int AH_ARCHIVE_SIZE_LO = 1;
-    static final int AH_LENGTH_S = 2; //optional size hi/lo
-    static final int AH_LENGTH = 26;  // mentioned in spec
+    static final int AH_LENGTH_0 = 3;     // archive_header_0 = {minver, majver, options}
+    static final int AH_LENGTH_MIN = 15;  // observed in spec {header_0[3], cp_counts[8], class_counts[4]}
+    // Length contributions from optional archive size fields:
+    static final int AH_LENGTH_S = 2; // archive_header_S = optional {size_hi, size_lo}
+    static final int AH_ARCHIVE_SIZE_HI = 0; // offset in archive_header_S
+    static final int AH_ARCHIVE_SIZE_LO = 1; // offset in archive_header_S
     // Length contributions from optional header fields:
-    static final int AH_FILE_HEADER_LEN = 5; // sizehi/lo/next/modtime/files
-    static final int AH_SPECIAL_FORMAT_LEN = 2; // layouts/band-headers
-    static final int AH_CP_NUMBER_LEN = 4;  // int/float/long/double
-    static final int AH_LENGTH_MIN = AH_LENGTH
-        -(AH_SPECIAL_FORMAT_LEN+AH_FILE_HEADER_LEN+AH_CP_NUMBER_LEN);
+    static final int AH_FILE_HEADER_LEN = 5; // file_counts = {{size_hi, size_lo}, next, modtime, files}
+    static final int AH_SPECIAL_FORMAT_LEN = 2; // special_counts = {layouts, band_headers}
+    static final int AH_CP_NUMBER_LEN = 4;  // cp_number_counts = {int, float, long, double}
+    static final int AH_CP_EXTRA_LEN = 4;  // cp_attr_counts = {MH, MT, InDy, BSM}
 
     // Common structure of attribute band groups:
     static final int AB_FLAGS_HI = 0;
@@ -1446,6 +1446,14 @@ class BandStructure {
     CPRefBand cp_Method_desc = cp_bands.newCPRefBand("cp_Method_desc", UDELTA5, CONSTANT_NameandType);
     CPRefBand cp_Imethod_class = cp_bands.newCPRefBand("cp_Imethod_class", CONSTANT_Class);
     CPRefBand cp_Imethod_desc = cp_bands.newCPRefBand("cp_Imethod_desc", UDELTA5, CONSTANT_NameandType);
+    IntBand   cp_MethodHandle_refkind = cp_bands.newIntBand("cp_MethodHandle_refkind", DELTA5);
+    CPRefBand cp_MethodHandle_member = cp_bands.newCPRefBand("cp_MethodHandle_member", UDELTA5, CONSTANT_AnyMember);
+    CPRefBand cp_MethodType = cp_bands.newCPRefBand("cp_MethodType", UDELTA5, CONSTANT_Signature);
+    CPRefBand cp_BootstrapMethod_ref = cp_bands.newCPRefBand("cp_BootstrapMethod_ref", DELTA5, CONSTANT_MethodHandle);
+    IntBand   cp_BootstrapMethod_arg_count = cp_bands.newIntBand("cp_BootstrapMethod_arg_count", UDELTA5);
+    CPRefBand cp_BootstrapMethod_arg = cp_bands.newCPRefBand("cp_BootstrapMethod_arg", DELTA5, CONSTANT_LoadableValue);
+    CPRefBand cp_InvokeDynamic_spec = cp_bands.newCPRefBand("cp_InvokeDynamic_spec", DELTA5, CONSTANT_BootstrapMethod);
+    CPRefBand cp_InvokeDynamic_desc = cp_bands.newCPRefBand("cp_InvokeDynamic_desc", UDELTA5, CONSTANT_NameandType);
 
     // bands for carrying attribute definitions:
     MultiBand attr_definition_bands = all_bands.newMultiBand("(attr_definition_bands)", UNSIGNED5);
@@ -1481,7 +1489,7 @@ class BandStructure {
     IntBand field_attr_calls = field_attr_bands.newIntBand("field_attr_calls");
 
     // bands for predefined field attributes
-    CPRefBand field_ConstantValue_KQ = field_attr_bands.newCPRefBand("field_ConstantValue_KQ", CONSTANT_Literal);
+    CPRefBand field_ConstantValue_KQ = field_attr_bands.newCPRefBand("field_ConstantValue_KQ", CONSTANT_FieldSpecific);
     CPRefBand field_Signature_RS = field_attr_bands.newCPRefBand("field_Signature_RS", CONSTANT_Signature);
     MultiBand field_metadata_bands = field_attr_bands.newMultiBand("(field_metadata_bands)", UNSIGNED5);
 
@@ -1585,12 +1593,14 @@ class BandStructure {
     CPRefBand bc_longref = bc_bands.newCPRefBand("bc_longref", DELTA5, CONSTANT_Long);
     CPRefBand bc_doubleref = bc_bands.newCPRefBand("bc_doubleref", DELTA5, CONSTANT_Double);
     CPRefBand bc_stringref = bc_bands.newCPRefBand("bc_stringref", DELTA5, CONSTANT_String);
+    CPRefBand bc_loadablevalueref = bc_bands.newCPRefBand("bc_loadablevalueref", DELTA5, CONSTANT_LoadableValue);
 
     // nulls produced by bc_classref are taken to mean the current class
     CPRefBand bc_classref = bc_bands.newCPRefBand("bc_classref", UNSIGNED5, CONSTANT_Class, NULL_IS_OK);   // new, *anew*, c*cast, i*of, ldc
     CPRefBand bc_fieldref = bc_bands.newCPRefBand("bc_fieldref", DELTA5, CONSTANT_Fieldref);   // get*, put*
     CPRefBand bc_methodref = bc_bands.newCPRefBand("bc_methodref", CONSTANT_Methodref); // invoke[vs]*
     CPRefBand bc_imethodref = bc_bands.newCPRefBand("bc_imethodref", DELTA5, CONSTANT_InterfaceMethodref); // invokeinterface
+    CPRefBand bc_indyref = bc_bands.newCPRefBand("bc_indyref", DELTA5, CONSTANT_InvokeDynamic); // invokedynamic
 
     // _self_linker_op family
     CPRefBand bc_thisfield = bc_bands.newCPRefBand("bc_thisfield", CONSTANT_None);     // any field within cur. class
@@ -1633,7 +1643,7 @@ class BandStructure {
 
     protected void setBandIndex(CPRefBand b, byte which) {
         Object[] need = { b, Byte.valueOf(which) };
-        if (which == CONSTANT_Literal) {
+        if (which == CONSTANT_FieldSpecific) {
             // I.e., attribute layouts KQ (no null) or KQN (null ok).
             allKQBands.add(b);
         } else if (needPredefIndex != null) {
@@ -1856,12 +1866,20 @@ class BandStructure {
         attrClassFileVersionMask = (1<<CLASS_ATTR_ClassFile_version);
     }
 
-    private void adjustToMajver() {
+    private void adjustToMajver() throws IOException {
         if (getPackageMajver() < JAVA6_PACKAGE_MAJOR_VERSION) {
             if (verbose > 0)  Utils.log.fine("Legacy package version");
             // Revoke definition of pre-1.6 attribute type.
             undefineAttribute(CODE_ATTR_StackMapTable, ATTR_CONTEXT_CODE);
         }
+        if (getPackageMajver() < JAVA7_PACKAGE_MAJOR_VERSION) {
+            if (testBit(archiveOptions, AO_HAVE_CP_EXTRAS))
+                // this bit was reserved for future use in previous versions
+                throw new IOException("Format bits for Java 7 must be zero in previous releases");
+        }
+        if (testBit(archiveOptions, AO_UNUSED_MBZ)) {
+            throw new IOException("High archive option bits are reserved and must be zero: "+Integer.toHexString(archiveOptions));
+        }
     }
 
     protected void initAttrIndexLimit() {
@@ -2323,7 +2341,9 @@ class BandStructure {
             return bc_methodref;
         case CONSTANT_InterfaceMethodref:
             return bc_imethodref;
-        case CONSTANT_Literal:
+        case CONSTANT_InvokeDynamic:
+            return bc_indyref;
+        case CONSTANT_LoadableValue:
             switch (bc) {
             case _ildc: case _ildc_w:
                 return bc_intref;
@@ -2333,10 +2353,12 @@ class BandStructure {
                 return bc_longref;
             case _dldc2_w:
                 return bc_doubleref;
-            case _aldc: case _aldc_w:
+            case _sldc: case _sldc_w:
                 return bc_stringref;
             case _cldc: case _cldc_w:
                 return bc_classref;
+            case _qldc: case _qldc_w:
+                return bc_loadablevalueref;
             }
             break;
         }
@@ -2623,15 +2645,23 @@ class BandStructure {
     }
 
     static void printArrayTo(PrintStream ps, Entry[] cpMap, int start, int end) {
+        printArrayTo(ps, cpMap, start, end, false);
+    }
+    static void printArrayTo(PrintStream ps, Entry[] cpMap, int start, int end, boolean showTags) {
         StringBuffer buf = new StringBuffer();
         int len = end-start;
         for (int i = 0; i < len; i++) {
-            String s = cpMap[start+i].stringValue();
+            Entry e = cpMap[start+i];
+            ps.print(start+i); ps.print("=");
+            if (showTags) { ps.print(e.tag); ps.print(":"); }
+            String s = e.stringValue();
             buf.setLength(0);
             for (int j = 0; j < s.length(); j++) {
                 char ch = s.charAt(j);
                 if (!(ch < ' ' || ch > '~' || ch == '\\')) {
                     buf.append(ch);
+                } else if (ch == '\\') {
+                    buf.append("\\\\");
                 } else if (ch == '\n') {
                     buf.append("\\n");
                 } else if (ch == '\t') {
@@ -2639,7 +2669,8 @@ class BandStructure {
                 } else if (ch == '\r') {
                     buf.append("\\r");
                 } else {
-                    buf.append("\\x"+Integer.toHexString(ch));
+                    String str = "000"+Integer.toHexString(ch);
+                    buf.append("\\u"+str.substring(str.length()-4));
                 }
             }
             ps.println(buf);

src/share/classes/com/sun/java/util/jar/pack/ClassReader.java

 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -29,6 +29,9 @@ import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
 import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
 import com.sun.java.util.jar.pack.ConstantPool.Entry;
 import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
+import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
+import com.sun.java.util.jar.pack.ConstantPool.MethodHandleEntry;
+import com.sun.java.util.jar.pack.ConstantPool.BootstrapMethodEntry;
 import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
 import com.sun.java.util.jar.pack.Package.Class;
 import com.sun.java.util.jar.pack.Package.InnerClass;
@@ -37,6 +40,7 @@ import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Map;
 import static com.sun.java.util.jar.pack.Constants.*;
 
@@ -114,6 +118,7 @@ class ClassReader {
     private Entry readRef(byte tag) throws IOException {
         Entry e = readRef();
         assert(e != null);
+        assert(!(e instanceof UnresolvedEntry));
         assert(e.tagMatches(tag));
         return e;
     }
@@ -151,6 +156,7 @@ class ClassReader {
             readMembers(false);  // fields
             readMembers(true);   // methods
             readAttributes(ATTR_CONTEXT_CLASS, cls);
+            fixUnresolvedEntries();
             cls.finishReading();
             assert(0 >= in.read(new byte[1]));
             ok = true;
@@ -236,6 +242,7 @@ class ClassReader {
                 // just read the refs; do not attempt to resolve while reading
                 case CONSTANT_Class:
                 case CONSTANT_String:
+                case CONSTANT_MethodType:
                     fixups[fptr++] = i;
                     fixups[fptr++] = tag;
                     fixups[fptr++] = in.readUnsignedShort();
@@ -250,6 +257,18 @@ class ClassReader {
                     fixups[fptr++] = in.readUnsignedShort();
                     fixups[fptr++] = in.readUnsignedShort();
                     break;
+                case CONSTANT_InvokeDynamic:
+                    fixups[fptr++] = i;
+                    fixups[fptr++] = tag;
+                    fixups[fptr++] = -1 ^ in.readUnsignedShort();  // not a ref
+                    fixups[fptr++] = in.readUnsignedShort();
+                    break;
+                case CONSTANT_MethodHandle:
+                    fixups[fptr++] = i;
+                    fixups[fptr++] = tag;
+                    fixups[fptr++] = -1 ^ in.readUnsignedByte();
+                    fixups[fptr++] = in.readUnsignedShort();
+                    break;
                 default:
                     throw new ClassFormatException("Bad constant pool tag " +
                             tag + " in File: " + cls.file.nameString +
@@ -270,7 +289,7 @@ class ClassReader {
                 int ref2 = fixups[fi++];
                 if (verbose > 3)
                     Utils.log.fine("  cp["+cpi+"] = "+ConstantPool.tagName(tag)+"{"+ref+","+ref2+"}");
-                if (cpMap[ref] == null || ref2 >= 0 && cpMap[ref2] == null) {
+                if (ref >= 0 && cpMap[ref] == null || ref2 >= 0 && cpMap[ref2] == null) {
                     // Defer.
                     fixups[fptr++] = cpi;
                     fixups[fptr++] = tag;
@@ -297,6 +316,19 @@ class ClassReader {
                     Utf8Entry mtype = (Utf8Entry) cpMap[ref2];
                     cpMap[cpi] = ConstantPool.getDescriptorEntry(mname, mtype);
                     break;
+                case CONSTANT_MethodType:
+                    cpMap[cpi] = ConstantPool.getMethodTypeEntry((Utf8Entry) cpMap[ref]);
+                    break;
+                case CONSTANT_MethodHandle:
+                    byte refKind = (byte)(-1 ^ ref);
+                    MemberEntry memRef = (MemberEntry) cpMap[ref2];
+                    cpMap[cpi] = ConstantPool.getMethodHandleEntry(refKind, memRef);
+                    break;
+                case CONSTANT_InvokeDynamic:
+                    DescriptorEntry idescr = (DescriptorEntry) cpMap[ref2];
+                    cpMap[cpi] = new UnresolvedEntry((byte)tag, (-1 ^ ref), idescr);
+                    // Note that ref must be resolved later, using the BootstrapMethods attribute.
+                    break;
                 default:
                     assert(false);
                 }
@@ -307,6 +339,50 @@ class ClassReader {
         cls.cpMap = cpMap;
     }
 
+    private /*non-static*/
+    class UnresolvedEntry extends Entry {
+        final Object[] refsOrIndexes;
+        UnresolvedEntry(byte tag, Object... refsOrIndexes) {
+            super(tag);
+            this.refsOrIndexes = refsOrIndexes;
+            ClassReader.this.haveUnresolvedEntry = true;
+        }
+        Entry resolve() {
+            Class cls = ClassReader.this.cls;
+            Entry res;
+            switch (tag) {
+            case CONSTANT_InvokeDynamic:
+                BootstrapMethodEntry iboots = cls.bootstrapMethods.get((Integer) refsOrIndexes[0]);
+                DescriptorEntry         idescr = (DescriptorEntry) refsOrIndexes[1];
+                res = ConstantPool.getInvokeDynamicEntry(iboots, idescr);
+                break;
+            default:
+                throw new AssertionError();
+            }
+            return res;
+        }
+        private void unresolved() { throw new RuntimeException("unresolved entry has no string"); }
+        public int compareTo(Object x) { unresolved(); return 0; }
+        public boolean equals(Object x) { unresolved(); return false; }
+        protected int computeValueHash() { unresolved(); return 0; }
+        public String stringValue() { unresolved(); return toString(); }
+        public String toString() { return "(unresolved "+ConstantPool.tagName(tag)+")"; }
+    }
+
+    boolean haveUnresolvedEntry;
+    private void fixUnresolvedEntries() {
+        if (!haveUnresolvedEntry)  return;
+        Entry[] cpMap = cls.getCPMap();
+        for (int i = 0; i < cpMap.length; i++) {
+            Entry e = cpMap[i];
+            if (e instanceof UnresolvedEntry) {
+                cpMap[i] = e = ((UnresolvedEntry)e).resolve();
+                assert(!(e instanceof UnresolvedEntry));
+            }
+        }
+        haveUnresolvedEntry = false;
+    }
+
     void readHeader() throws IOException {
         cls.flags = readUnsignedShort();
         cls.thisClass = readClassRef();
@@ -416,25 +492,31 @@ class ClassReader {
                                                         unknownAttrCommand);
                 }
             }
-            if (a.layout() == Package.attrCodeEmpty ||
-                a.layout() == Package.attrInnerClassesEmpty) {
+            long pos0 = inPos;  // in case we want to check it
+            if (a.layout() == Package.attrCodeEmpty) {
                 // These are hardwired.
-                long pos0 = inPos;
-                if ("Code".equals(a.name())) {
-                    Class.Method m = (Class.Method) h;
-                    m.code = new Code(m);
-                    try {
-                        readCode(m.code);
-                    } catch (Instruction.FormatException iie) {
-                        String message = iie.getMessage() + " in " + h;
-                        throw new ClassReader.ClassFormatException(message, iie);
-                    }
-                } else {
-                    assert(h == cls);
-                    readInnerClasses(cls);
+                Class.Method m = (Class.Method) h;
+                m.code = new Code(m);
+                try {
+                    readCode(m.code);
+                } catch (Instruction.FormatException iie) {
+                    String message = iie.getMessage() + " in " + h;
+                    throw new ClassReader.ClassFormatException(message, iie);
                 }
                 assert(length == inPos - pos0);
                 // Keep empty attribute a...
+            } else if (a.layout() == Package.attrBootstrapMethodsEmpty) {
+                assert(h == cls);
+                readBootstrapMethods(cls);
+                assert(length == inPos - pos0);
+                // Delete the attribute; it is logically part of the constant pool.
+                continue;
+            } else if (a.layout() == Package.attrInnerClassesEmpty) {
+                // These are hardwired also.
+                assert(h == cls);
+                readInnerClasses(cls);
+                assert(length == inPos - pos0);
+                // Keep empty attribute a...
             } else if (length > 0) {
                 byte[] bytes = new byte[length];
                 in.readFully(bytes);
@@ -467,6 +549,19 @@ class ClassReader {
         readAttributes(ATTR_CONTEXT_CODE, code);
     }
 
+    void readBootstrapMethods(Class cls) throws IOException {
+        BootstrapMethodEntry[] bsms = new BootstrapMethodEntry[readUnsignedShort()];
+        for (int i = 0; i < bsms.length; i++) {
+            MethodHandleEntry bsmRef = (MethodHandleEntry) readRef(CONSTANT_MethodHandle);
+            Entry[] argRefs = new Entry[readUnsignedShort()];
+            for (int j = 0; j < argRefs.length; j++) {
+                argRefs[j] = readRef();
+            }
+            bsms[i] = ConstantPool.getBootstrapMethodEntry(bsmRef, argRefs);
+        }
+        cls.setBootstrapMethods(Arrays.asList(bsms));
+    }
+
     void readInnerClasses(Class cls) throws IOException {
         int nc = readUnsignedShort();
         ArrayList<InnerClass> ics = new ArrayList<>(nc);

src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java

 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -29,6 +29,8 @@ package com.sun.java.util.jar.pack;
 import com.sun.java.util.jar.pack.ConstantPool.Entry;
 import com.sun.java.util.jar.pack.ConstantPool.Index;
 import com.sun.java.util.jar.pack.ConstantPool.NumberEntry;
+import com.sun.java.util.jar.pack.ConstantPool.MethodHandleEntry;
+import com.sun.java.util.jar.pack.ConstantPool.BootstrapMethodEntry;
 import com.sun.java.util.jar.pack.Package.Class;
 import com.sun.java.util.jar.pack.Package.InnerClass;
 import java.io.BufferedOutputStream;
@@ -49,6 +51,7 @@ class ClassWriter {
     Class cls;
     DataOutputStream out;
     Index cpIndex;
+    Index bsmIndex;
 
     ClassWriter(Class cls, OutputStream out) throws IOException {
         this.pkg = cls.getPackage();
@@ -57,6 +60,10 @@ class ClassWriter {
         this.out = new DataOutputStream(new BufferedOutputStream(out));
         this.cpIndex = ConstantPool.makeIndex(cls.toString(), cls.getCPMap());
         this.cpIndex.flattenSigs = true;
+        if (cls.hasBootstrapMethods()) {
+            this.bsmIndex = ConstantPool.makeIndex(cpIndex.debugName+".BootstrapMethods",
+                                                   cls.getBootstrapMethodMap());
+        }
         if (verbose > 1)
             Utils.log.fine("local CP="+(verbose > 2 ? cpIndex.dumpString() : cpIndex.toString()));
     }
@@ -71,6 +78,11 @@ class ClassWriter {
 
     /** Write a 2-byte int representing a CP entry, using the local cpIndex. */
     private void writeRef(Entry e) throws IOException {
+        writeRef(e, cpIndex);
+    }
+
+    /** Write a 2-byte int representing a CP entry, using the given cpIndex. */
+    private void writeRef(Entry e, Index cpIndex) throws IOException {
         int i = (e == null) ? 0 : cpIndex.indexOf(e);
         writeShort(i);
     }
@@ -117,8 +129,7 @@ class ClassWriter {
             out.write(tag);
             switch (tag) {
                 case CONSTANT_Signature:
-                    assert(false);  // should not reach here
-                    break;
+                    throw new AssertionError("CP should have Signatures remapped to Utf8");
                 case CONSTANT_Utf8:
                     out.writeUTF(e.stringValue());
                     break;
@@ -138,8 +149,14 @@ class ClassWriter {
                     break;
                 case CONSTANT_Class:
                 case CONSTANT_String:
+                case CONSTANT_MethodType:
                     writeRef(e.getRef(0));
                     break;
+                case CONSTANT_MethodHandle:
+                    MethodHandleEntry mhe = (MethodHandleEntry) e;
+                    out.writeByte(mhe.refKind);
+                    writeRef(mhe.getRef(0));
+                    break;
                 case CONSTANT_Fieldref:
                 case CONSTANT_Methodref:
                 case CONSTANT_InterfaceMethodref:
@@ -147,6 +164,12 @@ class ClassWriter {
                     writeRef(e.getRef(0));
                     writeRef(e.getRef(1));
                     break;
+                case CONSTANT_InvokeDynamic:
+                    writeRef(e.getRef(0), bsmIndex);
+                    writeRef(e.getRef(1));
+                    break;
+                case CONSTANT_BootstrapMethod:
+                    throw new AssertionError("CP should have BootstrapMethods moved to side-table");
                 default:
                     throw new IOException("Bad constant pool tag "+tag);
             }
@@ -198,6 +221,7 @@ class ClassWriter {
             a.finishRefs(cpIndex);
             writeRef(a.getNameRef());
             if (a.layout() == Package.attrCodeEmpty ||
+                a.layout() == Package.attrBootstrapMethodsEmpty ||
                 a.layout() == Package.attrInnerClassesEmpty) {
                 // These are hardwired.
                 DataOutputStream savedOut = out;
@@ -207,9 +231,14 @@ class ClassWriter {
                 if ("Code".equals(a.name())) {
                     Class.Method m = (Class.Method) h;
                     writeCode(m.code);
-                } else {
+                } else if ("BootstrapMethods".equals(a.name())) {
+                    assert(h == cls);
+                    writeBootstrapMethods(cls);
+                } else if ("InnerClasses".equals(a.name())) {
                     assert(h == cls);
                     writeInnerClasses(cls);
+                } else {
+                    throw new AssertionError();
                 }
                 out = savedOut;
                 if (verbose > 2)
@@ -242,6 +271,18 @@ class ClassWriter {
         writeAttributes(ATTR_CONTEXT_CODE, code);
     }
 
+    void writeBootstrapMethods(Class cls) throws IOException {
+        List<BootstrapMethodEntry> bsms = cls.getBootstrapMethods();
+        writeShort(bsms.size());
+        for (BootstrapMethodEntry e : bsms) {
+            writeRef(e.bsmRef);
+            writeShort(e.argRefs.length);
+            for (Entry argRef : e.argRefs) {
+                writeRef(argRef);
+            }
+        }
+    }
+
     void writeInnerClasses(Class cls) throws IOException {
         List<InnerClass> ics = cls.getInnerClasses();
         writeShort(ics.size());

src/share/classes/com/sun/java/util/jar/pack/Constants.java

 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -65,6 +65,9 @@ class Constants {
     public final static int JAVA6_PACKAGE_MAJOR_VERSION = 160;
     public final static int JAVA6_PACKAGE_MINOR_VERSION = 1;
 
+    public final static int JAVA7_PACKAGE_MAJOR_VERSION = 170;
+    public final static int JAVA7_PACKAGE_MINOR_VERSION = 1;
+
     public final static int CONSTANT_POOL_INDEX_LIMIT  = 0x10000;
     public final static int CONSTANT_POOL_NARROW_LIMIT = 0x00100;
 
@@ -82,14 +85,36 @@ class Constants {
     public final static byte CONSTANT_Methodref = 10;
     public final static byte CONSTANT_InterfaceMethodref = 11;
     public final static byte CONSTANT_NameandType = 12;
+    public final static byte CONSTANT_unused13 = 13;
+    public final static byte CONSTANT_unused14 = 14;
+    public final static byte CONSTANT_MethodHandle = 15;
+    public final static byte CONSTANT_MethodType = 16;
+    public final static byte CONSTANT_unused17 = 17;  // unused
+    public final static byte CONSTANT_InvokeDynamic = 18;
 
     // pseudo-constants:
     public final static byte CONSTANT_None = 0;
-    public final static byte CONSTANT_Signature = 13;
-    public final static byte CONSTANT_Limit  = 14;
-
-    public final static byte CONSTANT_All = 19;  // combined global map
-    public final static byte CONSTANT_Literal = 20; // used only for ldc fields
+    public final static byte CONSTANT_Signature = CONSTANT_unused13;
+    public final static byte CONSTANT_BootstrapMethod = CONSTANT_unused17; // used only in InvokeDynamic constants
+    public final static byte CONSTANT_Limit = 19;
+
+    public final static byte CONSTANT_All = 50;  // combined global map
+    public final static byte CONSTANT_LoadableValue = 51; // used for 'KL' and qldc operands
+    public final static byte CONSTANT_AnyMember = 52; // union of refs to field or (interface) method
+    public final static byte CONSTANT_FieldSpecific = 53; // used only for 'KQ' ConstantValue attrs
+    public final static byte CONSTANT_GroupFirst = CONSTANT_All;
+    public final static byte CONSTANT_GroupLimit = CONSTANT_FieldSpecific+1;
+
+    // CONSTANT_MethodHandle reference kinds
+    public final static byte REF_getField = 1;
+    public final static byte REF_getStatic = 2;
+    public final static byte REF_putField = 3;
+    public final static byte REF_putStatic = 4;
+    public final static byte REF_invokeVirtual = 5;
+    public final static byte REF_invokeStatic = 6;
+    public final static byte REF_invokeSpecial = 7;
+    public final static byte REF_newInvokeSpecial = 8;
+    public final static byte REF_invokeInterface = 9;
 
     // pseudo-access bits
     public final static int ACC_IC_LONG_FORM   = (1<<16); //for ic_flags
@@ -133,7 +158,7 @@ class Constants {
     public static final int AO_HAVE_SPECIAL_FORMATS   = 1<<0;
     public static final int AO_HAVE_CP_NUMBERS        = 1<<1;
     public static final int AO_HAVE_ALL_CODE_FLAGS    = 1<<2;
-    public static final int AO_3_UNUSED_MBZ           = 1<<3;
+    public static final int AO_HAVE_CP_EXTRAS         = 1<<3;
     public static final int AO_HAVE_FILE_HEADERS      = 1<<4;
     public static final int AO_DEFLATE_HINT           = 1<<5;
     public static final int AO_HAVE_FILE_MODTIME      = 1<<6;
@@ -143,6 +168,7 @@ class Constants {
     public static final int AO_HAVE_FIELD_FLAGS_HI    = 1<<10;
     public static final int AO_HAVE_METHOD_FLAGS_HI   = 1<<11;
     public static final int AO_HAVE_CODE_FLAGS_HI     = 1<<12;
+    public static final int AO_UNUSED_MBZ          = (-1)<<13;  // option bits reserved for future use
 
     public static final int LG_AO_HAVE_XXX_FLAGS_HI   = 9;
 
@@ -357,7 +383,7 @@ class Constants {
         _invokespecial        = 183, // 0xb7
         _invokestatic         = 184, // 0xb8
         _invokeinterface      = 185, // 0xb9
-        _xxxunusedxxx         = 186, // 0xba
+        _invokedynamic        = 186, // 0xba
         _new                  = 187, // 0xbb
         _newarray             = 188, // 0xbc
         _anewarray            = 189, // 0xbd
@@ -422,15 +448,18 @@ class Constants {
     // Ldc variants gain us only 0.007% improvement in compression ratio,
     // but they simplify the file format greatly.
     public final static int _xldc_op = _invokeinit_limit;
-    public final static int _aldc = _ldc;
+    public final static int _sldc = _ldc;  // previously named _aldc
     public final static int _cldc = _xldc_op+0;
     public final static int _ildc = _xldc_op+1;
     public final static int _fldc = _xldc_op+2;
-    public final static int _aldc_w = _ldc_w;
+    public final static int _sldc_w = _ldc_w;  // previously named _aldc_w
     public final static int _cldc_w = _xldc_op+3;
     public final static int _ildc_w = _xldc_op+4;
     public final static int _fldc_w = _xldc_op+5;
     public final static int _lldc2_w = _ldc2_w;
     public final static int _dldc2_w = _xldc_op+6;
-    public final static int _xldc_limit = _xldc_op+7;
+    // anything other than primitive, string, or class must be handled with qldc:
+    public final static int _qldc   = _xldc_op+7;
+    public final static int _qldc_w = _xldc_op+8;
+    public final static int _xldc_limit = _xldc_op+9;
 }

src/share/classes/com/sun/java/util/jar/pack/Instruction.java

 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -451,7 +451,7 @@ class Instruction  {
 
     public static byte getCPRefOpTag(int bc) {
         if (bc < BC_INDEX[0].length && BC_INDEX[0][bc] > 0)  return BC_TAG[0][bc];
-        if (bc >= _xldc_op && bc < _xldc_limit)  return CONSTANT_Literal;
+        if (bc >= _xldc_op && bc < _xldc_limit)  return CONSTANT_LoadableValue;
         return CONSTANT_None;
     }
 
@@ -500,7 +500,7 @@ class Instruction  {
         def("bkf", _getstatic, _putfield);              // pack kf (base=Field)
         def("bkm", _invokevirtual, _invokestatic);      // pack kn (base=Method)
         def("bkixx", _invokeinterface);         // pack ki (base=IMethod), omit xx
-        def("", _xxxunusedxxx);
+        def("bkyxx", _invokedynamic);           // pack ky (base=Any), omit xx
         def("bkc", _new);                               // pack kc
         def("bx", _newarray);
         def("bkc", _anewarray);                 // pack kc
@@ -515,7 +515,6 @@ class Instruction  {
             //System.out.println(i+": l="+BC_LENGTH[0][i]+" i="+BC_INDEX[0][i]);
             //assert(BC_LENGTH[0][i] != -1);
             if (BC_LENGTH[0][i] == -1) {
-                assert(i == _xxxunusedxxx);
                 continue;  // unknown opcode
             }
 
@@ -543,7 +542,7 @@ class Instruction  {
   "if_icmpne if_icmplt if_icmpge if_icmpgt if_icmple if_acmpeq if_acmpne "+
   "goto jsr ret tableswitch lookupswitch ireturn lreturn freturn dreturn "+
   "areturn return getstatic putstatic getfield putfield invokevirtual "+
-  "invokespecial invokestatic invokeinterface xxxunusedxxx new newarray "+
+  "invokespecial invokestatic invokeinterface invokedynamic new newarray "+
   "anewarray arraylength athrow checkcast instanceof monitorenter "+
   "monitorexit wide multianewarray ifnull ifnonnull goto_w jsr_w ";
         for (int bc = 0; names.length() > 0; bc++) {
@@ -588,6 +587,8 @@ class Instruction  {
             case _dldc2_w:  iname = "*dldc2_w"; break;
             case _cldc:  iname = "*cldc"; break;
             case _cldc_w:  iname = "*cldc_w"; break;
+            case _qldc:  iname = "*qldc"; break;
+            case _qldc_w:  iname = "*qldc_w"; break;
             case _byte_escape:  iname = "*byte_escape"; break;
             case _ref_escape:  iname = "*ref_escape"; break;
             case _end_marker:  iname = "*end"; break;
@@ -618,15 +619,16 @@ class Instruction  {
             if (index > 0 && index+1 < length) {
                 switch (fmt.charAt(index+1)) {
                     case 'c': tag = CONSTANT_Class; break;
-                    case 'k': tag = CONSTANT_Literal; break;
+                    case 'k': tag = CONSTANT_LoadableValue; break;
                     case 'f': tag = CONSTANT_Fieldref; break;
                     case 'm': tag = CONSTANT_Methodref; break;
                     case 'i': tag = CONSTANT_InterfaceMethodref; break;
+                    case 'y': tag = CONSTANT_InvokeDynamic; break;
                 }
                 assert(tag != CONSTANT_None);
             } else if (index > 0 && length == 2) {
                 assert(from_bc == _ldc);
-                tag = CONSTANT_Literal;  // _ldc opcode only
+                tag = CONSTANT_LoadableValue;  // _ldc opcode only
             }
             for (int bc = from_bc; bc <= to_bc; bc++) {
                 BC_FORMAT[w][bc] = fmt;
@@ -649,7 +651,7 @@ class Instruction  {
         Instruction i = at(code, 0);
         while (i != null) {
             int opcode = i.getBC();
-            if (opcode == _xxxunusedxxx || opcode < _nop || opcode > _jsr_w) {
+            if (opcode < _nop || opcode > _jsr_w) {
                 String message = "illegal opcode: " + opcode + " " + i;
                 throw new FormatException(message);
             }

src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java

@@ -87,7 +87,12 @@ class NativeUnpack {
         // If loading from stand alone build uncomment this.
         // System.loadLibrary("unpack");
         java.security.AccessController.doPrivileged(
-                new sun.security.action.LoadLibraryAction("unpack"));
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("unpack");
+                    return null;
+                }
+            });
         initIDs();
     }
 

src/share/classes/com/sun/java/util/jar/pack/Package.java

 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -28,6 +28,7 @@ package com.sun.java.util.jar.pack;
 import com.sun.java.util.jar.pack.Attribute.Layout;
 import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
 import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
+import com.sun.java.util.jar.pack.ConstantPool.BootstrapMethodEntry;
 import com.sun.java.util.jar.pack.ConstantPool.Index;
 import com.sun.java.util.jar.pack.ConstantPool.LiteralEntry;
 import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
@@ -100,6 +101,8 @@ class Package {
         classes.clear();
         files.clear();
         BandStructure.nextSeqForDebug = 0;
+        package_minver = -1;  // fill in later
+        package_majver = 0;   // fill in later
     }
 
     int getPackageVersion() {
@@ -108,6 +111,7 @@ class Package {
 
     // Special empty versions of Code and InnerClasses, used for markers.
     public static final Attribute.Layout attrCodeEmpty;
+    public static final Attribute.Layout attrBootstrapMethodsEmpty;
     public static final Attribute.Layout attrInnerClassesEmpty;
     public static final Attribute.Layout attrSourceFileSpecial;
     public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -115,6 +119,8 @@ class Package {
         Map<Layout, Attribute> ad = new HashMap<>(3);
         attrCodeEmpty = Attribute.define(ad, ATTR_CONTEXT_METHOD,
                                          "Code", "").layout();
+        attrBootstrapMethodsEmpty = Attribute.define(ad, ATTR_CONTEXT_CLASS,
+                                                     "BootstrapMethods", "").layout();
         attrInnerClassesEmpty = Attribute.define(ad, ATTR_CONTEXT_CLASS,
                                                  "InnerClasses", "").layout();
         attrSourceFileSpecial = Attribute.define(ad, ATTR_CONTEXT_CLASS,
@@ -153,9 +159,8 @@ class Package {
             package_minver = JAVA6_PACKAGE_MINOR_VERSION;
         } else {
             // Normal case.  Use the newest archive format, when available
-            // TODO: replace the following with JAVA7* when the need arises
-            package_majver = JAVA6_PACKAGE_MAJOR_VERSION;
-            package_minver = JAVA6_PACKAGE_MINOR_VERSION;
+            package_majver = JAVA7_PACKAGE_MAJOR_VERSION;
+            package_minver = JAVA7_PACKAGE_MINOR_VERSION;
         }
     }
 
@@ -168,13 +173,22 @@ class Package {
             String expMag = Integer.toHexString(JAVA_PACKAGE_MAGIC);
             throw new IOException("Unexpected package magic number: got "+gotMag+"; expected "+expMag);
         }
-        if ((package_majver != JAVA6_PACKAGE_MAJOR_VERSION  &&
-             package_majver != JAVA5_PACKAGE_MAJOR_VERSION) ||
-             (package_minver != JAVA6_PACKAGE_MINOR_VERSION &&
-             package_minver != JAVA5_PACKAGE_MINOR_VERSION)) {
-
+        int[] majminFound = null;
+        for (int[] majmin : new int[][]{
+                { JAVA7_PACKAGE_MAJOR_VERSION, JAVA7_PACKAGE_MINOR_VERSION },
+                { JAVA6_PACKAGE_MAJOR_VERSION, JAVA6_PACKAGE_MINOR_VERSION },
+                { JAVA5_PACKAGE_MAJOR_VERSION, JAVA5_PACKAGE_MINOR_VERSION }
+            }) {
+            if (package_majver == majmin[0] && package_minver == majmin[1]) {
+                majminFound = majmin;
+                break;
+            }
+        }
+        if (majminFound == null) {
             String gotVer = package_majver+"."+package_minver;
-            String expVer = JAVA6_PACKAGE_MAJOR_VERSION+"."+JAVA6_PACKAGE_MINOR_VERSION+
+            String expVer = JAVA7_PACKAGE_MAJOR_VERSION+"."+JAVA7_PACKAGE_MINOR_VERSION+
+                            " OR "+
+                            JAVA6_PACKAGE_MAJOR_VERSION+"."+JAVA6_PACKAGE_MINOR_VERSION+
                             " OR "+
                             JAVA5_PACKAGE_MAJOR_VERSION+"."+JAVA5_PACKAGE_MINOR_VERSION;
             throw new IOException("Unexpected package minor version: got "+gotVer+"; expected "+expVer);
@@ -213,6 +227,7 @@ class Package {
         //ArrayList attributes;  // in Attribute.Holder.this.attributes
         // Note that InnerClasses may be collected at the package level.
         ArrayList<InnerClass> innerClasses;
+        ArrayList<BootstrapMethodEntry> bootstrapMethods;
 
         Class(int flags, ClassEntry thisClass, ClassEntry superClass, ClassEntry[] interfaces) {
             this.magic      = JAVA_MAGIC;
@@ -313,6 +328,25 @@ class Package {
             this.cpMap = cpMap;
         }
 
+        boolean hasBootstrapMethods() {
+            return bootstrapMethods != null && !bootstrapMethods.isEmpty();
+        }
+
+        List<BootstrapMethodEntry> getBootstrapMethods() {
+            return bootstrapMethods;
+        }
+
+        BootstrapMethodEntry[] getBootstrapMethodMap() {
+            return (hasBootstrapMethods())
+                    ? bootstrapMethods.toArray(new BootstrapMethodEntry[bootstrapMethods.size()])
+                    : null;
+        }
+
+        void setBootstrapMethods(Collection<BootstrapMethodEntry> bsms) {
+            assert(bootstrapMethods == null);  // do not do this twice
+            bootstrapMethods = new ArrayList<>(bsms);
+        }
+
         boolean hasInnerClasses() {
             return innerClasses != null;
         }
@@ -1283,7 +1317,8 @@ class Package {
             byTagU[tag] = null;  // done with it
         }
         for (int i = 0; i < byTagU.length; i++) {
-            assert(byTagU[i] == null);  // all consumed
+            Index ix = byTagU[i];
+            assert(ix == null);  // all consumed
         }
         for (int i = 0; i < ConstantPool.TAGS_IN_ORDER.length; i++) {
             byte tag = ConstantPool.TAGS_IN_ORDER[i];

src/share/classes/com/sun/java/util/jar/pack/PackageReader.java

 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -25,13 +25,7 @@
 
 package com.sun.java.util.jar.pack;
 
-import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
-import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
-import com.sun.java.util.jar.pack.ConstantPool.Entry;
-import com.sun.java.util.jar.pack.ConstantPool.Index;
-import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
-import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
-import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
+import com.sun.java.util.jar.pack.ConstantPool.*;
 import com.sun.java.util.jar.pack.Package.Class;
 import com.sun.java.util.jar.pack.Package.File;
 import com.sun.java.util.jar.pack.Package.InnerClass;
@@ -46,6 +40,7 @@ import java.util.ArrayList;
 import java.util.Map;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.HashMap;
@@ -266,7 +261,6 @@ class PackageReader extends BandStructure {
         //        #band_headers_size :UNSIGNED5[1]
         //        #attr_definition_count :UNSIGNED5[1]
         //
-        assert(AH_LENGTH == 8+(ConstantPool.TAGS_IN_ORDER.length)+6);
         archive_header_0.expectLength(AH_LENGTH_0);
         archive_header_0.readFrom(in);
 
@@ -282,6 +276,7 @@ class PackageReader extends BandStructure {
         boolean haveSpecial = testBit(archiveOptions, AO_HAVE_SPECIAL_FORMATS);
         boolean haveFiles   = testBit(archiveOptions, AO_HAVE_FILE_HEADERS);
         boolean haveNumbers = testBit(archiveOptions, AO_HAVE_CP_NUMBERS);
+        boolean haveCPExtra = testBit(archiveOptions, AO_HAVE_CP_EXTRAS);
         initAttrIndexLimit();
 
         // now we are ready to use the data:
@@ -300,11 +295,11 @@ class PackageReader extends BandStructure {
         archive_header_S.doneDisbursing();
         archiveSize0 = in.getBytesServed();
 
-        int remainingHeaders = AH_LENGTH - AH_LENGTH_0 - AH_LENGTH_S;
-        if (!haveFiles)    remainingHeaders -= AH_FILE_HEADER_LEN-AH_LENGTH_S;
-        if (!haveSpecial)  remainingHeaders -= AH_SPECIAL_FORMAT_LEN;
-        if (!haveNumbers)  remainingHeaders -= AH_CP_NUMBER_LEN;
-        assert(remainingHeaders >= AH_LENGTH_MIN - AH_LENGTH_0);
+        int remainingHeaders = AH_LENGTH_MIN - AH_LENGTH_0 - AH_LENGTH_S;
+        if (haveFiles)    remainingHeaders += AH_FILE_HEADER_LEN;
+        if (haveSpecial)  remainingHeaders += AH_SPECIAL_FORMAT_LEN;
+        if (haveNumbers)  remainingHeaders += AH_CP_NUMBER_LEN;
+        if (haveCPExtra)  remainingHeaders += AH_CP_EXTRA_LEN;
         archive_header_1.expectLength(remainingHeaders);
         archive_header_1.readFrom(in);
 
@@ -325,7 +320,7 @@ class PackageReader extends BandStructure {
             numAttrDefs = 0;
         }
 
-        readConstantPoolCounts(haveNumbers);
+        readConstantPoolCounts(haveNumbers, haveCPExtra);
 
         numInnerClasses = archive_header_1.getInt();
 
@@ -351,7 +346,7 @@ class PackageReader extends BandStructure {
         band_headers.doneDisbursing();
     }
 
-    void readConstantPoolCounts(boolean haveNumbers) throws IOException {
+    void readConstantPoolCounts(boolean haveNumbers, boolean haveCPExtra) throws IOException {
         // size the constant pools:
         for (int k = 0; k < ConstantPool.TAGS_IN_ORDER.length; k++) {
             //  cp_counts:
@@ -364,6 +359,7 @@ class PackageReader extends BandStructure {
             //        #cp_Field_count :UNSIGNED5[1]
             //        #cp_Method_count :UNSIGNED5[1]
             //        #cp_Imethod_count :UNSIGNED5[1]
+            //        (cp_attr_counts) ** (#have_cp_attr_counts)
             //
             //  cp_number_counts:
             //        #cp_Int_count :UNSIGNED5[1]
@@ -371,6 +367,12 @@ class PackageReader extends BandStructure {
             //        #cp_Long_count :UNSIGNED5[1]
             //        #cp_Double_count :UNSIGNED5[1]
             //
+            //  cp_extra_counts:
+            //        #cp_MethodHandle_count :UNSIGNED5[1]
+            //        #cp_MethodType_count :UNSIGNED5[1]
+            //        #cp_InvokeDynamic_count :UNSIGNED5[1]
+            //        #cp_BootstrapMethod_count :UNSIGNED5[1]
+            //
             byte tag = ConstantPool.TAGS_IN_ORDER[k];
             if (!haveNumbers) {
                 // These four counts are optional.
@@ -382,6 +384,16 @@ class PackageReader extends BandStructure {
                     continue;
                 }
             }
+            if (!haveCPExtra) {
+                // These four counts are optional.
+                switch (tag) {
+                case CONSTANT_MethodHandle:
+                case CONSTANT_MethodType:
+                case CONSTANT_InvokeDynamic:
+                case CONSTANT_BootstrapMethod:
+                    continue;
+                }
+            }
             tagCount[tag] = archive_header_1.getInt();
         }
     }
@@ -401,6 +413,11 @@ class PackageReader extends BandStructure {
         return index;
     }
 
+    void checkLegacy(String bandname) {
+        if (this.pkg.package_majver < JAVA7_PACKAGE_MAJOR_VERSION) {
+            throw new RuntimeException("unexpected band " + bandname);
+        }
+    }
     void readConstantPool() throws IOException {
         //  cp_bands:
         //        cp_Utf8
@@ -533,8 +550,82 @@ class PackageReader extends BandStructure {
             case CONSTANT_InterfaceMethodref:
                 readMemberRefs(tag, cpMap, cp_Imethod_class, cp_Imethod_desc);
                 break;
+            case CONSTANT_MethodHandle:
+                if (cpMap.length > 0) {
+                    checkLegacy(cp_MethodHandle_refkind.name());
+                }
+                cp_MethodHandle_refkind.expectLength(cpMap.length);
+                cp_MethodHandle_refkind.readFrom(in);
+                cp_MethodHandle_member.expectLength(cpMap.length);
+                cp_MethodHandle_member.readFrom(in);
+                cp_MethodHandle_member.setIndex(getCPIndex(CONSTANT_AnyMember));
+                for (int i = 0; i < cpMap.length; i++) {
+                    byte        refKind = (byte)        cp_MethodHandle_refkind.getInt();
+                    MemberEntry memRef  = (MemberEntry) cp_MethodHandle_member.getRef();
+                    cpMap[i] = ConstantPool.getMethodHandleEntry(refKind, memRef);
+                }
+                cp_MethodHandle_refkind.doneDisbursing();
+                cp_MethodHandle_member.doneDisbursing();
+                break;
+            case CONSTANT_MethodType:
+                if (cpMap.length > 0) {
+                    checkLegacy(cp_MethodType.name());
+                }
+                cp_MethodType.expectLength(cpMap.length);
+                cp_MethodType.readFrom(in);
+                cp_MethodType.setIndex(getCPIndex(CONSTANT_Signature));
+                for (int i = 0; i < cpMap.length; i++) {
+                    SignatureEntry typeRef  = (SignatureEntry) cp_MethodType.getRef();
+                    cpMap[i] = ConstantPool.getMethodTypeEntry(typeRef);
+                }
+                cp_MethodType.doneDisbursing();
+                break;
+            case CONSTANT_InvokeDynamic:
+                if (cpMap.length > 0) {
+                    checkLegacy(cp_InvokeDynamic_spec.name());
+                }
+                cp_InvokeDynamic_spec.expectLength(cpMap.length);
+                cp_InvokeDynamic_spec.readFrom(in);
+                cp_InvokeDynamic_spec.setIndex(getCPIndex(CONSTANT_BootstrapMethod));
+                cp_InvokeDynamic_desc.expectLength(cpMap.length);
+                cp_InvokeDynamic_desc.readFrom(in);
+                cp_InvokeDynamic_desc.setIndex(getCPIndex(CONSTANT_NameandType));
+                for (int i = 0; i < cpMap.length; i++) {
+                    BootstrapMethodEntry bss   = (BootstrapMethodEntry) cp_InvokeDynamic_spec.getRef();
+                    DescriptorEntry      descr = (DescriptorEntry)      cp_InvokeDynamic_desc.getRef();
+                    cpMap[i] = ConstantPool.getInvokeDynamicEntry(bss, descr);
+                }
+                cp_InvokeDynamic_spec.doneDisbursing();
+                cp_InvokeDynamic_desc.doneDisbursing();
+                break;
+            case CONSTANT_BootstrapMethod:
+                if (cpMap.length > 0) {
+                    checkLegacy(cp_BootstrapMethod_ref.name());
+                }
+                cp_BootstrapMethod_ref.expectLength(cpMap.length);
+                cp_BootstrapMethod_ref.readFrom(in);
+                cp_BootstrapMethod_ref.setIndex(getCPIndex(CONSTANT_MethodHandle));
+                cp_BootstrapMethod_arg_count.expectLength(cpMap.length);
+                cp_BootstrapMethod_arg_count.readFrom(in);
+                int totalArgCount = cp_BootstrapMethod_arg_count.getIntTotal();
+                cp_BootstrapMethod_arg.expectLength(totalArgCount);
+                cp_BootstrapMethod_arg.readFrom(in);
+                cp_BootstrapMethod_arg.setIndex(getCPIndex(CONSTANT_LoadableValue));
+                for (int i = 0; i < cpMap.length; i++) {
+                    MethodHandleEntry bsm = (MethodHandleEntry) cp_BootstrapMethod_ref.getRef();
+                    int argc = cp_BootstrapMethod_arg_count.getInt();
+                    Entry[] argRefs = new Entry[argc];
+                    for (int j = 0; j < argc; j++) {
+                        argRefs[j] = cp_BootstrapMethod_arg.getRef();
+                    }
+                    cpMap[i] = ConstantPool.getBootstrapMethodEntry(bsm, argRefs);
+                }
+                cp_BootstrapMethod_ref.doneDisbursing();
+                cp_BootstrapMethod_arg_count.doneDisbursing();
+                cp_BootstrapMethod_arg.doneDisbursing();
+                break;
             default:
-                assert(false);
+                throw new AssertionError("unexpected CP tag in package");
             }
 
             Index index = initCPIndex(tag, cpMap);
@@ -548,6 +639,21 @@ class PackageReader extends BandStructure {
 
         cp_bands.doneDisbursing();
 
+        if (optDumpBands || verbose > 1) {
+            for (byte tag = CONSTANT_GroupFirst; tag < CONSTANT_GroupLimit; tag++) {
+                Index index = pkg.cp.getIndexByTag(tag);
+                if (index == null || index.isEmpty())  continue;
+                Entry[] cpMap = index.cpMap;
+                if (verbose > 1)
+                    Utils.log.info("Index group "+ConstantPool.tagName(tag)+" contains "+cpMap.length+" entries.");
+                if (optDumpBands) {
+                    try (PrintStream ps = new PrintStream(getDumpStream(index.debugName, tag, ".gidx", index))) {
+                        printArrayTo(ps, cpMap, 0, cpMap.length, true);
+                    }
+                }
+            }
+        }
+
         setBandIndexes();
     }
 
@@ -1056,8 +1162,16 @@ class PackageReader extends BandStructure {
         // look for constant pool entries:
         cls.visitRefs(VRM_CLASSIC, cpRefs);
 
+        ArrayList<BootstrapMethodEntry> bsms = new ArrayList<>();
+        /*
+         * BootstrapMethod(BSMs) are added here before InnerClasses(ICs),
+         * so as to ensure the order. Noting that the BSMs  may be
+         * removed if they are not found in the CP, after the ICs expansion.
+         */
+        cls.addAttribute(Package.attrBootstrapMethodsEmpty.canonicalInstance());
+
         // flesh out the local constant pool
-        ConstantPool.completeReferencesIn(cpRefs, true);
+        ConstantPool.completeReferencesIn(cpRefs, true, bsms);
 
         // Now that we know all our local class references,
         // compute the InnerClasses attribute.
@@ -1074,14 +1188,23 @@ class PackageReader extends BandStructure {
             }
 
             // flesh out the local constant pool, again
-            ConstantPool.completeReferencesIn(cpRefs, true);
+            ConstantPool.completeReferencesIn(cpRefs, true, bsms);
+        }
+
+        // remove the attr previously set, otherwise add the bsm and
+        // references as required
+        if (bsms.isEmpty()) {
+            cls.attributes.remove(Package.attrBootstrapMethodsEmpty.canonicalInstance());
+        } else {
+            cpRefs.add(Package.getRefString("BootstrapMethods"));
+            Collections.sort(bsms);
+            cls.setBootstrapMethods(bsms);
         }
 
         // construct a local constant pool
         int numDoubles = 0;
         for (Entry e : cpRefs) {
             if (e.isDoubleWord())  numDoubles++;
-            assert(e.tag != CONSTANT_Signature) : (e);
         }
         Entry[] cpMap = new Entry[1+numDoubles+cpRefs.size()];
         int fillp = 1;
@@ -1154,7 +1277,8 @@ class PackageReader extends BandStructure {
         int totalNM = class_method_count.getIntTotal();
         field_descr.expectLength(totalNF);
         method_descr.expectLength(totalNM);
-        if (verbose > 1)  Utils.log.fine("expecting #fields="+totalNF+" and #methods="+totalNM+" in #classes="+numClasses);
+        if (verbose > 1)  Utils.log.fine("expecting #fields="+totalNF+
+                " and #methods="+totalNM+" in #classes="+numClasses);
 
         List<Class.Field> fields = new ArrayList<>(totalNF);
         field_descr.readFrom(in);
@@ -1393,7 +1517,8 @@ class PackageReader extends BandStructure {
         MultiBand xxx_attr_bands = attrBands[ctype];
         long flagMask = attrFlagMask[ctype];
         if (verbose > 1) {
-            Utils.log.fine("scanning flags and attrs for "+Attribute.contextName(ctype)+"["+holders.size()+"]");
+            Utils.log.fine("scanning flags and attrs for "+
+                    Attribute.contextName(ctype)+"["+holders.size()+"]");
         }
 
         // Fetch the attribute layout definitions which govern the bands
@@ -1751,8 +1876,10 @@ class PackageReader extends BandStructure {
             bc_local, bc_label,
             bc_intref, bc_floatref,
             bc_longref, bc_doubleref, bc_stringref,
+            bc_loadablevalueref,
             bc_classref, bc_fieldref,
             bc_methodref, bc_imethodref,
+            bc_indyref,
             bc_thisfield, bc_superfield,
             bc_thismethod, bc_supermethod,
             bc_initref,
@@ -2099,7 +2226,8 @@ class PackageReader extends BandStructure {
                         case _ildc:
                         case _cldc:
                         case _fldc:
-                        case _aldc:
+                        case _sldc:
+                        case _qldc:
                             origBC = _ldc;
                             size = 1;
                             ldcRefSet.add(ref);
@@ -2107,7 +2235,8 @@ class PackageReader extends BandStructure {
                         case _ildc_w:
                         case _cldc_w:
                         case _fldc_w:
-                        case _aldc_w:
+                        case _sldc_w:
+                        case _qldc_w:
                             origBC = _ldc_w;
                             break;
                         case _lldc2_w:
@@ -2136,6 +2265,9 @@ class PackageReader extends BandStructure {
                             int argSize = ((MemberEntry)ref).descRef.typeRef.computeSize(true);
                             buf[pc++] = (byte)( 1 + argSize );
                             buf[pc++] = 0;
+                        } else if (origBC == _invokedynamic) {
+                            buf[pc++] = 0;
+                            buf[pc++] = 0;
                         }
                         assert(Instruction.opLength(origBC) == (pc - curPC));
                         continue;

src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java

 /*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 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
@@ -25,15 +25,7 @@
 
 package com.sun.java.util.jar.pack;
 
-import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
-import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
-import com.sun.java.util.jar.pack.ConstantPool.Entry;
-import com.sun.java.util.jar.pack.ConstantPool.Index;
-import com.sun.java.util.jar.pack.ConstantPool.IndexGroup;
-import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
-import com.sun.java.util.jar.pack.ConstantPool.NumberEntry;
-import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
-import com.sun.java.util.jar.pack.ConstantPool.StringEntry;
+import com.sun.java.util.jar.pack.ConstantPool.*;
 import com.sun.java.util.jar.pack.Package.Class;
 import com.sun.java.util.jar.pack.Package.File;
 import com.sun.java.util.jar.pack.Package.InnerClass;
@@ -281,7 +273,7 @@ class PackageWriter extends BandStructure {
 
     void writeArchiveHeader() throws IOException {
         // for debug only:  number of words optimized away
-        int headerDiscountForDebug = 0;
+        int headerSizeForDebug = AH_LENGTH_MIN;
 
         // AO_HAVE_SPECIAL_FORMATS is set if non-default
         // coding techniques are used, or if there are
@@ -293,8 +285,8 @@ class PackageWriter extends BandStructure {
             if (haveSpecial)
                 archiveOptions |= AO_HAVE_SPECIAL_FORMATS;
         }
-        if (!haveSpecial)
-            headerDiscountForDebug += AH_SPECIAL_FORMAT_LEN;
+        if (haveSpecial)
+            headerSizeForDebug += AH_SPECIAL_FORMAT_LEN;
 
         // AO_HAVE_FILE_HEADERS is set if there is any
         // file or segment envelope information present.
@@ -305,8 +297,8 @@ class PackageWriter extends BandStructure {
             if (haveFiles)
                 archiveOptions |= AO_HAVE_FILE_HEADERS;
         }
-        if (!haveFiles)
-            headerDiscountForDebug += AH_FILE_HEADER_LEN;
+        if (haveFiles)
+            headerSizeForDebug += AH_FILE_HEADER_LEN;
 
         // AO_HAVE_CP_NUMBERS is set if there are any numbers
         // in the global constant pool.  (Numbers are in 15% of classes.)
@@ -316,8 +308,19 @@ class PackageWriter extends BandStructure {
             if (haveNumbers)
                 archiveOptions |= AO_HAVE_CP_NUMBERS;
         }
-        if (!haveNumbers)
-            headerDiscountForDebug += AH_CP_NUMBER_LEN;
+        if (haveNumbers)
+            headerSizeForDebug += AH_CP_NUMBER_LEN;
+
+        // AO_HAVE_CP_EXTRAS is set if there are constant pool entries
+        // beyond the Java 6 version of the class file format.
+        boolean haveCPExtra = testBit(archiveOptions, AO_HAVE_CP_EXTRAS);
+        if (!haveCPExtra) {
+            haveCPExtra |= pkg.cp.haveExtraTags();
+            if (haveCPExtra)
+                archiveOptions |= AO_HAVE_CP_EXTRAS;
+        }
+        if (haveCPExtra)
+            headerSizeForDebug += AH_CP_EXTRA_LEN;
 
         assert(pkg.package_majver > 0);  // caller must specify!
         archive_header_0.putInt(pkg.package_minver);
@@ -355,18 +358,18 @@ class PackageWriter extends BandStructure {
             assert(attrDefsWritten.length == 0);
         }
 
-        writeConstantPoolCounts(haveNumbers);
+        writeConstantPoolCounts(haveNumbers, haveCPExtra);
 
         archive_header_1.putInt(pkg.getAllInnerClasses().size());
         archive_header_1.putInt(pkg.default_class_minver);
         archive_header_1.putInt(pkg.default_class_majver);
         archive_header_1.putInt(pkg.classes.size());
 
-        // Sanity:  Make sure we came out to 26 (less optional fields):
+        // Sanity:  Make sure we came out to 29 (less optional fields):
         assert(archive_header_0.length() +
                archive_header_S.length() +
                archive_header_1.length()
-               == AH_LENGTH - headerDiscountForDebug);
+               == headerSizeForDebug);
 
         // Figure out all the sizes now, first cut:
         archiveSize0 = 0;
@@ -394,9 +397,8 @@ class PackageWriter extends BandStructure {
         assert(all_bands.outputSize() == archiveSize0+archiveSize1);
     }
 
-    void writeConstantPoolCounts(boolean haveNumbers) throws IOException {
-        for (int k = 0; k < ConstantPool.TAGS_IN_ORDER.length; k++) {
-            byte tag = ConstantPool.TAGS_IN_ORDER[k];
+    void writeConstantPoolCounts(boolean haveNumbers, boolean haveCPExtra) throws IOException {
+        for (byte tag : ConstantPool.TAGS_IN_ORDER) {
             int count = pkg.cp.getIndexByTag(tag).size();
             switch (tag) {
             case CONSTANT_Utf8:
@@ -416,6 +418,17 @@ class PackageWriter extends BandStructure {
                     continue;
                 }
                 break;
+
+            case CONSTANT_MethodHandle:
+            case CONSTANT_MethodType:
+            case CONSTANT_InvokeDynamic:
+            case CONSTANT_BootstrapMethod:
+                // Omit counts for newer entities if possible.
+                if (!haveCPExtra) {
+                    assert(count == 0);
+                    continue;
+                }
+                break;
             }
             archive_header_1.putInt(count);
         }
@@ -449,8 +462,7 @@ class PackageWriter extends BandStructure {
 
         if (verbose > 0)  Utils.log.info("Writing CP");
 
-        for (int k = 0; k < ConstantPool.TAGS_IN_ORDER.length; k++) {
-            byte  tag   = ConstantPool.TAGS_IN_ORDER[k];
+        for (byte tag : ConstantPool.TAGS_IN_ORDER) {
             Index index = cp.getIndexByTag(tag);
 
             Entry[] cpMap = index.cpMap;
@@ -530,8 +542,52 @@ class PackageWriter extends BandStructure {
             case CONSTANT_InterfaceMethodref:
                 writeMemberRefs(tag, cpMap, cp_Imethod_class, cp_Imethod_desc);
                 break;
+            case CONSTANT_MethodHandle:
+                for (int i = 0; i < cpMap.length; i++) {
+                    MethodHandleEntry e = (MethodHandleEntry) cpMap[i];
+                    cp_MethodHandle_refkind.putInt(e.refKind);
+                    cp_MethodHandle_member.putRef(e.memRef);
+                }
+                break;
+            case CONSTANT_MethodType:
+                for (int i = 0; i < cpMap.length; i++) {
+                    MethodTypeEntry e = (MethodTypeEntry) cpMap[i];
+                    cp_MethodType.putRef(e.typeRef);
+                }
+                break;
+            case CONSTANT_InvokeDynamic:
+                for (int i = 0; i < cpMap.length; i++) {
+                    InvokeDynamicEntry e = (InvokeDynamicEntry) cpMap[i];
+                    cp_InvokeDynamic_spec.putRef(e.bssRef);
+                    cp_InvokeDynamic_desc.putRef(e.descRef);
+                }
+                break;
+            case CONSTANT_BootstrapMethod:
+                for (int i = 0; i < cpMap.length; i++) {
+                    BootstrapMethodEntry e = (BootstrapMethodEntry) cpMap[i];
+                    cp_BootstrapMethod_ref.putRef(e.bsmRef);
+                    cp_BootstrapMethod_arg_count.putInt(e.argRefs.length);
+                    for (Entry argRef : e.argRefs) {
+                        cp_BootstrapMethod_arg.putRef(argRef);
+                    }
+                }
+                break;
             default:
-                assert(false);
+                throw new AssertionError("unexpected CP tag in package");
+            }
+        }
+        if (optDumpBands || verbose > 1) {
+            for (byte tag = CONSTANT_GroupFirst; tag < CONSTANT_GroupLimit; tag++) {
+                Index index = cp.getIndexByTag(tag);
+                if (index == null || index.isEmpty())  continue;
+                Entry[] cpMap = index.cpMap;
+                if (verbose > 1)
+                    Utils.log.info("Index group "+ConstantPool.tagName(tag)+" contains "+cpMap.length+" entries.");
+                if (optDumpBands) {
+                    try (PrintStream ps = new PrintStream(getDumpStream(index.debugName, tag, ".gidx", index))) {
+                        printArrayTo(ps, cpMap, 0, cpMap.length, true);
+                    }
+                }
             }
         }
     }
@@ -988,6 +1044,8 @@ class PackageWriter extends BandStructure {
         for (Class cls : pkg.classes) {
             // Replace "obvious" SourceFile attrs by null.
             cls.minimizeSourceFile();
+            // BootstrapMethods should never have been inserted.
+            assert(cls.getAttribute(Package.attrBootstrapMethodsEmpty) == null);
         }
     }
 
@@ -1325,9 +1383,7 @@ class PackageWriter extends BandStructure {
             // %%% Add a stress mode which issues _ref/_byte_escape.
             if (verbose > 3)  Utils.log.fine(i.toString());
 
-            if (i.isNonstandard()
-                && (!p200.getBoolean(Utils.COM_PREFIX+"invokedynamic")
-                    || i.getBC() != _xxxunusedxxx)) {
+            if (i.isNonstandard()) {
                 // Crash and burn with a complaint if there are funny
                 // bytecodes in this class file.
                 String complaint = code.getMethod()
@@ -1427,24 +1483,6 @@ class PackageWriter extends BandStructure {
                 continue;
             }
 
-            switch (bc) {
-            case _xxxunusedxxx:  // %%% pretend this is invokedynamic
-                {
-                    i.setNonstandardLength(3);
-                    int refx = i.getShortAt(1);
-                    Entry ref = (refx == 0)? null: curCPMap[refx];
-                    // transmit the opcode, carefully:
-                    bc_codes.putByte(_byte_escape);
-                    bc_escsize.putInt(1);     // one byte of opcode
-                    bc_escbyte.putByte(bc);   // the opcode
-                    // transmit the CP reference, carefully:
-                    bc_codes.putByte(_ref_escape);
-                    bc_escrefsize.putInt(2);  // two bytes of ref
-                    bc_escref.putRef(ref);    // the ref
-                    continue;
-                }
-            }
-
             int branch = i.getBranchLabel();
             if (branch >= 0) {
                 bc_codes.putByte(bc);
@@ -1458,7 +1496,7 @@ class PackageWriter extends BandStructure {
                 CPRefBand bc_which;
                 int vbc = bc;
                 switch (i.getCPTag()) {
-                case CONSTANT_Literal:
+                case CONSTANT_LoadableValue:
                     switch (ref.tag) {
                     case CONSTANT_Integer:
                         bc_which = bc_intref;
@@ -1489,8 +1527,8 @@ class PackageWriter extends BandStructure {
                     case CONSTANT_String:
                         bc_which = bc_stringref;
                         switch (bc) {
-                        case _ldc:    vbc = _aldc; break;
-                        case _ldc_w:  vbc = _aldc_w; break;
+                        case _ldc:    vbc = _sldc; break;
+                        case _ldc_w:  vbc = _sldc_w; break;
                         default:      assert(false);
                         }
                         break;
@@ -1503,8 +1541,16 @@ class PackageWriter extends BandStructure {
                         }
                         break;
                     default:
-                        bc_which = null;
-                        assert(false);
+                        // CONSTANT_MethodHandle, etc.
+                        if (getPackageMajver() < JAVA7_PACKAGE_MAJOR_VERSION) {
+                            throw new IOException("bad package major version for Java 7 ldc");
+                        }
+                        bc_which = bc_loadablevalueref;
+                        switch (bc) {
+                        case _ldc:    vbc = _qldc; break;
+                        case _ldc_w:  vbc = _qldc_w; break;
+                        default:      assert(false);
+                        }
                     }
                     break;
                 case CONSTANT_Class:
@@ -1517,6 +1563,8 @@ class PackageWriter extends BandStructure {
                     bc_which = bc_methodref; break;
                 case CONSTANT_InterfaceMethodref:
                     bc_which = bc_imethodref; break;
+                case CONSTANT_InvokeDynamic:
+                    bc_which = bc_indyref; break;
                 default:
                     bc_which = null;
                     assert(false);
@@ -1532,6 +1580,12 @@ class PackageWriter extends BandStructure {
                     assert(i.getLength() == 5);
                     // Make sure the discarded bytes are sane:
                     assert(i.getConstant() == (1+((MemberEntry)ref).descRef.typeRef.computeSize(true)) << 8);
+                } else if (bc == _invokedynamic) {
+                    if (getPackageMajver() < JAVA7_PACKAGE_MAJOR_VERSION) {
+                        throw new IOException("bad package major version for Java 7 invokedynamic");
+                    }
+                    assert(i.getLength() == 5);
+                    assert(i.getConstant() == 0);  // last 2 bytes MBZ
                 } else {
                     // Make sure there is nothing else to write.
                     assert(i.getLength() == ((bc == _ldc)?2:3));

src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java

 /*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
@@ -28,6 +28,10 @@ import com.sun.java.util.jar.pack.ConstantPool.ClassEntry;
 import com.sun.java.util.jar.pack.ConstantPool.DescriptorEntry;
 import com.sun.java.util.jar.pack.ConstantPool.LiteralEntry;
 import com.sun.java.util.jar.pack.ConstantPool.MemberEntry;
+import com.sun.java.util.jar.pack.ConstantPool.MethodHandleEntry;
+import com.sun.java.util.jar.pack.ConstantPool.MethodTypeEntry;
+import com.sun.java.util.jar.pack.ConstantPool.InvokeDynamicEntry;
+import com.sun.java.util.jar.pack.ConstantPool.BootstrapMethodEntry;
 import com.sun.java.util.jar.pack.ConstantPool.SignatureEntry;
 import com.sun.java.util.jar.pack.ConstantPool.Utf8Entry;
 import java.util.HashMap;
@@ -56,6 +60,10 @@ class TLGlobals {
     private final Map<String, SignatureEntry> signatureEntries;
     private final Map<String, DescriptorEntry> descriptorEntries;
     private final Map<String, MemberEntry> memberEntries;
+    private final Map<String, MethodHandleEntry> methodHandleEntries;
+    private final Map<String, MethodTypeEntry> methodTypeEntries;
+    private final Map<String, InvokeDynamicEntry> invokeDynamicEntries;
+    private final Map<String, BootstrapMethodEntry> bootstrapMethodEntries;
 
     TLGlobals() {
         utf8Entries = new HashMap<>();
@@ -64,6 +72,10 @@ class TLGlobals {
         signatureEntries = new HashMap<>();
         descriptorEntries = new HashMap<>();
         memberEntries = new HashMap<>();
+        methodHandleEntries = new HashMap<>();
+        methodTypeEntries = new HashMap<>();
+        invokeDynamicEntries = new HashMap<>();
+        bootstrapMethodEntries = new HashMap<>();
         props = new PropMap();
     }
 
@@ -94,4 +106,20 @@ class TLGlobals {
     Map<String, MemberEntry> getMemberEntries() {
         return memberEntries;
     }
+
+    Map<String, MethodHandleEntry> getMethodHandleEntries() {
+        return methodHandleEntries;
+    }
+
+    Map<String, MethodTypeEntry> getMethodTypeEntries() {
+        return methodTypeEntries;
+    }
+
+    Map<String, InvokeDynamicEntry> getInvokeDynamicEntries() {
+        return invokeDynamicEntries;
+    }
+
+    Map<String, BootstrapMethodEntry> getBootstrapMethodEntries() {
+        return bootstrapMethodEntries;
+    }
 }

src/share/classes/com/sun/java/util/jar/pack/Utils.java

 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -60,7 +60,7 @@ class Utils {
      * If >3, print tons of comments (e.g., processing of references).
      * (installer only)
      */
-    static final String DEBUG_VERBOSE = Utils.COM_PREFIX+"verbose";
+    static final String DEBUG_VERBOSE = COM_PREFIX+"verbose";
 
     /*
      * Disables use of native code, prefers the Java-coded implementation.
@@ -134,35 +134,11 @@ class Utils {
     // to the engine code, especially the native code.
     static final ThreadLocal<TLGlobals> currentInstance = new ThreadLocal<>();
 
-    // convenience methods to access the TL globals
+    // convenience method to access the TL globals
     static TLGlobals getTLGlobals() {
         return currentInstance.get();
     }
 
-    static Map<String, Utf8Entry> getUtf8Entries() {
-        return getTLGlobals().getUtf8Entries();
-    }
-
-    static Map<String, ClassEntry> getClassEntries() {
-        return getTLGlobals().getClassEntries();
-    }
-
-    static Map<Object, LiteralEntry> getLiteralEntries() {
-        return getTLGlobals().getLiteralEntries();
-    }
-
-    static Map<String, DescriptorEntry> getDescriptorEntries() {
-         return getTLGlobals().getDescriptorEntries();
-    }
-
-    static Map<String, SignatureEntry> getSignatureEntries() {
-        return getTLGlobals().getSignatureEntries();
-    }
-
-    static Map<String, MemberEntry> getMemberEntries() {
-        return getTLGlobals().getMemberEntries();
-    }
-
     static PropMap currentPropMap() {
         Object obj = currentInstance.get();
         if (obj instanceof PackerImpl)
@@ -173,8 +149,19 @@ class Utils {
     }
 
     static final boolean nolog
-        = Boolean.getBoolean(Utils.COM_PREFIX+"nolog");
+        = Boolean.getBoolean(COM_PREFIX+"nolog");
+
+    static final boolean SORT_MEMBERS_DESCR_MAJOR
+        = Boolean.getBoolean(COM_PREFIX+"sort.members.descr.major");
+
+    static final boolean SORT_HANDLES_KIND_MAJOR
+        = Boolean.getBoolean(COM_PREFIX+"sort.handles.kind.major");
+
+    static final boolean SORT_INDY_BSS_MAJOR
+        = Boolean.getBoolean(COM_PREFIX+"sort.indy.bss.major");
 
+    static final boolean SORT_BSS_BSM_MAJOR
+        = Boolean.getBoolean(COM_PREFIX+"sort.bss.bsm.major");
 
     static class Pack200Logger {
         private final String name;

src/share/classes/java/awt/SplashScreen.java

@@ -119,7 +119,12 @@ public final class SplashScreen {
             // SplashScreen class is now a singleton
             if (!wasClosed && theInstance == null) {
                 java.security.AccessController.doPrivileged(
-                        new sun.security.action.LoadLibraryAction("splashscreen"));
+                    new java.security.PrivilegedAction<Void>() {
+                        public Void run() {
+                            System.loadLibrary("splashscreen");
+                            return null;
+                        }
+                    });
                 long ptr = _getInstance();
                 if (ptr != 0 && _isVisible(ptr)) {
                     theInstance = new SplashScreen(ptr);

src/share/classes/java/awt/Toolkit.java

@@ -1646,7 +1646,12 @@ public abstract class Toolkit {
     static void loadLibraries() {
         if (!loaded) {
             java.security.AccessController.doPrivileged(
-                          new sun.security.action.LoadLibraryAction("awt"));
+                new java.security.PrivilegedAction<Void>() {
+                    public Void run() {
+                        System.loadLibrary("awt");
+                        return null;
+                    }
+                });
             loaded = true;
         }
     }

src/share/classes/java/awt/event/NativeLibLoader.java

@@ -54,6 +54,11 @@ class NativeLibLoader {
      */
     static void loadLibraries() {
         java.security.AccessController.doPrivileged(
-                new sun.security.action.LoadLibraryAction("awt"));
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("awt");
+                    return null;
+                }
+            });
     }
 }

src/share/classes/java/awt/image/ColorModel.java

@@ -204,7 +204,12 @@ public abstract class ColorModel implements Transparency{
     static void loadLibraries() {
         if (!loaded) {
             java.security.AccessController.doPrivileged(
-                  new sun.security.action.LoadLibraryAction("awt"));
+                new java.security.PrivilegedAction<Void>() {
+                    public Void run() {
+                        System.loadLibrary("awt");
+                        return null;
+                    }
+                });
             loaded = true;
         }
     }

src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java

 /*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 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
@@ -60,14 +60,19 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
     /**
      * flag set if the native connect() call not to be used
      */
-    private final static boolean connectDisabled = os.startsWith("Mac OS");
+    private final static boolean connectDisabled = os.contains("OS X");
 
     /**
      * Load net library into runtime.
      */
     static {
         java.security.AccessController.doPrivileged(
-                  new sun.security.action.LoadLibraryAction("net"));
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("net");
+                    return null;
+                }
+            });
     }
 
     /**

src/share/classes/java/net/AbstractPlainSocketImpl.java

@@ -78,7 +78,12 @@ abstract class AbstractPlainSocketImpl extends SocketImpl
      */
     static {
         java.security.AccessController.doPrivileged(
-                  new sun.security.action.LoadLibraryAction("net"));
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("net");
+                    return null;
+                }
+            });
     }
 
     /**

src/share/classes/java/net/DatagramPacket.java

@@ -47,7 +47,12 @@ class DatagramPacket {
      */
     static {
         java.security.AccessController.doPrivileged(
-                  new sun.security.action.LoadLibraryAction("net"));
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("net");
+                    return null;
+                }
+            });
         init();
     }
 

src/share/classes/java/net/InetAddress.java

@@ -234,7 +234,13 @@ class InetAddress implements java.io.Serializable {
     static {
         preferIPv6Address = java.security.AccessController.doPrivileged(
             new GetBooleanAction("java.net.preferIPv6Addresses")).booleanValue();
-        AccessController.doPrivileged(new LoadLibraryAction("net"));
+        AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("net");
+                    return null;
+                }
+            });
         init();
     }
 

src/share/classes/java/net/NetworkInterface.java

@@ -53,7 +53,14 @@ public final class NetworkInterface {
     private static final int defaultIndex; /* index of defaultInterface */
 
     static {
-        AccessController.doPrivileged(new LoadLibraryAction("net"));
+        AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("net");
+                    return null;
+                }
+            });
+
         init();
         defaultInterface = DefaultInterface.getDefault();
         if (defaultInterface != null) {

src/share/classes/java/nio/Bits.java

 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -609,7 +609,7 @@ class Bits {                            // package-private
         String arch = AccessController.doPrivileged(
             new sun.security.action.GetPropertyAction("os.arch"));
         unaligned = arch.equals("i386") || arch.equals("x86")
-            || arch.equals("amd64");
+            || arch.equals("amd64") || arch.equals("x86_64");
         unalignedKnown = true;
         return unaligned;
     }

src/share/classes/java/nio/file/Path.java

@@ -54,7 +54,7 @@ import java.util.Iterator;
  * resolveSibling} methods to combine paths. The {@link #relativize relativize}
  * method that can be used to construct a relative path between two paths.
  * Paths can be {@link #compareTo compared}, and tested against each other using
- * the {@link #startsWith startsWith} and {@link #endsWith endWith} methods.
+ * the {@link #startsWith startsWith} and {@link #endsWith endsWith} methods.
  *
  * <p> This interface extends {@link Watchable} interface so that a directory
  * located by a path can be {@link #register registered} with a {@link

src/share/classes/java/text/DateFormatSymbols.java

@@ -647,6 +647,8 @@ public class DateFormatSymbols implements Serializable, Cloneable {
     private static final ConcurrentMap<Locale, SoftReference<DateFormatSymbols>> cachedInstances
         = new ConcurrentHashMap<Locale, SoftReference<DateFormatSymbols>>(3);
 
+    private transient int lastZoneIndex = 0;
+
     private void initializeData(Locale desiredLocale) {
         locale = desiredLocale;
 
@@ -692,12 +694,24 @@ public class DateFormatSymbols implements Serializable, Cloneable {
      * the given time zone ID can't be located in the DateFormatSymbols object.
      * @see java.util.SimpleTimeZone
      */
-    final int getZoneIndex(String ID)
-    {
+    final int getZoneIndex(String ID) {
         String[][] zoneStrings = getZoneStringsWrapper();
-        for (int index=0; index<zoneStrings.length; index++)
-        {
-            if (ID.equals(zoneStrings[index][0])) return index;
+
+        /*
+         * getZoneIndex has been re-written for performance reasons. instead of
+         * traversing the zoneStrings array every time, we cache the last used zone
+         * index
+         */
+        if (lastZoneIndex < zoneStrings.length && ID.equals(zoneStrings[lastZoneIndex][0])) {
+            return lastZoneIndex;
+        }
+
+        /* slow path, search entire list */
+        for (int index = 0; index < zoneStrings.length; index++) {
+            if (ID.equals(zoneStrings[index][0])) {
+                lastZoneIndex = index;
+                return index;
+            }
         }
 
         return -1;

src/share/classes/java/util/prefs/Preferences.java

 /*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -293,7 +293,7 @@ public abstract class Preferences {
         String platformFactory;
         if (osName.startsWith("Windows")) {
             platformFactory = "java.util.prefs.WindowsPreferencesFactory";
-        } else if (osName.startsWith("Mac OS X")) {
+        } else if (osName.contains("OS X")) {
             platformFactory = "java.util.prefs.MacOSXPreferencesFactory";
         } else {
             platformFactory = "java.util.prefs.FileSystemPreferencesFactory";

src/share/classes/javax/net/ssl/SSLContext.java

@@ -145,7 +145,7 @@ public class SSLContext {
      * @return the new <code>SSLContext</code> object.
      *
      * @exception NoSuchAlgorithmException if no Provider supports a
-     *          TrustManagerFactorySpi implementation for the
+     *          SSLContextSpi implementation for the
      *          specified protocol.
      * @exception NullPointerException if protocol is null.
      *
@@ -222,11 +222,11 @@ public class SSLContext {
      *
      * @return the new <code>SSLContext</code> object.
      *
-     * @throws NoSuchAlgorithmException if a KeyManagerFactorySpi
+     * @throws NoSuchAlgorithmException if a SSLContextSpi
      *          implementation for the specified protocol is not available
      *          from the specified Provider object.
      *
-     * @throws IllegalArgumentException if the provider name is null.
+     * @throws IllegalArgumentException if the provider is null.
      * @throws NullPointerException if protocol is null.
      *
      * @see java.security.Provider

src/share/classes/javax/swing/JComponent.java

 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -2638,17 +2638,16 @@ public abstract class JComponent extends Container implements Serializable,
      *    attribute: visualUpdate true
      */
     public void setVisible(boolean aFlag) {
-        if(aFlag != isVisible()) {
+        if (aFlag != isVisible()) {
             super.setVisible(aFlag);
-            Container parent = getParent();
-            if(parent != null) {
-                Rectangle r = getBounds();
-                parent.repaint(r.x,r.y,r.width,r.height);
+            if (aFlag) {
+                Container parent = getParent();
+                if (parent != null) {
+                    Rectangle r = getBounds();
+                    parent.repaint(r.x, r.y, r.width, r.height);
+                }
+                revalidate();
             }
-            // Some (all should) LayoutManagers do not consider components
-            // that are not visible. As such we need to revalidate when the
-            // visible bit changes.
-            revalidate();
         }
     }
 
@@ -5568,4 +5567,21 @@ public abstract class JComponent extends Container implements Serializable,
         ",preferredSize=" + preferredSizeString;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void hide() {
+        boolean showing = isShowing();
+        super.hide();
+        if (showing) {
+            Container parent = getParent();
+            if (parent != null) {
+                Rectangle r = getBounds();
+                parent.repaint(r.x, r.y, r.width, r.height);
+            }
+            revalidate();
+        }
+    }
+
 }

src/share/classes/javax/swing/JDesktopPane.java

@@ -27,7 +27,8 @@ package javax.swing;
 
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Vector;
+import java.util.Collection;
+import java.util.Iterator;
 import javax.swing.plaf.*;
 import javax.accessibility.*;
 
@@ -42,7 +43,6 @@ import java.io.IOException;
 import java.beans.PropertyVetoException;
 import java.util.Set;
 import java.util.TreeSet;
-
 /**
  * A container used to create a multiple-document interface or a virtual desktop.
  * You create <code>JInternalFrame</code> objects and add them to the
@@ -261,25 +261,26 @@ public class JDesktopPane extends JLayeredPane implements Accessible
      * @return an array of <code>JInternalFrame</code> objects
      */
     public JInternalFrame[] getAllFrames() {
+        return getAllFrames(this).toArray(new JInternalFrame[0]);
+    }
+
+    private static Collection<JInternalFrame> getAllFrames(Container parent) {
         int i, count;
-        JInternalFrame[] results;
-        Vector<JInternalFrame> vResults = new Vector<JInternalFrame>(10);
-
-        count = getComponentCount();
-        for(i = 0; i < count; i++) {
-            Component next = getComponent(i);
-            if(next instanceof JInternalFrame)
-                vResults.addElement((JInternalFrame) next);
-            else if(next instanceof JInternalFrame.JDesktopIcon)  {
-                JInternalFrame tmp = ((JInternalFrame.JDesktopIcon)next).getInternalFrame();
-                if(tmp != null)
-                    vResults.addElement(tmp);
+        Collection<JInternalFrame> results = new ArrayList<JInternalFrame>();
+        count = parent.getComponentCount();
+        for (i = 0; i < count; i++) {
+            Component next = parent.getComponent(i);
+            if (next instanceof JInternalFrame) {
+                results.add((JInternalFrame) next);
+            } else if (next instanceof JInternalFrame.JDesktopIcon) {
+                JInternalFrame tmp = ((JInternalFrame.JDesktopIcon) next).getInternalFrame();
+                if (tmp != null) {
+                    results.add(tmp);
+                }
+            } else if (next instanceof Container) {
+                results.addAll(getAllFrames((Container) next));
             }
         }
-
-        results = new JInternalFrame[vResults.size()];
-        vResults.copyInto(results);
-
         return results;
     }
 
@@ -322,27 +323,14 @@ public class JDesktopPane extends JLayeredPane implements Accessible
      * @see JLayeredPane
      */
     public JInternalFrame[] getAllFramesInLayer(int layer) {
-        int i, count;
-        JInternalFrame[] results;
-        Vector<JInternalFrame> vResults = new Vector<JInternalFrame>(10);
-
-        count = getComponentCount();
-        for(i = 0; i < count; i++) {
-            Component next = getComponent(i);
-            if(next instanceof JInternalFrame) {
-                if(((JInternalFrame)next).getLayer() == layer)
-                    vResults.addElement((JInternalFrame) next);
-            } else if(next instanceof JInternalFrame.JDesktopIcon)  {
-                JInternalFrame tmp = ((JInternalFrame.JDesktopIcon)next).getInternalFrame();
-                if(tmp != null && tmp.getLayer() == layer)
-                    vResults.addElement(tmp);
+        Collection<JInternalFrame> allFrames = getAllFrames(this);
+        Iterator<JInternalFrame> iterator = allFrames.iterator();
+        while (iterator.hasNext()) {
+            if (iterator.next().getLayer() != layer) {
+                iterator.remove();
             }
         }
-
-        results = new JInternalFrame[vResults.size()];
-        vResults.copyInto(results);
-
-        return results;
+        return allFrames.toArray(new JInternalFrame[0]);
     }
 
     private List<JInternalFrame> getFrames() {

src/share/classes/javax/swing/JPopupMenu.java

 /*
- * Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -41,6 +41,8 @@ import javax.swing.plaf.PopupMenuUI;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicComboPopup;
 import javax.swing.event.*;
+
+import sun.awt.SunToolkit;
 import sun.security.util.SecurityConstants;
 
 import java.applet.Applet;
@@ -347,6 +349,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
         long popupBottomY = (long)popupLocation.y + (long)popupSize.height;
         int scrWidth = scrBounds.width;
         int scrHeight = scrBounds.height;
+
         if (!canPopupOverlapTaskBar()) {
             // Insets include the task bar. Take them into account.
             Insets scrInsets = toolkit.getScreenInsets(gc);
@@ -407,25 +410,19 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
     }
 
     /**
-     * Checks that there are enough security permissions
-     * to make popup "always on top", which allows to show it above the task bar.
+     * Returns whether popup is allowed to be shown above the task bar.
      */
     static boolean canPopupOverlapTaskBar() {
         boolean result = true;
-        try {
-            SecurityManager sm = System.getSecurityManager();
-            if (sm != null) {
-                sm.checkPermission(
-                    SecurityConstants.AWT.SET_WINDOW_ALWAYS_ON_TOP_PERMISSION);
-            }
-        } catch (SecurityException se) {
-            // There is no permission to show popups over the task bar
-            result = false;
+
+        Toolkit tk = Toolkit.getDefaultToolkit();
+        if (tk instanceof SunToolkit) {
+            result = ((SunToolkit)tk).canPopupOverlapTaskBar();
         }
+
         return result;
     }
 
-
     /**
      * Factory method which creates the <code>JMenuItem</code> for
      * <code>Actions</code> added to the <code>JPopupMenu</code>.

src/share/classes/javax/swing/JTable.java

@@ -5470,7 +5470,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
                 if (constructor.getDeclaringClass() == String.class) {
                     value = s;
                 }
-                super.stopCellEditing();
+                return super.stopCellEditing();
             }
 
             try {

src/share/classes/sun/awt/NativeLibLoader.java

@@ -54,6 +54,11 @@ class NativeLibLoader {
      */
     static void loadLibraries() {
         java.security.AccessController.doPrivileged(
-            new sun.security.action.LoadLibraryAction("awt"));
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("awt");
+                    return null;
+                }
+            });
     }
 }

src/share/classes/sun/awt/OSInfo.java

 /*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -101,7 +101,7 @@ public class OSInfo {
                 return SOLARIS;
             }
 
-            if (osName.startsWith("Mac OS X")) {
+            if (osName.contains("OS X")) {
                 return MACOSX;
             }
 

src/share/classes/sun/awt/SunToolkit.java

 /*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -42,6 +42,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
+
+import sun.security.util.SecurityConstants;
 import sun.util.logging.PlatformLogger;
 import sun.misc.SoftCache;
 import sun.font.FontDesignMetrics;
@@ -1135,6 +1137,26 @@ public abstract class SunToolkit extends Toolkit
         return ((mods & InputEvent.ALT_MASK) == (mods & InputEvent.CTRL_MASK));
     }
 
+    /**
+     * Returns whether popup is allowed to be shown above the task bar.
+     * This is a default implementation of this method, which checks
+     * corresponding security permission.
+     */
+    public boolean canPopupOverlapTaskBar() {
+        boolean result = true;
+        try {
+            SecurityManager sm = System.getSecurityManager();
+            if (sm != null) {
+                sm.checkPermission(
+                        SecurityConstants.AWT.SET_WINDOW_ALWAYS_ON_TOP_PERMISSION);
+            }
+        } catch (SecurityException se) {
+            // There is no permission to show popups over the task bar
+            result = false;
+        }
+        return result;
+    }
+
     /**
      * Returns a new input method window, with behavior as specified in
      * {@link java.awt.im.spi.InputMethodContext#createInputMethodWindow}.

src/share/classes/sun/awt/image/JPEGImageDecoder.java

@@ -54,7 +54,12 @@ public class JPEGImageDecoder extends ImageDecoder {
 
     static {
         java.security.AccessController.doPrivileged(
-                  new sun.security.action.LoadLibraryAction("jpeg"));
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("jpeg");
+                    return null;
+                }
+            });
         initIDs(InputStreamClass);
         RGBcolormodel = new DirectColorModel(24, 0xff0000, 0xff00, 0xff);
         ARGBcolormodel = ColorModel.getRGBdefault();

src/share/classes/sun/awt/image/NativeLibLoader.java

@@ -53,7 +53,12 @@ class NativeLibLoader {
      * that the name of the library is "awt".  -br.
      */
     static void loadLibraries() {
-        java.security.AccessController.doPrivileged
-                (new sun.security.action.LoadLibraryAction("awt"));
+        java.security.AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("awt");
+                    return null;
+                }
+            });
     }
 }

src/share/classes/sun/font/FontUtilities.java

 /*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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
@@ -78,7 +78,7 @@ public final class FontUtilities {
 
                 isLinux = osName.startsWith("Linux");
 
-                isMacOSX = osName.startsWith("Mac OS X"); // TODO: MacOSX
+                isMacOSX = osName.contains("OS X"); // TODO: MacOSX
 
                 String t2kStr = System.getProperty("sun.java2d.font.scaler");
                 if (t2kStr != null) {

src/share/classes/sun/java2d/Disposer.java

@@ -57,7 +57,12 @@ public class Disposer implements Runnable {
 
     static {
         java.security.AccessController.doPrivileged(
-            new sun.security.action.LoadLibraryAction("awt"));
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("awt");
+                    return null;
+                }
+            });
         initIDs();
         String type = (String) java.security.AccessController.doPrivileged(
                 new sun.security.action.GetPropertyAction("sun.java2d.reftype"));

src/share/classes/sun/launcher/LauncherHelper.java

 /*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -381,7 +381,7 @@ public enum LauncherHelper {
         PrintStream ostream =  (printToStderr) ? System.err : System.out;
         ostream.println(getLocalizedMessage("java.launcher.X.usage",
                 File.pathSeparator));
-        if (System.getProperty("os.name").startsWith("Mac OS")) {
+        if (System.getProperty("os.name").contains("OS X")) {
             ostream.println(getLocalizedMessage("java.launcher.X.macosx.usage",
                         File.pathSeparator));
         }

src/share/classes/sun/management/ManagementFactoryHelper.java

@@ -37,7 +37,6 @@ import javax.management.RuntimeOperationsException;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
-import sun.security.action.LoadLibraryAction;
 
 import sun.util.logging.LoggingSupport;
 
@@ -422,7 +421,13 @@ public class ManagementFactoryHelper {
     }
 
     static {
-        AccessController.doPrivileged(new LoadLibraryAction("management"));
+        AccessController.doPrivileged(
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("management");
+                    return null;
+                }
+            });
         jvm = new VMManagementImpl();
     }
 

src/share/classes/sun/net/sdp/SdpSupport.java

@@ -76,6 +76,11 @@ public final class SdpSupport {
 
     static {
         AccessController.doPrivileged(
-            new sun.security.action.LoadLibraryAction("net"));
+            new java.security.PrivilegedAction<Void>() {
+                public Void run() {
+                    System.loadLibrary("net");
+                    return null;
+                }
+            });
     }
 }

src/share/classes/sun/net/spi/DefaultProxySelector.java

@@ -95,7 +95,12 @@ public class DefaultProxySelector extends ProxySelector {
                 }});
         if (b != null && b.booleanValue()) {
             java.security.AccessController.doPrivileged(
-                      new sun.security.action.LoadLibraryAction("net"));
+                new java.security.PrivilegedAction<Void>() {
+                    public Void run() {
+                        System.loadLibrary("net");
+                        return null;
+                    }
+                });
             hasSystemProxies = init();
         }
     }

src/share/classes/sun/nio/ch/DatagramChannelImpl.java

@@ -744,7 +744,8 @@ class DatagramChannelImpl
                     if (sm != null)
                         sm.checkConnect(isa.getAddress().getHostAddress(),
                                         isa.getPort());
-                    disconnect0(fd);
+                    boolean isIPv6 = (family == StandardProtocolFamily.INET6);
+                    disconnect0(fd, isIPv6);
                     remoteAddress = null;
                     state = ST_UNCONNECTED;
 
@@ -1079,7 +1080,7 @@ class DatagramChannelImpl
 
     private static native void initIDs();
 
-    private static native void disconnect0(FileDescriptor fd)
+    private static native void disconnect0(FileDescriptor fd, boolean isIPv6)
         throws IOException;
 
     private native int receive0(FileDescriptor fd, long address, int len,

src/share/classes/sun/nio/ch/Util.java

@@ -472,10 +472,15 @@ public class Util {
             if (loaded)
                 return;
             loaded = true;
-            java.security.AccessController
-                .doPrivileged(new sun.security.action.LoadLibraryAction("net"));
-            java.security.AccessController
-                .doPrivileged(new sun.security.action.LoadLibraryAction("nio"));
+            java.security.AccessController.doPrivileged(
+                new java.security.PrivilegedAction<Void>() {
+                    public Void run() {
+                        System.loadLibrary("net");
+                        System.loadLibrary("nio");
+                        return null;
+                    }
+                });
+
             // IOUtil must be initialized; Its native methods are called from
             // other places in native nio code so they must be set up.
             IOUtil.initIDs();

src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java

 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -1280,7 +1280,7 @@ public class ExtendedCharsets
         String osName = AccessController.doPrivileged(
             new GetPropertyAction("os.name"));
         if ("SunOS".equals(osName) || "Linux".equals(osName)
-               || osName.startsWith("Mac OS")) {
+               || osName.contains("OS X")) {
             charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
                     new String[] {
                         "COMPOUND_TEXT",        // JDK historical

src/share/classes/sun/print/PSPrinterJob.java

@@ -1568,7 +1568,7 @@ public class PSPrinterJob extends RasterPrinterJob {
         }
 
        String osname = System.getProperty("os.name");
-       if (osname.equals("Linux") || osname.startsWith("Mac OS X")) {
+       if (osname.equals("Linux") || osname.contains("OS X")) {
             execCmd = new String[ncomps];
             execCmd[n++] = "/usr/bin/lpr";
             if ((pFlags & PRINTER) != 0) {

src/share/classes/sun/print/ServiceDialog.java

@@ -72,6 +72,7 @@ import javax.swing.text.NumberFormatter;
 import sun.print.SunPageSelection;
 import java.awt.event.KeyEvent;
 import java.net.URISyntaxException;
+import java.lang.reflect.Field;
 
 
 /**
@@ -479,20 +480,45 @@ public class ServiceDialog extends JDialog implements ActionListener {
      */
     public static String getMsg(String key) {
         try {
-            return messageRB.getString(key);
+            return removeMnemonics(messageRB.getString(key));
         } catch (java.util.MissingResourceException e) {
             throw new Error("Fatal: Resource for ServiceUI is broken; " +
                             "there is no " + key + " key in resource");
         }
     }
 
+    private static String removeMnemonics(String s) {
+        int i = s.indexOf('&');
+        int len = s.length();
+        if (i < 0 || i == (len - 1)) {
+            return s;
+        }
+        int j = s.indexOf('&', i+1);
+        if (j == i+1) {
+            if (j+1 == len) {
+                return s.substring(0, i+1);  // string ends with &&
+            } else {
+                return s.substring(0, i+1) + removeMnemonics(s.substring(j+1));
+            }
+        }
+        // ok first & not double &&
+        if (i == 0) {
+            return removeMnemonics(s.substring(1));
+        } else {
+            return (s.substring(0, i) + removeMnemonics(s.substring(i+1)));
+        }
+    }
+
+
     /**
      * Returns mnemonic character from resource
      */
     private static char getMnemonic(String key) {
-        String str = getMsg(key + ".mnemonic");
-        if ((str != null) && (str.length() > 0)) {
-            return str.charAt(0);
+        String str = messageRB.getString(key).replace("&&", "");
+        int index = str.indexOf('&');
+        if (0 <= index && index < str.length() - 1) {
+            char c = str.charAt(index + 1);
+            return Character.toUpperCase(c);
         } else {
             return (char)0;
         }
@@ -501,12 +527,23 @@ public class ServiceDialog extends JDialog implements ActionListener {
     /**
      * Returns the mnemonic as a KeyEvent.VK constant from the resource.
      */
+    static Class _keyEventClazz = null;
     private static int getVKMnemonic(String key) {
-        String str = getMsg(key + ".vkMnemonic");
-        if ((str != null) && (str.length() > 0)) {
-            try {
-                return Integer.parseInt(str);
-            } catch (NumberFormatException nfe) {}
+        String s = String.valueOf(getMnemonic(key));
+        if ( s == null || s.length() != 1) {
+            return 0;
+        }
+        String vkString = "VK_" + s.toUpperCase();
+
+        try {
+            if (_keyEventClazz == null) {
+                _keyEventClazz= Class.forName("java.awt.event.KeyEvent",
+                                 true, (ServiceDialog.class).getClassLoader());
+            }
+            Field field = _keyEventClazz.getDeclaredField(vkString);
+            int value = field.getInt(null);
+            return value;
+        } catch (Exception e) {
         }
         return 0;
     }

src/share/classes/sun/print/resources/serviceui.properties

@@ -14,15 +14,11 @@ border.margins=Margins
 button.cancel=Cancel
 button.ok=OK
 button.print=Print
-button.properties=Properties...
-button.properties.mnemonic=R
+button.properties=P&roperties...
 #
-checkbox.collate=Collate
-checkbox.collate.mnemonic=C
-checkbox.jobsheets=Banner Page
-checkbox.jobsheets.mnemonic=B
-checkbox.printtofile=Print To File
-checkbox.printtofile.mnemonic=F
+checkbox.collate=&Collate
+checkbox.jobsheets=&Banner Page
+checkbox.printtofile=Print To &File
 #
 dialog.printtitle=Print
 dialog.pstitle=Page Setup
@@ -33,70 +29,42 @@ dialog.noprintermsg=No print service found.
 dialog.writeerror=Cannot write to file:
 #
 label.info=Info:
-label.jobname=Job Name:
-label.jobname.mnemonic=J
-label.numcopies=Number of copies:
-label.numcopies.mnemonic=O
-label.priority=Priority:
-label.priority.mnemonic=R
-label.psname=Name:
-label.psname.mnemonic=N
+label.jobname=&Job Name:
+label.numcopies=Number &of copies:
+label.priority=P&riority:
+label.psname=&Name:
 label.pstype=Type:
 label.rangeto=To
-label.size=Size:
-label.size.mnemonic=Z
-label.source=Source:
-label.source.mnemonic=C
+label.size=Si&ze:
+label.source=Sour&ce:
 label.status=Status:
-label.username=User Name:
-label.username.mnemonic=U
+label.username=&User Name:
 label.millimetres=(mm)
 label.inches=(in)
-label.topmargin=top
-label.topmargin.mnemonic=T
-label.bottommargin=bottom
-label.bottommargin.mnemonic=B
-label.leftmargin=left
-label.leftmargin.mnemonic=F
-label.rightmargin=right
-label.rightmargin.mnemonic=R
+label.topmargin=&top
+label.bottommargin=&bottom
+label.leftmargin=le&ft
+label.rightmargin=&right
 #
-radiobutton.color=Color
-radiobutton.color.mnemonic=C
-radiobutton.draftq=Draft
-radiobutton.draftq.mnemonic=F
-radiobutton.duplex=Duplex
-radiobutton.duplex.mnemonic=D
-radiobutton.highq=High
-radiobutton.highq.mnemonic=H
-radiobutton.landscape=Landscape
-radiobutton.landscape.mnemonic=L
-radiobutton.monochrome=Monochrome
-radiobutton.monochrome.mnemonic=M
-radiobutton.normalq=Normal
-radiobutton.normalq.mnemonic=N
-radiobutton.oneside=One Side
-radiobutton.oneside.mnemonic=O
-radiobutton.portrait=Portrait
-radiobutton.portrait.mnemonic=P
-radiobutton.rangeall=All
-radiobutton.rangeall.mnemonic=L
-radiobutton.rangepages=Pages
-radiobutton.rangepages.mnemonic=E
-radiobutton.revlandscape=Reverse Landscape
-radiobutton.revlandscape.mnemonic=N
-radiobutton.revportrait=Reverse Portrait
-radiobutton.revportrait.mnemonic=I
-radiobutton.tumble=Tumble
-radiobutton.tumble.mnemonic=T
+radiobutton.color=&Color
+radiobutton.draftq=Dra&ft
+radiobutton.duplex=&Duplex
+radiobutton.highq=&High
+radiobutton.landscape=&Landscape
+radiobutton.monochrome=&Monochrome
+radiobutton.normalq=&Normal
+radiobutton.oneside=&One Side
+radiobutton.portrait=&Portrait
+radiobutton.rangeall=A&ll
+radiobutton.rangepages=Pag&es
+radiobutton.revlandscape=Reverse La&ndscape
+radiobutton.revportrait=Reverse Portra&it
+radiobutton.tumble=&Tumble
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=Appearance
-tab.appearance.vkMnemonic=65
-tab.general=General
-tab.general.vkMnemonic=71
-tab.pagesetup=Page Setup
-tab.pagesetup.vkMnemonic=83
+tab.appearance=&Appearance
+tab.general=&General
+tab.pagesetup=Page &Setup
 #
 error.pagerange=Invalid page range; please re-enter values (e.g. 1-3,5,7-10)
 error.destination=Invalid filename; please try again

src/share/classes/sun/print/resources/serviceui_de.properties

@@ -14,15 +14,11 @@ border.margins=R\u00E4nder
 button.cancel=Abbrechen
 button.ok=OK
 button.print=Drucken
-button.properties=Eigenschaften...
-button.properties.mnemonic=I
+button.properties=E&igenschaften...
 #
-checkbox.collate=Sortieren
-checkbox.collate.mnemonic=R
-checkbox.jobsheets=Bannerseite
-checkbox.jobsheets.mnemonic=B
-checkbox.printtofile=Ausgabe in Datei
-checkbox.printtofile.mnemonic=U
+checkbox.collate=So&rtieren
+checkbox.jobsheets=&Bannerseite
+checkbox.printtofile=A&usgabe in Datei
 #
 dialog.printtitle=Drucken
 dialog.pstitle=Seite einrichten
@@ -33,70 +29,42 @@ dialog.noprintermsg=Kein Druckservice gefunden.
 dialog.writeerror=Schreiben in Datei nicht m\u00F6glich:
 #
 label.info=Info:
-label.jobname=Job-Name:
-label.jobname.mnemonic=J
-label.numcopies=Anzahl Kopien:
-label.numcopies.mnemonic=K
-label.priority=Priorit\u00E4t:
-label.priority.mnemonic=R
-label.psname=Name:
-label.psname.mnemonic=N
+label.jobname=&Job-Name:
+label.numcopies=Anzahl &Kopien:
+label.priority=P&riorit\u00E4t:
+label.psname=&Name:
 label.pstype=Typ:
 label.rangeto=Bis
-label.size=Gr\u00F6\u00DFe:
-label.size.mnemonic=E
-label.source=Quelle:
-label.source.mnemonic=U
+label.size=Gr\u00F6\u00DF&e:
+label.source=Q&uelle:
 label.status=Status:
-label.username=Benutzername:
-label.username.mnemonic=U
+label.username=Ben&utzername:
 label.millimetres=(mm)
 label.inches=(Zoll)
-label.topmargin=oben
-label.topmargin.mnemonic=O
-label.bottommargin=unten
-label.bottommargin.mnemonic=N
-label.leftmargin=links
-label.leftmargin.mnemonic=L
-label.rightmargin=rechts
-label.rightmargin.mnemonic=R
+label.topmargin=&oben
+label.bottommargin=u&nten
+label.leftmargin=&links
+label.rightmargin=&rechts
 #
-radiobutton.color=Farbe
-radiobutton.color.mnemonic=F
-radiobutton.draftq=Entwurf
-radiobutton.draftq.mnemonic=W
-radiobutton.duplex=Duplex
-radiobutton.duplex.mnemonic=P
-radiobutton.highq=Hoch
-radiobutton.highq.mnemonic=H
-radiobutton.landscape=Querformat
-radiobutton.landscape.mnemonic=Q
-radiobutton.monochrome=Monochrom
-radiobutton.monochrome.mnemonic=M
-radiobutton.normalq=Normal
-radiobutton.normalq.mnemonic=N
-radiobutton.oneside=Einseitig
-radiobutton.oneside.mnemonic=E
-radiobutton.portrait=Hochformat
-radiobutton.portrait.mnemonic=H
-radiobutton.rangeall=Alle
-radiobutton.rangeall.mnemonic=L
-radiobutton.rangepages=Seiten
-radiobutton.rangepages.mnemonic=E
-radiobutton.revlandscape=Umgekehrtes Querformat
-radiobutton.revlandscape.mnemonic=M
-radiobutton.revportrait=Umgekehrtes Hochformat
-radiobutton.revportrait.mnemonic=K
-radiobutton.tumble=Kalenderdruck
-radiobutton.tumble.mnemonic=K
+radiobutton.color=&Farbe
+radiobutton.draftq=Ent&wurf
+radiobutton.duplex=Du&plex
+radiobutton.highq=&Hoch
+radiobutton.landscape=&Querformat
+radiobutton.monochrome=&Monochrom
+radiobutton.normalq=&Normal
+radiobutton.oneside=&Einseitig
+radiobutton.portrait=&Hochformat
+radiobutton.rangeall=A&lle
+radiobutton.rangepages=S&eiten
+radiobutton.revlandscape=U&mgekehrtes Querformat
+radiobutton.revportrait=Umge&kehrtes Hochformat
+radiobutton.tumble=&Kalenderdruck
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=Darstellung
-tab.appearance.vkMnemonic=68
-tab.general=Allgemein
-tab.general.vkMnemonic=65
-tab.pagesetup=Seite einrichten
-tab.pagesetup.vkMnemonic=83
+tab.appearance=&Darstellung
+tab.general=&Allgemein
+tab.pagesetup=&Seite einrichten
 #
 error.pagerange=Ung\u00FCltiger Seitenbereich. Geben Sie die Werte erneut ein (Beispiel: 1-3,5,7-10)
 error.destination=Ung\u00FCltiger Dateiname. Wiederholen Sie den Vorgang

src/share/classes/sun/print/resources/serviceui_es.properties

@@ -14,15 +14,11 @@ border.margins=M\u00E1rgenes
 button.cancel=Cancelar
 button.ok=Aceptar
 button.print=Imprimir
-button.properties=Propiedades...
-button.properties.mnemonic=R
+button.properties=P&ropiedades...
 #
-checkbox.collate=Intercalar
-checkbox.collate.mnemonic=C
-checkbox.jobsheets=P\u00E1gina de R\u00F3tulo
-checkbox.jobsheets.mnemonic=E
-checkbox.printtofile=Imprimir en Archivo
-checkbox.printtofile.mnemonic=M
+checkbox.collate=Inter&calar
+checkbox.jobsheets=P\u00E1gina d&e R\u00F3tulo
+checkbox.printtofile=I&mprimir en Archivo
 #
 dialog.printtitle=Imprimir
 dialog.pstitle=Preparar P\u00E1gina
@@ -33,70 +29,42 @@ dialog.noprintermsg=No se ha encontrado el servicio de impresi\u00F3n.
 dialog.writeerror=No se puede escribir en el archivo:
 #
 label.info=Informaci\u00F3n:
-label.jobname=Nombre del Trabajo:
-label.jobname.mnemonic=T
-label.numcopies=N\u00FAmero de Copias:
-label.numcopies.mnemonic=O
-label.priority=Prioridad:
-label.priority.mnemonic=I
-label.psname=Nombre:
-label.psname.mnemonic=N
+label.jobname=Nombre del &Trabajo:
+label.numcopies=N\u00FAmer&o de Copias:
+label.priority=Pr&ioridad:
+label.psname=&Nombre:
 label.pstype=Tipo:
 label.rangeto=A
-label.size=Tama\u00F1o:
-label.size.mnemonic=T
+label.size=&Tama\u00F1o:
 label.source=Origen:
-label.source.mnemonic=O
 label.status=Estado:
-label.username=Usuario:
-label.username.mnemonic=S
+label.username=U&suario:
 label.millimetres=(mm)
 label.inches=(pulg.)
 label.topmargin=superior
-label.topmargin.mnemonic=S
-label.bottommargin=inferior
-label.bottommargin.mnemonic=F
-label.leftmargin=izquierdo
-label.leftmargin.mnemonic=Q
-label.rightmargin=derecho
-label.rightmargin.mnemonic=E
+label.bottommargin=in&ferior
+label.leftmargin=iz&quierdo
+label.rightmargin=d&erecho
 #
-radiobutton.color=Color
-radiobutton.color.mnemonic=C
-radiobutton.draftq=Borrador
-radiobutton.draftq.mnemonic=R
-radiobutton.duplex=D\u00FAplex
-radiobutton.duplex.mnemonic=D
-radiobutton.highq=Alta
-radiobutton.highq.mnemonic=L
-radiobutton.landscape=Horizontal
-radiobutton.landscape.mnemonic=Z
-radiobutton.monochrome=Monocromo
-radiobutton.monochrome.mnemonic=M
-radiobutton.normalq=Normal
-radiobutton.normalq.mnemonic=N
-radiobutton.oneside=Una Cara
-radiobutton.oneside.mnemonic=U
-radiobutton.portrait=Vertical
-radiobutton.portrait.mnemonic=V
-radiobutton.rangeall=Todo
-radiobutton.rangeall.mnemonic=T
-radiobutton.rangepages=P\u00E1ginas
-radiobutton.rangepages.mnemonic=G
-radiobutton.revlandscape=Horizontal Inverso
-radiobutton.revlandscape.mnemonic=H
-radiobutton.revportrait=Vertical Inverso
-radiobutton.revportrait.mnemonic=R
-radiobutton.tumble=Cambio de Cara
-radiobutton.tumble.mnemonic=B
+radiobutton.color=&Color
+radiobutton.draftq=Bo&rrador
+radiobutton.duplex=&D\u00FAplex
+radiobutton.highq=A&lta
+radiobutton.landscape=Hori&zontal
+radiobutton.monochrome=&Monocromo
+radiobutton.normalq=&Normal
+radiobutton.oneside=&Una Cara
+radiobutton.portrait=&Vertical
+radiobutton.rangeall=&Todo
+radiobutton.rangepages=P\u00E1&ginas
+radiobutton.revlandscape=&Horizontal Inverso
+radiobutton.revportrait=Ve&rtical Inverso
+radiobutton.tumble=Cam&bio de Cara
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=Apariencia
-tab.appearance.vkMnemonic=65
-tab.general=General
-tab.general.vkMnemonic=71
-tab.pagesetup=Preparar P\u00E1gina
-tab.pagesetup.vkMnemonic=80
+tab.appearance=&Apariencia
+tab.general=&General
+tab.pagesetup=&Preparar P\u00E1gina
 #
 error.pagerange=Rango de p\u00E1ginas no v\u00E1lido; vuelva a introducir los valores (por ejemplo, 1-3, 5, 7-10)
 error.destination=Nombre de archivo no v\u00E1lido; int\u00E9ntelo de nuevo

src/share/classes/sun/print/resources/serviceui_fr.properties

@@ -14,15 +14,11 @@ border.margins=Marges
 button.cancel=Annuler
 button.ok=OK
 button.print=Imprimer
-button.properties=Propri\u00E9t\u00E9s...
-button.properties.mnemonic=R
+button.properties=P&ropri\u00E9t\u00E9s...
 #
-checkbox.collate=Collationner
-checkbox.collate.mnemonic=C
-checkbox.jobsheets=Page de banni\u00E8re
-checkbox.jobsheets.mnemonic=B
-checkbox.printtofile=Imprimer dans un fichier
-checkbox.printtofile.mnemonic=F
+checkbox.collate=&Collationner
+checkbox.jobsheets=Page de &banni\u00E8re
+checkbox.printtofile=Imprimer dans un &fichier
 #
 dialog.printtitle=Imprimer
 dialog.pstitle=Mise en page
@@ -33,70 +29,42 @@ dialog.noprintermsg=Service d'impression introuvable.
 dialog.writeerror=Impossible d'\u00E9crire dans le fichier :
 #
 label.info=Infos :
-label.jobname=Nom du travail :
-label.jobname.mnemonic=T
-label.numcopies=Nombre de copies :
-label.numcopies.mnemonic=O
-label.priority=Priorit\u00E9 :
-label.priority.mnemonic=R
-label.psname=Nom :
-label.psname.mnemonic=N
+label.jobname=Nom du &travail :
+label.numcopies=N&ombre de copies :
+label.priority=P&riorit\u00E9 :
+label.psname=&Nom :
 label.pstype=Type :
 label.rangeto=A
-label.size=Taille :
-label.size.mnemonic=L
-label.source=Source :
-label.source.mnemonic=C
+label.size=Tai&lle :
+label.source=Sour&ce :
 label.status=Statut :
-label.username=Nom utilisateur :
-label.username.mnemonic=O
+label.username=N&om utilisateur :
 label.millimetres=(mm)
 label.inches=(po)
-label.topmargin=haut
-label.topmargin.mnemonic=H
-label.bottommargin=bas
-label.bottommargin.mnemonic=B
-label.leftmargin=gauche
-label.leftmargin.mnemonic=G
-label.rightmargin=droite
-label.rightmargin.mnemonic=D
+label.topmargin=&haut
+label.bottommargin=&bas
+label.leftmargin=&gauche
+label.rightmargin=&droite
 #
-radiobutton.color=Couleur
-radiobutton.color.mnemonic=C
-radiobutton.draftq=Brouillon
-radiobutton.draftq.mnemonic=L
-radiobutton.duplex=Duplex
-radiobutton.duplex.mnemonic=D
-radiobutton.highq=Max.
-radiobutton.highq.mnemonic=X
-radiobutton.landscape=Paysage
-radiobutton.landscape.mnemonic=Y
-radiobutton.monochrome=Monochrome
-radiobutton.monochrome.mnemonic=M
-radiobutton.normalq=Normal
-radiobutton.normalq.mnemonic=N
-radiobutton.oneside=Un c\u00F4t\u00E9
-radiobutton.oneside.mnemonic=U
-radiobutton.portrait=Portrait
-radiobutton.portrait.mnemonic=P
-radiobutton.rangeall=Tout
-radiobutton.rangeall.mnemonic=T
-radiobutton.rangepages=Pages
-radiobutton.rangepages.mnemonic=E
-radiobutton.revlandscape=Paysage invers\u00E9
-radiobutton.revlandscape.mnemonic=N
-radiobutton.revportrait=Portrait invers\u00E9
-radiobutton.revportrait.mnemonic=I
-radiobutton.tumble=T\u00EAte-b\u00EAche
-radiobutton.tumble.mnemonic=T
+radiobutton.color=&Couleur
+radiobutton.draftq=Broui&llon
+radiobutton.duplex=&Duplex
+radiobutton.highq=Ma&x.
+radiobutton.landscape=Pa&ysage
+radiobutton.monochrome=&Monochrome
+radiobutton.normalq=&Normal
+radiobutton.oneside=&Un c\u00F4t\u00E9
+radiobutton.portrait=&Portrait
+radiobutton.rangeall=&Tout
+radiobutton.rangepages=Pag&es
+radiobutton.revlandscape=Paysage i&nvers\u00E9
+radiobutton.revportrait=Portra&it invers\u00E9
+radiobutton.tumble=&T\u00EAte-b\u00EAche
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=Apparence
-tab.appearance.vkMnemonic=65
-tab.general=G\u00E9n\u00E9ral
-tab.general.vkMnemonic=71
-tab.pagesetup=Mise en page
-tab.pagesetup.vkMnemonic=83
+tab.appearance=&Apparence
+tab.general=&G\u00E9n\u00E9ral
+tab.pagesetup=Mi&se en page
 #
 error.pagerange=Plage de pages non valide. Sp\u00E9cifiez les valeurs de nouveau (ex. : 1-3,5,7-10)
 error.destination=Nom de fichier non valide ; recommencez

src/share/classes/sun/print/resources/serviceui_it.properties

@@ -14,15 +14,11 @@ border.margins=Margini
 button.cancel=Annulla
 button.ok=OK
 button.print=Stampa
-button.properties=Propriet\u00E0...
-button.properties.mnemonic=R
+button.properties=P&ropriet\u00E0...
 #
-checkbox.collate=Fascicola
-checkbox.collate.mnemonic=L
-checkbox.jobsheets=Pagina banner
-checkbox.jobsheets.mnemonic=P
-checkbox.printtofile=Stampa su file
-checkbox.printtofile.mnemonic=F
+checkbox.collate=Fascico&la
+checkbox.jobsheets=&Pagina banner
+checkbox.printtofile=Stampa su &file
 #
 dialog.printtitle=Stampa
 dialog.pstitle=Imposta pagina
@@ -33,70 +29,42 @@ dialog.noprintermsg=Nessun servizio di stampa trovato
 dialog.writeerror=Impossibile scrivere nel file:
 #
 label.info=Informazioni:
-label.jobname=Nome job:
-label.jobname.mnemonic=J
-label.numcopies=Numero di copie:
-label.numcopies.mnemonic=O
-label.priority=Priorit\u00E0:
-label.priority.mnemonic=I
-label.psname=Nome:
-label.psname.mnemonic=N
+label.jobname=Nome &job:
+label.numcopies=Numer&o di copie:
+label.priority=Pr&iorit\u00E0:
+label.psname=&Nome:
 label.pstype=Tipo:
 label.rangeto=A
-label.size=Dimensioni:
-label.size.mnemonic=M
-label.source=Origine:
-label.source.mnemonic=R
+label.size=Di&mensioni:
+label.source=O&rigine:
 label.status=Stato:
-label.username=Nome utente:
-label.username.mnemonic=U
+label.username=Nome &utente:
 label.millimetres=(mm)
 label.inches=(poll.)
-label.topmargin=superiore
-label.topmargin.mnemonic=P
-label.bottommargin=inferiore
-label.bottommargin.mnemonic=F
-label.leftmargin=sinistro
-label.leftmargin.mnemonic=T
-label.rightmargin=destro
-label.rightmargin.mnemonic=D
+label.topmargin=su&periore
+label.bottommargin=in&feriore
+label.leftmargin=sinis&tro
+label.rightmargin=&destro
 #
-radiobutton.color=Colore
-radiobutton.color.mnemonic=C
-radiobutton.draftq=Bozza
-radiobutton.draftq.mnemonic=B
-radiobutton.duplex=Fronte retro
-radiobutton.duplex.mnemonic=R
-radiobutton.highq=Alta
-radiobutton.highq.mnemonic=L
-radiobutton.landscape=Orizzontale
-radiobutton.landscape.mnemonic=L
-radiobutton.monochrome=Monocromatico
-radiobutton.monochrome.mnemonic=M
-radiobutton.normalq=Normale
-radiobutton.normalq.mnemonic=N
-radiobutton.oneside=Un lato
-radiobutton.oneside.mnemonic=O
-radiobutton.portrait=Verticale
-radiobutton.portrait.mnemonic=V
-radiobutton.rangeall=Tutto
-radiobutton.rangeall.mnemonic=U
-radiobutton.rangepages=Pagine
-radiobutton.rangepages.mnemonic=E
-radiobutton.revlandscape=Orizzontale capovolto
-radiobutton.revlandscape.mnemonic=N
-radiobutton.revportrait=Verticale capovolto
-radiobutton.revportrait.mnemonic=I
-radiobutton.tumble=Lato corto
-radiobutton.tumble.mnemonic=T
+radiobutton.color=&Colore
+radiobutton.draftq=&Bozza
+radiobutton.duplex=F&ronte retro
+radiobutton.highq=A&lta
+radiobutton.landscape=Orizzonta&le
+radiobutton.monochrome=&Monocromatico
+radiobutton.normalq=&Normale
+radiobutton.oneside=Un lat&o
+radiobutton.portrait=&Verticale
+radiobutton.rangeall=T&utto
+radiobutton.rangepages=Pagin&e
+radiobutton.revlandscape=Orizzo&ntale capovolto
+radiobutton.revportrait=Vert&icale capovolto
+radiobutton.tumble=La&to corto
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=Aspetto
-tab.appearance.vkMnemonic=65
-tab.general=Generale
-tab.general.vkMnemonic=71
-tab.pagesetup=Imposta pagina
-tab.pagesetup.vkMnemonic=83
+tab.appearance=&Aspetto
+tab.general=&Generale
+tab.pagesetup=Impo&sta pagina
 #
 error.pagerange=Intervallo pagine non valido; immettere nuovamente i valori (ad es. 1-3,5,7-10)
 error.destination=Nome file non valido; riprovare

src/share/classes/sun/print/resources/serviceui_ja.properties

@@ -14,15 +14,11 @@ border.margins=\u30DE\u30FC\u30B8\u30F3
 button.cancel=\u53D6\u6D88
 button.ok=OK
 button.print=\u5370\u5237
-button.properties=\u30D7\u30ED\u30D1\u30C6\u30A3(R)...
-button.properties.mnemonic=R
+button.properties=\u30D7\u30ED\u30D1\u30C6\u30A3(&R)...
 #
-checkbox.collate=\u4E01\u5408\u3044(C)
-checkbox.collate.mnemonic=C
-checkbox.jobsheets=\u30D0\u30CA\u30FC\u30FB\u30DA\u30FC\u30B8(B)
-checkbox.jobsheets.mnemonic=B
-checkbox.printtofile=\u30D5\u30A1\u30A4\u30EB\u306B\u51FA\u529B(F)
-checkbox.printtofile.mnemonic=F
+checkbox.collate=\u4E01\u5408\u3044(&C)
+checkbox.jobsheets=\u30D0\u30CA\u30FC\u30FB\u30DA\u30FC\u30B8(&B)
+checkbox.printtofile=\u30D5\u30A1\u30A4\u30EB\u306B\u51FA\u529B(&F)
 #
 dialog.printtitle=\u5370\u5237
 dialog.pstitle=\u30DA\u30FC\u30B8\u8A2D\u5B9A
@@ -33,70 +29,42 @@ dialog.noprintermsg=\u5370\u5237\u30B5\u30FC\u30D3\u30B9\u304C\u898B\u3064\u304B
 dialog.writeerror=\u30D5\u30A1\u30A4\u30EB\u306B\u66F8\u304D\u8FBC\u3081\u307E\u305B\u3093:
 #
 label.info=\u60C5\u5831:
-label.jobname=\u30B8\u30E7\u30D6\u540D(J):
-label.jobname.mnemonic=J
-label.numcopies=\u5370\u5237\u90E8\u6570(O):
-label.numcopies.mnemonic=O
-label.priority=\u512A\u5148\u5EA6(R):
-label.priority.mnemonic=R
-label.psname=\u540D\u524D(N):
-label.psname.mnemonic=N
+label.jobname=\u30B8\u30E7\u30D6\u540D(&J):
+label.numcopies=\u5370\u5237\u90E8\u6570(&O):
+label.priority=\u512A\u5148\u5EA6(&R):
+label.psname=\u540D\u524D(&N):
 label.pstype=\u30BF\u30A4\u30D7:
 label.rangeto=\u5370\u5237\u7BC4\u56F2
-label.size=\u30B5\u30A4\u30BA(Z):
-label.size.mnemonic=Z
-label.source=\u30BD\u30FC\u30B9(C):
-label.source.mnemonic=C
+label.size=\u30B5\u30A4\u30BA(&Z):
+label.source=\u30BD\u30FC\u30B9(&C):
 label.status=\u72B6\u614B:
-label.username=\u30E6\u30FC\u30B6\u30FC\u540D(U):
-label.username.mnemonic=U
+label.username=\u30E6\u30FC\u30B6\u30FC\u540D(&U):
 label.millimetres=(mm)
 label.inches=(in)
-label.topmargin=\u4E0A(T)
-label.topmargin.mnemonic=T
-label.bottommargin=\u4E0B(B)
-label.bottommargin.mnemonic=B
-label.leftmargin=\u5DE6(F)
-label.leftmargin.mnemonic=F
-label.rightmargin=\u53F3(R)
-label.rightmargin.mnemonic=R
+label.topmargin=\u4E0A(&T)
+label.bottommargin=\u4E0B(&B)
+label.leftmargin=\u5DE6(&F)
+label.rightmargin=\u53F3(&R)
 #
-radiobutton.color=\u30AB\u30E9\u30FC(C)
-radiobutton.color.mnemonic=C
-radiobutton.draftq=\u30C9\u30E9\u30D5\u30C8(F)
-radiobutton.draftq.mnemonic=F
-radiobutton.duplex=\u4E21\u9762(D)
-radiobutton.duplex.mnemonic=D
-radiobutton.highq=\u9AD8(H)
-radiobutton.highq.mnemonic=H
-radiobutton.landscape=\u6A2A(L)
-radiobutton.landscape.mnemonic=L
-radiobutton.monochrome=\u30E2\u30CE\u30AF\u30ED(M)
-radiobutton.monochrome.mnemonic=M
-radiobutton.normalq=\u6A19\u6E96(N)
-radiobutton.normalq.mnemonic=N
-radiobutton.oneside=\u7247\u9762(O)
-radiobutton.oneside.mnemonic=O
-radiobutton.portrait=\u7E26(P)
-radiobutton.portrait.mnemonic=P
-radiobutton.rangeall=\u3059\u3079\u3066(L)
-radiobutton.rangeall.mnemonic=L
-radiobutton.rangepages=\u30DA\u30FC\u30B8(E)
-radiobutton.rangepages.mnemonic=E
-radiobutton.revlandscape=\u30E9\u30F3\u30C9\u30B9\u30B1\u30FC\u30D7(\u53CD\u8EE2)(N)
-radiobutton.revlandscape.mnemonic=N
-radiobutton.revportrait=\u30DD\u30FC\u30C8\u30EC\u30A4\u30C8(\u53CD\u8EE2)(I)
-radiobutton.revportrait.mnemonic=I
-radiobutton.tumble=\u53CD\u8EE2(T)
-radiobutton.tumble.mnemonic=T
+radiobutton.color=\u30AB\u30E9\u30FC(&C)
+radiobutton.draftq=\u30C9\u30E9\u30D5\u30C8(&F)
+radiobutton.duplex=\u4E21\u9762(&D)
+radiobutton.highq=\u9AD8(&H)
+radiobutton.landscape=\u6A2A(&L)
+radiobutton.monochrome=\u30E2\u30CE\u30AF\u30ED(&M)
+radiobutton.normalq=\u6A19\u6E96(&N)
+radiobutton.oneside=\u7247\u9762(&O)
+radiobutton.portrait=\u7E26(&P)
+radiobutton.rangeall=\u3059\u3079\u3066(&L)
+radiobutton.rangepages=\u30DA\u30FC\u30B8(&E)
+radiobutton.revlandscape=\u30E9\u30F3\u30C9\u30B9\u30B1\u30FC\u30D7(\u53CD\u8EE2)(&N)
+radiobutton.revportrait=\u30DD\u30FC\u30C8\u30EC\u30A4\u30C8(\u53CD\u8EE2)(&I)
+radiobutton.tumble=\u53CD\u8EE2(&T)
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=\u5916\u89B3(A)
-tab.appearance.vkMnemonic=65
-tab.general=\u4E00\u822C(G)
-tab.general.vkMnemonic=71
-tab.pagesetup=\u30DA\u30FC\u30B8\u8A2D\u5B9A(S)
-tab.pagesetup.vkMnemonic=83
+tab.appearance=\u5916\u89B3(&A)
+tab.general=\u4E00\u822C(&G)
+tab.pagesetup=\u30DA\u30FC\u30B8\u8A2D\u5B9A(&S)
 #
 error.pagerange=\u7121\u52B9\u306A\u30DA\u30FC\u30B8\u7BC4\u56F2\u3002\u5024\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044(\u4F8B\u30011-3,5,7-10)
 error.destination=\u7121\u52B9\u306A\u30D5\u30A1\u30A4\u30EB\u540D\u3002\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u518D\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044

src/share/classes/sun/print/resources/serviceui_ko.properties

@@ -14,15 +14,11 @@ border.margins=\uC5EC\uBC31
 button.cancel=\uCDE8\uC18C
 button.ok=\uD655\uC778
 button.print=\uC778\uC1C4
-button.properties=\uC18D\uC131(R)...
-button.properties.mnemonic=R
+button.properties=\uC18D\uC131(&R)...
 #
-checkbox.collate=\uD55C \uBD80\uC529 \uC778\uC1C4(C)
-checkbox.collate.mnemonic=C
-checkbox.jobsheets=\uBC30\uB108 \uD398\uC774\uC9C0(B)
-checkbox.jobsheets.mnemonic=B
-checkbox.printtofile=\uD30C\uC77C\uB85C \uC778\uC1C4(F)
-checkbox.printtofile.mnemonic=F
+checkbox.collate=\uD55C \uBD80\uC529 \uC778\uC1C4(&C)
+checkbox.jobsheets=\uBC30\uB108 \uD398\uC774\uC9C0(&B)
+checkbox.printtofile=\uD30C\uC77C\uB85C \uC778\uC1C4(&F)
 #
 dialog.printtitle=\uC778\uC1C4
 dialog.pstitle=\uD398\uC774\uC9C0 \uC124\uC815
@@ -33,70 +29,42 @@ dialog.noprintermsg=\uC778\uC1C4 \uC11C\uBE44\uC2A4\uB97C \uCC3E\uC744 \uC218 \u
 dialog.writeerror=\uD30C\uC77C\uC5D0 \uC4F8 \uC218 \uC5C6\uC74C:
 #
 label.info=\uC815\uBCF4:
-label.jobname=\uC791\uC5C5 \uC774\uB984(J):
-label.jobname.mnemonic=J
-label.numcopies=\uB9E4\uC218(O):
-label.numcopies.mnemonic=O
-label.priority=\uC6B0\uC120\uC21C\uC704(R):
-label.priority.mnemonic=R
-label.psname=\uC774\uB984(N):
-label.psname.mnemonic=N
+label.jobname=\uC791\uC5C5 \uC774\uB984(&J):
+label.numcopies=\uB9E4\uC218(&O):
+label.priority=\uC6B0\uC120\uC21C\uC704(&R):
+label.psname=\uC774\uB984(&N):
 label.pstype=\uC720\uD615:
 label.rangeto=\uC885\uB8CC
-label.size=\uD06C\uAE30(Z):
-label.size.mnemonic=Z
-label.source=\uC18C\uC2A4(C):
-label.source.mnemonic=C
+label.size=\uD06C\uAE30(&Z):
+label.source=\uC18C\uC2A4(&C):
 label.status=\uC0C1\uD0DC:
-label.username=\uC0AC\uC6A9\uC790 \uC774\uB984(U):
-label.username.mnemonic=U
+label.username=\uC0AC\uC6A9\uC790 \uC774\uB984(&U):
 label.millimetres=(mm)
 label.inches=(\uC778\uCE58)
-label.topmargin=\uC704\uCABD(T)
-label.topmargin.mnemonic=T
-label.bottommargin=\uC544\uB798\uCABD(B)
-label.bottommargin.mnemonic=B
-label.leftmargin=\uC67C\uCABD(F)
-label.leftmargin.mnemonic=F
-label.rightmargin=\uC624\uB978\uCABD(R)
-label.rightmargin.mnemonic=R
+label.topmargin=\uC704\uCABD(&T)
+label.bottommargin=\uC544\uB798\uCABD(&B)
+label.leftmargin=\uC67C\uCABD(&F)
+label.rightmargin=\uC624\uB978\uCABD(&R)
 #
-radiobutton.color=\uC0C9\uC0C1(C)
-radiobutton.color.mnemonic=C
-radiobutton.draftq=\uCD08\uC548(F)
-radiobutton.draftq.mnemonic=F
-radiobutton.duplex=\uC591\uBA74(D)
-radiobutton.duplex.mnemonic=D
-radiobutton.highq=\uB192\uC74C(H)
-radiobutton.highq.mnemonic=H
-radiobutton.landscape=\uAC00\uB85C(L)
-radiobutton.landscape.mnemonic=L
-radiobutton.monochrome=\uB2E8\uC0C9(M)
-radiobutton.monochrome.mnemonic=M
-radiobutton.normalq=\uBCF4\uD1B5(N)
-radiobutton.normalq.mnemonic=N
-radiobutton.oneside=\uB2E8\uBA74(O)
-radiobutton.oneside.mnemonic=O
-radiobutton.portrait=\uC138\uB85C(P)
-radiobutton.portrait.mnemonic=P
-radiobutton.rangeall=\uC804\uCCB4(L)
-radiobutton.rangeall.mnemonic=L
-radiobutton.rangepages=\uD398\uC774\uC9C0(E)
-radiobutton.rangepages.mnemonic=E
-radiobutton.revlandscape=\uAC00\uB85C \uBC18\uC804(N)
-radiobutton.revlandscape.mnemonic=N
-radiobutton.revportrait=\uC138\uB85C \uBC18\uC804(I)
-radiobutton.revportrait.mnemonic=I
-radiobutton.tumble=\uD68C\uC804\uC2DD(T)
-radiobutton.tumble.mnemonic=T
+radiobutton.color=\uC0C9\uC0C1(&C)
+radiobutton.draftq=\uCD08\uC548(&F)
+radiobutton.duplex=\uC591\uBA74(&D)
+radiobutton.highq=\uB192\uC74C(&H)
+radiobutton.landscape=\uAC00\uB85C(&L)
+radiobutton.monochrome=\uB2E8\uC0C9(&M)
+radiobutton.normalq=\uBCF4\uD1B5(&N)
+radiobutton.oneside=\uB2E8\uBA74(&O)
+radiobutton.portrait=\uC138\uB85C(&P)
+radiobutton.rangeall=\uC804\uCCB4(&L)
+radiobutton.rangepages=\uD398\uC774\uC9C0(&E)
+radiobutton.revlandscape=\uAC00\uB85C \uBC18\uC804(&N)
+radiobutton.revportrait=\uC138\uB85C \uBC18\uC804(&I)
+radiobutton.tumble=\uD68C\uC804\uC2DD(&T)
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=\uBAA8\uC591(A)
-tab.appearance.vkMnemonic=65
-tab.general=\uC77C\uBC18 \uC0AC\uD56D(G)
-tab.general.vkMnemonic=71
-tab.pagesetup=\uD398\uC774\uC9C0 \uC124\uC815(S)
-tab.pagesetup.vkMnemonic=83
+tab.appearance=\uBAA8\uC591(&A)
+tab.general=\uC77C\uBC18 \uC0AC\uD56D(&G)
+tab.pagesetup=\uD398\uC774\uC9C0 \uC124\uC815(&S)
 #
 error.pagerange=\uBD80\uC801\uD569\uD55C \uD398\uC774\uC9C0 \uBC94\uC704: \uAC12\uC744 \uB2E4\uC2DC \uC785\uB825\uD558\uC2ED\uC2DC\uC624(\uC608: 1-3,5,7-10).
 error.destination=\uBD80\uC801\uD569\uD55C \uD30C\uC77C \uC774\uB984: \uB2E4\uC2DC \uC2DC\uB3C4\uD558\uC2ED\uC2DC\uC624.

src/share/classes/sun/print/resources/serviceui_pt_BR.properties

@@ -14,15 +14,11 @@ border.margins=Margens
 button.cancel=Cancelar
 button.ok=OK
 button.print=Imprimir
-button.properties=Propriedades...
-button.properties.mnemonic=D
+button.properties=Proprie&dades...
 #
-checkbox.collate=Agrupar
-checkbox.collate.mnemonic=R
-checkbox.jobsheets=P\u00E1gina com Banner
-checkbox.jobsheets.mnemonic=B
-checkbox.printtofile=Imprimir em Arquivo
-checkbox.printtofile.mnemonic=I
+checkbox.collate=Ag&rupar
+checkbox.jobsheets=P\u00E1gina com &Banner
+checkbox.printtofile=&Imprimir em Arquivo
 #
 dialog.printtitle=Imprimir
 dialog.pstitle=Configura\u00E7\u00E3o da P\u00E1gina
@@ -33,70 +29,42 @@ dialog.noprintermsg=Nenhum servi\u00E7o de impress\u00E3o encontrado.
 dialog.writeerror=N\u00E3o \u00E9 poss\u00EDvel gravar no arquivo:
 #
 label.info=Informa\u00E7\u00F5es:
-label.jobname=Nome do Job:
-label.jobname.mnemonic=J
-label.numcopies=N\u00FAmero de c\u00F3pias:
-label.numcopies.mnemonic=O
-label.priority=Prioridade:
-label.priority.mnemonic=P
-label.psname=Nome:
-label.psname.mnemonic=N
+label.jobname=Nome do &Job:
+label.numcopies=N\u00FAmer&o de c\u00F3pias:
+label.priority=&Prioridade:
+label.psname=&Nome:
 label.pstype=Tipo:
 label.rangeto=At\u00E9
-label.size=Tamanho:
-label.size.mnemonic=M
-label.source=Origem:
-label.source.mnemonic=O
+label.size=Ta&manho:
+label.source=&Origem:
 label.status=Status:
-label.username=Nome do Usu\u00E1rio:
-label.username.mnemonic=U
+label.username=Nome do &Usu\u00E1rio:
 label.millimetres=(mm)
 label.inches=(pol)
-label.topmargin=superior
-label.topmargin.mnemonic=S
-label.bottommargin=inferior
-label.bottommargin.mnemonic=I
-label.leftmargin=esquerda:
-label.leftmargin.mnemonic=Q
-label.rightmargin=direita
-label.rightmargin.mnemonic=D
+label.topmargin=&superior
+label.bottommargin=&inferior
+label.leftmargin=es&querda:
+label.rightmargin=&direita
 #
-radiobutton.color=Cor
-radiobutton.color.mnemonic=O
-radiobutton.draftq=Rascunho
-radiobutton.draftq.mnemonic=R
-radiobutton.duplex=Duplex
-radiobutton.duplex.mnemonic=D
-radiobutton.highq=Alta
-radiobutton.highq.mnemonic=T
-radiobutton.landscape=Paisagem
-radiobutton.landscape.mnemonic=P
-radiobutton.monochrome=Monocrom\u00E1tico
-radiobutton.monochrome.mnemonic=M
-radiobutton.normalq=Normal
-radiobutton.normalq.mnemonic=N
-radiobutton.oneside=Um Lado
-radiobutton.oneside.mnemonic=L
-radiobutton.portrait=Retrato
-radiobutton.portrait.mnemonic=R
-radiobutton.rangeall=Tudo
-radiobutton.rangeall.mnemonic=U
-radiobutton.rangepages=P\u00E1ginas
-radiobutton.rangepages.mnemonic=P
-radiobutton.revlandscape=Paisagem Invertida
-radiobutton.revlandscape.mnemonic=N
-radiobutton.revportrait=Retrato Invertido
-radiobutton.revportrait.mnemonic=E
-radiobutton.tumble=Virar
-radiobutton.tumble.mnemonic=V
+radiobutton.color=C&or
+radiobutton.draftq=&Rascunho
+radiobutton.duplex=&Duplex
+radiobutton.highq=Al&ta
+radiobutton.landscape=&Paisagem
+radiobutton.monochrome=&Monocrom\u00E1tico
+radiobutton.normalq=&Normal
+radiobutton.oneside=Um &Lado
+radiobutton.portrait=&Retrato
+radiobutton.rangeall=T&udo
+radiobutton.rangepages=&P\u00E1ginas
+radiobutton.revlandscape=Paisagem I&nvertida
+radiobutton.revportrait=R&etrato Invertido
+radiobutton.tumble=&Virar
 # The vkMnemonics correspond with the constants defined in KeyEvent, eg
 # 65 = KeyEvent.VK_A
-tab.appearance=Apar\u00EAncia
-tab.appearance.vkMnemonic=65
-tab.general=Geral
-tab.general.vkMnemonic=71
-tab.pagesetup=Configura\u00E7\u00E3o de P\u00E1gina
-tab.pagesetup.vkMnemonic=67
+tab.appearance=&Apar\u00EAncia
+tab.general=&Geral
+tab.pagesetup=&Configura\u00E7\u00E3o de P\u00E1gina
 #
 error.pagerange=Faixa de p\u00E1ginas inv\u00E1lida; insira novamente os valores (por exemplo, 1-3,5,7-10)
 error.destination=Nome de arquivo inv\u00E1lido; tente novamente

src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java

 /*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -90,7 +90,7 @@ public final class SunNativeProvider extends Provider {
                                     "libgssapi_krb5.so",
                                     "libgssapi_krb5.so.2",
                                 };
-                            } else if (osname.startsWith("Mac OS X")) {
+                            } else if (osname.contains("OS X")) {
                                 gssLibs = new String[]{
                                     "/usr/lib/sasl2/libgssapiv2.2.so",
                                 };

src/share/classes/sun/security/krb5/Config.java

 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -737,7 +737,7 @@ public class Config {
                     }
                 } else if (osname.startsWith("SunOS")) {
                     name =  "/etc/krb5/krb5.conf";
-                } else if (osname.startsWith("Mac")) {
+                } else if (osname.contains("OS X")) {
                     if (isMacosLionOrBetter()) return "";
                     name = findMacosConfigFile();
                 } else {