Merge pull request #253 from alexander-lobas/jbr21.280

Clean & rename for fullscreen window control buttons

jb/project/tools/linux/scripts/mkimages_aarch64.sh

@@ -77,6 +77,7 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
     mv release "$IMAGES_DIR"/"$__root_dir"/release
     cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
+    cp $IMAGES_DIR/jdk/lib/server/*.jsa "$IMAGES_DIR"/"$__root_dir"/lib/server
     copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
     zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi
@@ -137,10 +138,18 @@ echo Fixing permissions
 chmod -R a+r $JSDK
 
 if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
-  update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
-  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
-  cat $JCEF_PATH/jcef.version >> $JSDK/release
+  if [ -d "$JCEF_PATH" ]; then
+    git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
+    update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
+    cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+    cat $JCEF_PATH/jcef.version >> $JSDK/release
+  else
+    if [ "$bundle_type" == "jcef" ]; then
+      echo "*** ERROR *** $JCEF_PATH not found" && do_exit 1
+    else
+      echo "*** WARNING *** $JCEF_PATH not found"
+    fi
+  fi
 fi
 
 # create runtime image bundle

jb/project/tools/linux/scripts/mkimages_x64.sh

@@ -77,6 +77,7 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
     mv release "$IMAGES_DIR"/"$__root_dir"/release
     cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
+    cp $IMAGES_DIR/jdk/lib/server/*.jsa "$IMAGES_DIR"/"$__root_dir"/lib/server
     copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
     zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi
@@ -137,10 +138,18 @@ echo Fixing permissions
 chmod -R a+r $JSDK
 
 if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-  update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
-  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
-  cat $JCEF_PATH/jcef.version >> $JSDK/release
+  if [ -d "$JCEF_PATH" ]; then
+    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+    update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
+    cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+    cat $JCEF_PATH/jcef.version >> $JSDK/release
+  else
+    if [ "$bundle_type" == "jcef" ]; then
+      echo "*** ERROR *** $JCEF_PATH not found" && do_exit 1
+    else
+      echo "*** WARNING *** $JCEF_PATH not found"
+    fi
+  fi
 fi
 
 # create runtime image bundle

jb/project/tools/linux/scripts/mkimages_x86.sh

@@ -65,6 +65,7 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
     mv release "$IMAGES_DIR"/"$__root_dir"/release
     cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
+    cp $IMAGES_DIR/jdk/lib/server/*.jsa "$IMAGES_DIR"/"$__root_dir"/lib/server
     copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
     zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
   fi

jb/project/tools/mac/scripts/mkimages.sh

@@ -77,6 +77,7 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' $JRE_CONTENTS/Home/release > release
     mv release $JRE_CONTENTS/Home/release
     cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/src.zip $JRE_CONTENTS/Home/lib
+    cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/server/*.jsa $JRE_CONTENTS/Home/lib/server
     copy_jmods "$__modules" "$__modules_path" "$JRE_CONTENTS"/Home/jmods
     zip_native_debug_symbols $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk "${JBR}_diz"
   fi
@@ -138,10 +139,18 @@ JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
 if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-  update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
-  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
-
+  if [ -d "$JCEF_PATH" ]; then
+    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+    update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+    cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+    #JBR-5426 write JCEF version info inside release file
+  else
+    if [ "$bundle_type" == "jcef" ]; then
+      echo "*** ERROR *** $JCEF_PATH not found" && do_exit 1
+    else
+      echo "*** WARNING *** $JCEF_PATH not found"
+    fi
+  fi
   jbr_name_postfix="_${bundle_type}"
 else
   jbr_name_postfix=""

jb/project/tools/windows/scripts/mkimages_aarch64.sh

@@ -75,6 +75,7 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' $__root_dir/release > release
     mv release $__root_dir/release
     cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
+    cp $IMAGES_DIR/jdk/bin/server/*.jsa $__root_dir/bin/server
     for dir in $(ls -d $IMAGES_DIR/jdk/*); do
       rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
     done
@@ -126,12 +127,19 @@ if [ $? -eq 0 ]; then
 fi
 
 if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
-  update_jsdk_mods "$BUILD_JDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
-  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not unchanged
-
+  if [ -d "$JCEF_PATH" ]; then
+    git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
+    update_jsdk_mods "$BUILD_JDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+    cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not unchanged
+    cat $JCEF_PATH/jcef.version >> $JSDK/release
+  else
+    if [ "$bundle_type" == "jcef" ]; then
+      echo "*** ERROR *** $JCEF_PATH not found" && do_exit 1
+    else
+      echo "*** WARNING *** $JCEF_PATH not found"
+    fi
+  fi
   jbr_name_postfix="_${bundle_type}"
-  cat $JCEF_PATH/jcef.version >> $JSDK/release
 else
   jbr_name_postfix=""
 fi

jb/project/tools/windows/scripts/mkimages_x64.sh

@@ -66,6 +66,7 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' $__root_dir/release > release
     mv release $__root_dir/release
     cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
+    cp $IMAGES_DIR/jdk/bin/server/*.jsa $__root_dir/bin/server
     for dir in $(ls -d $IMAGES_DIR/jdk/*); do
       rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
     done
@@ -117,12 +118,19 @@ if [ $? -eq 0 ]; then
 fi
 
 if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-  update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
-  cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
-
+  if [ -d "$JCEF_PATH" ]; then
+    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
+    update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
+    cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
+    cat $JCEF_PATH/jcef.version >> $JSDK/release
+  else
+    if [ "$bundle_type" == "jcef" ]; then
+      echo "*** ERROR *** $JCEF_PATH not found" && do_exit 1
+    else
+      echo "*** WARNING *** $JCEF_PATH not found"
+    fi
+  fi
   jbr_name_postfix="_${bundle_type}"
-  cat $JCEF_PATH/jcef.version >> $JSDK/release
 else
   jbr_name_postfix=""
 fi

jb/project/tools/windows/scripts/mkimages_x86.sh

@@ -62,6 +62,7 @@ function create_image_bundle {
     sed 's/JBR/JBRSDK/g' $__root_dir/release > release
     mv release $__root_dir/release
     cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
+    cp $IMAGES_DIR/jdk/bin/server/*.jsa $__root_dir/bin/server
     for dir in $(ls -d $IMAGES_DIR/jdk/*); do
       rsync -amv --include="*/" --include="*.pdb" --exclude="*" $dir $__root_dir
     done

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

@@ -109,7 +109,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
     private static native boolean nativeDelayShowing(long nsWindowPtr);
     private static native void nativeUpdateCustomTitleBar(long nsWindowPtr);
     private static native void nativeCallDeliverMoveResizeEvent(long nsWindowPtr);
-    private static native void nativeSetRoundedCorners(long nsWindowPrt, float radius);
+    private static native void nativeSetRoundedCorners(long nsWindowPrt, float radius, int borderWidth, int borderColor);
 
     // Logger to report issues happened during execution but that do not affect functionality
     private static final PlatformLogger logger = PlatformLogger.getLogger("sun.lwawt.macosx.CPlatformWindow");
@@ -991,6 +991,14 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
         return ref.get();
     }
 
+    private boolean isTabbedWindow() {
+        AtomicBoolean ref = new AtomicBoolean();
+        execute(ptr -> {
+            ref.set(CWrapper.NSWindow.isTabbedWindow(ptr));
+        });
+        return ref.get();
+    }
+
     // We want a window to be always shown at the same space as its owning window.
     // But macOS doesn't have an API to control the target space for a window -
     // it's always shown at the active space. So if the target space isn't active now,
@@ -1353,7 +1361,9 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
         // which is going to become 'main window', are placed above their siblings.
         CPlatformWindow rootOwner = getRootOwner();
         if (rootOwner.isVisible() && !rootOwner.isIconified() && !rootOwner.isActive()) {
-            rootOwner.execute(CWrapper.NSWindow::orderFrontIfOnActiveSpace);
+            if (rootOwner != this || !isTabbedWindow()) {
+                rootOwner.execute(CWrapper.NSWindow::orderFrontIfOnActiveSpace);
+            }
         }
 
         // Do not order child windows of iconified owner.
@@ -1500,7 +1510,13 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
 
     private void setRoundedCorners(Object params) {
         if (params instanceof Float) {
-            execute(ptr -> nativeSetRoundedCorners(ptr, (float) params));
+            execute(ptr -> nativeSetRoundedCorners(ptr, (float) params, 0, 0));
+        } else if (params instanceof Object[]) {
+            Object[] values = (Object[]) params;
+            if (values.length == 3 && values[0] instanceof Float && values[1] instanceof Integer && values[2] instanceof Color) {
+                Color color = (Color) values[2];
+                execute(ptr -> nativeSetRoundedCorners(ptr, (float) values[0], (int) values[1], color.getRGB()));
+            }
         }
     }
 }

src/java.desktop/macosx/classes/sun/lwawt/macosx/CPrinterJob.java

@@ -30,6 +30,7 @@ import java.awt.*;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.print.*;
+import java.io.File;
 import java.net.URI;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -185,6 +186,15 @@ public final class CPrinterJob extends RasterPrinterJob {
         if (attributes == null) {
             return;
         }
+        if (getPrintService() == null && isPrintToFile) {
+            Destination destination = (Destination)attributes.get(Destination.class);
+            if (destination != null) {
+                try {
+                    destinationAttr = "" + new File(destination.getURI().getSchemeSpecificPart());
+                } catch (Exception e) {
+                }
+            }
+        }
         Attribute attr = attributes.get(Media.class);
         if (attr instanceof CustomMediaTray) {
             CustomMediaTray customTray = (CustomMediaTray) attr;

src/java.desktop/macosx/classes/sun/lwawt/macosx/CWrapper.java

@@ -108,6 +108,8 @@ final class CWrapper {
         static native void zoom(long window);
 
         static native void makeFirstResponder(long window, long responder);
+        
+        static native boolean isTabbedWindow(long window);
     }
 
     static final class NSView {

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h

@@ -50,6 +50,10 @@
     NSWindowTabbingMode javaWindowTabbingMode;
     BOOL isEnterFullScreen;
     CGFloat _customTitleBarHeight;
+    BOOL hideTabController;
+    NSView *_fullScreenButtons;
+    NSView *_fullScreenOriginalButtons;
+
 }
 
 // An instance of either AWTWindow_Normal or AWTWindow_Panel
@@ -74,6 +78,7 @@
 @property (nonatomic, retain) NSMutableArray *customTitleBarConstraints;
 @property (nonatomic, retain) NSLayoutConstraint *customTitleBarHeightConstraint;
 @property (nonatomic, retain) NSMutableArray *customTitleBarButtonCenterXConstraints;
+@property (nonatomic) BOOL hideTabController;
 
 - (id) initWithPlatformWindow:(jobject)javaPlatformWindow
                   ownerWindow:owner
@@ -97,7 +102,9 @@
 
 @end
 
-@interface AWTWindow_Normal : NSWindow
+@interface AWTWindow_Normal : NSWindow {
+    @private BOOL _ignoreMove;
+}
 - (id) initWithDelegate:(AWTWindow *)delegate
               frameRect:(NSRect)rect
               styleMask:(NSUInteger)styleMask
@@ -116,4 +123,13 @@
 - (id) initWithPlatformWindow:(jobject)javaPlatformWindow;
 @end
 
+@interface AWTButtonsView : NSView {
+    @private BOOL _showButtons;
+             NSColor* _color;
+}
+
+- (void)configureColors;
+
+@end
+
 #endif _AWTWINDOW_H

src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m

@@ -38,6 +38,7 @@
 #import "ThreadUtilities.h"
 #import "NSApplicationAWT.h"
 #import "JNIUtilities.h"
+#import "PropertiesUtilities.h"
 
 #define MASK(KEY) \
     (sun_lwawt_macosx_CPlatformWindow_ ## KEY)
@@ -55,6 +56,16 @@ static jclass jc_CPlatformWindow = NULL;
 #define GET_CPLATFORM_WINDOW_CLASS_RETURN(ret) \
     GET_CLASS_RETURN(jc_CPlatformWindow, "sun/lwawt/macosx/CPlatformWindow", ret);
 
+@interface NSTitlebarAccessoryViewController (Private)
+- (void)_setHidden:(BOOL)h animated:(BOOL)a;
+@end
+
+@interface NSWindow (Private)
+- (void)_setTabBarAccessoryViewController:(id)controller;
+- (void)setIgnoreMove:(BOOL)value;
+- (void)_adjustWindowToScreen;
+@end
+
 // Cocoa windowDidBecomeKey/windowDidResignKey notifications
 // doesn't provide information about "opposite" window, so we
 // have to do a bit of tracking. This variable points to a window
@@ -348,6 +359,44 @@ AWT_NS_WINDOW_IMPLEMENTATION
     [super orderOut:sender];
 }
 
+- (void)_setTabBarAccessoryViewController:(id)_controller {
+    if (((AWTWindow *)self.delegate).hideTabController) {
+        NSTitlebarAccessoryViewController* controller = [[NSTitlebarAccessoryViewController alloc] init];
+        controller.view = [[NSView alloc] init];
+        [controller.view setFrame:NSMakeRect(0, 0, 0, 0)];
+        [controller _setHidden:YES animated:NO];
+
+        [super _setTabBarAccessoryViewController:controller];
+    } else {
+        [super _setTabBarAccessoryViewController:_controller];
+    }
+}
+
+- (BOOL)isNativeSelected {
+    if (@available(macOS 10.13, *)) {
+        return [[self tabGroup] selectedWindow] == self;
+    }
+    return NO;
+}
+
+- (void)setIgnoreMove:(BOOL)value {
+    _ignoreMove = value;
+    self.movable = !value;
+}
+
+- (void)_adjustWindowToScreen {
+    if (_ignoreMove) {
+        self.movable = YES;
+    }
+
+    [super _adjustWindowToScreen];
+    [(AWTWindow *)self.delegate updateFullScreenButtons];
+
+    if (_ignoreMove) {
+        self.movable = NO;
+    }
+}
+
 @end
 @implementation AWTWindow_Panel
 AWT_NS_WINDOW_IMPLEMENTATION
@@ -372,6 +421,7 @@ AWT_NS_WINDOW_IMPLEMENTATION
 @synthesize isJustCreated;
 @synthesize javaWindowTabbingMode;
 @synthesize isEnterFullScreen;
+@synthesize hideTabController;
 
 - (void) updateMinMaxSize:(BOOL)resizable {
     if (resizable) {
@@ -547,6 +597,8 @@ AWT_ASSERT_APPKIT_THREAD;
     self.nsWindow.collectionBehavior = NSWindowCollectionBehaviorManaged;
     self.isEnterFullScreen = NO;
 
+    [self configureJavaWindowTabbingIdentifier];
+
     if (self.isCustomTitleBarEnabled && !self.isFullScreen) {
         [self setUpCustomTitleBar];
     }
@@ -569,6 +621,64 @@ AWT_ASSERT_APPKIT_THREAD;
     return [self.nsWindow windowNumber] == [AWTWindow getTopmostWindowUnderMouseID];
 }
 
+- (void) configureJavaWindowTabbingIdentifier {
+    AWT_ASSERT_APPKIT_THREAD;
+
+    self.hideTabController = NO;
+
+    if (self.javaWindowTabbingMode != NSWindowTabbingModeAutomatic) {
+        return;
+    }
+
+    JNIEnv *env = [ThreadUtilities getJNIEnv];
+    jobject platformWindow = (*env)->NewLocalRef(env, self.javaPlatformWindow);
+    if (platformWindow == NULL) {
+        return;
+    }
+
+    GET_CPLATFORM_WINDOW_CLASS();
+    DECLARE_FIELD(jf_target, jc_CPlatformWindow, "target", "Ljava/awt/Window;");
+    jobject awtWindow = (*env)->GetObjectField(env, platformWindow, jf_target);
+
+    if (awtWindow != NULL) {
+        DECLARE_CLASS(jc_RootPaneContainer, "javax/swing/RootPaneContainer");
+        if ((*env)->IsInstanceOf(env, awtWindow, jc_RootPaneContainer)) {
+            DECLARE_METHOD(jm_getRootPane, jc_RootPaneContainer, "getRootPane", "()Ljavax/swing/JRootPane;");
+            jobject rootPane = (*env)->CallObjectMethod(env, awtWindow, jm_getRootPane);
+            CHECK_EXCEPTION();
+
+            if (rootPane != NULL) {
+                DECLARE_CLASS(jc_JComponent, "javax/swing/JComponent");
+                DECLARE_METHOD(jm_getClientProperty, jc_JComponent, "getClientProperty", "(Ljava/lang/Object;)Ljava/lang/Object;");
+                jstring jKey = NSStringToJavaString(env, @"JavaWindowTabbingIdentifier");
+                jobject jValue = (*env)->CallObjectMethod(env, rootPane, jm_getClientProperty, jKey);
+                CHECK_EXCEPTION();
+
+                if (jValue != NULL) {
+                    DECLARE_CLASS(jc_String, "java/lang/String");
+                    if ((*env)->IsInstanceOf(env, jValue, jc_String)) {
+                        NSString *winId = JavaStringToNSString(env, (jstring)jValue);
+                        [self.nsWindow setTabbingIdentifier:winId];
+                        if ([winId characterAtIndex:0] == '+') {
+                            self.hideTabController = YES;
+                            [self.nsWindow _setTabBarAccessoryViewController:nil];
+                        }
+                    }
+
+                    (*env)->DeleteLocalRef(env, jValue);
+                }
+
+                (*env)->DeleteLocalRef(env, jKey);
+                (*env)->DeleteLocalRef(env, rootPane);
+            }
+        }
+
+        (*env)->DeleteLocalRef(env, awtWindow);
+    }
+
+    (*env)->DeleteLocalRef(env, platformWindow);
+}
+
 - (NSWindowTabbingMode) getJavaWindowTabbingMode {
     AWT_ASSERT_APPKIT_THREAD;
 
@@ -1309,6 +1419,15 @@ AWT_ASSERT_APPKIT_THREAD;
     if (self.isCustomTitleBarEnabled) {
         [self forceHideCustomTitleBarTitle:NO];
         [self updateCustomTitleBarInsets:NO];
+
+        JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
+        NSString *newFullScreenControls1 = [PropertiesUtilities
+            javaSystemPropertyForKey:@"apple.awt.newFullScreeControls" withEnv:env];
+        NSString *newFullScreenControls2 = [PropertiesUtilities
+            javaSystemPropertyForKey:@"apple.awt.newFullScreenControls" withEnv:env];
+        if ([@"true" isCaseInsensitiveLike:newFullScreenControls1] || [@"true" isCaseInsensitiveLike:newFullScreenControls2]) {
+            [self setWindowFullScreenControls];
+        }
     }
     [self allowMovingChildrenBetweenSpaces:NO];
     [self fullScreenTransitionFinished];
@@ -1355,6 +1474,8 @@ AWT_ASSERT_APPKIT_THREAD;
 }
 
 - (void)windowDidExitFullScreen:(NSNotification *)notification {
+    [self resetWindowFullScreenControls];
+
     self.isEnterFullScreen = NO;
 
     [self fullScreenTransitionFinished];
@@ -1464,7 +1585,9 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
 }
 
 - (void) setUpCustomTitleBar {
-
+    if (self.customTitleBarConstraints != nil) {
+        [self resetCustomTitleBar];
+    }
     /**
      * The view hierarchy normally looks as follows:
      * NSThemeFrame
@@ -1509,6 +1632,8 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
         self.customTitleBarHeightConstraint,
     ]];
 
+    [self.nsWindow setIgnoreMove:YES];
+    
     AWTWindowDragView* windowDragView = [[AWTWindowDragView alloc] initWithPlatformWindow:self.javaPlatformWindow];
     [titlebar addSubview:windowDragView positioned:NSWindowBelow relativeTo:closeButtonView];
 
@@ -1560,6 +1685,8 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
     }];
     [self setWindowControlsHidden:!self.customTitleBarControlsVisible];
     [self updateCustomTitleBarInsets:self.customTitleBarControlsVisible];
+
+    [self updateFullScreenButtons];
 }
 
 - (void) resetCustomTitleBar {
@@ -1595,14 +1722,109 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
 
     [self setWindowControlsHidden:NO];
     [self updateCustomTitleBarInsets:NO];
+    
+    [self.nsWindow setIgnoreMove:NO];
 }
 
 - (void) setWindowControlsHidden: (BOOL) hidden {
+    if (_fullScreenOriginalButtons != nil) {
+        [_fullScreenOriginalButtons.window.contentView setHidden:NO];
+        _fullScreenButtons.hidden = YES;
+    }
+
     [self.nsWindow standardWindowButton:NSWindowCloseButton].hidden = hidden;
     [self.nsWindow standardWindowButton:NSWindowZoomButton].hidden = hidden;
     [self.nsWindow standardWindowButton:NSWindowMiniaturizeButton].hidden = hidden;
 }
 
+- (void) setWindowFullScreenControls {
+    JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
+    NSString *dfmMode = [PropertiesUtilities javaSystemPropertyForKey:@"apple.awt.distraction.free.mode" withEnv:env];
+    if ([@"true" isCaseInsensitiveLike:dfmMode]) {
+        return;
+    }
+
+    NSView* oldCloseButton = [self.nsWindow standardWindowButton:NSWindowCloseButton];
+    _fullScreenOriginalButtons = oldCloseButton.superview;
+
+    NSRect closeButtonRect = [oldCloseButton frame];
+    NSRect miniaturizeButtonRect = [[self.nsWindow standardWindowButton:NSWindowMiniaturizeButton] frame];
+    NSRect zoomButtonRect = [[self.nsWindow standardWindowButton:NSWindowZoomButton] frame];
+
+    for (NSWindow* window in [[NSApplication sharedApplication] windows]) {
+          if ([window isKindOfClass:NSClassFromString(@"NSToolbarFullScreenWindow")]) {
+            [window.contentView setHidden:YES];
+          }
+    }
+
+    _fullScreenButtons = [[AWTButtonsView alloc] init];
+    [self updateFullScreenButtons];
+    [_fullScreenButtons addTrackingArea:[[NSTrackingArea alloc] initWithRect:[_fullScreenButtons visibleRect]
+                                                      options:(NSTrackingActiveAlways | NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved)
+                                                      owner:_fullScreenButtons userInfo:nil]];
+
+    NSUInteger masks = [self.nsWindow styleMask];
+
+    NSButton *closeButton = [NSWindow standardWindowButton:NSWindowCloseButton forStyleMask:masks];
+    [closeButton setFrame:closeButtonRect];
+    [_fullScreenButtons addSubview:closeButton];
+
+    NSButton *miniaturizeButton = [NSWindow standardWindowButton:NSWindowMiniaturizeButton forStyleMask:masks];
+    [miniaturizeButton setFrame:miniaturizeButtonRect];
+    [_fullScreenButtons addSubview:miniaturizeButton];
+
+    NSButton *zoomButton = [NSWindow standardWindowButton:NSWindowZoomButton forStyleMask:masks];
+    [zoomButton setFrame:zoomButtonRect];
+    [_fullScreenButtons addSubview:zoomButton];
+
+    [self.nsWindow.contentView addSubview:_fullScreenButtons];
+
+    [self updateColors];
+}
+
+- (void)updateColors {
+    if (_fullScreenButtons != nil) {
+        [(AWTButtonsView *)_fullScreenButtons configureColors];
+    }
+}
+
+- (void)updateFullScreenButtons {
+    if (_fullScreenButtons == nil || _fullScreenOriginalButtons == nil) {
+        return;
+    }
+
+    NSView *parent = self.nsWindow.contentView;
+    CGFloat w = 80;
+    CGFloat h = _fullScreenOriginalButtons.frame.size.height;
+    CGFloat x = 6;
+    CGFloat y = parent.frame.size.height - h - (self.customTitleBarHeight - h) / 2.0;
+
+    [_fullScreenButtons setFrame:NSMakeRect(x, y, w - x, h)];
+}
+
+- (void)updateFullScreenButtons: (BOOL) dfm {
+    if (dfm) {
+        if (_fullScreenButtons == nil || _fullScreenOriginalButtons == nil) {
+            return;
+        }
+        [_fullScreenOriginalButtons.window.contentView setHidden:NO];
+        [self resetWindowFullScreenControls];
+    } else {
+        if (!self.isCustomTitleBarEnabled || _fullScreenButtons != nil) {
+            return;
+        }
+        [self setWindowFullScreenControls];
+    }
+}
+
+- (void) resetWindowFullScreenControls {
+    if (_fullScreenButtons != nil) {
+        [_fullScreenButtons removeFromSuperview];
+        _fullScreenButtons = nil;
+        _fullScreenOriginalButtons = nil;
+    }
+}
+
 - (BOOL) isFullScreen {
     NSUInteger masks = [self.nsWindow styleMask];
     return (masks & NSWindowStyleMaskFullScreen) != 0;
@@ -1639,7 +1861,7 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
                             nsWindow.styleMask & NSWindowStyleMaskFullScreen)];
     // calls methods on NSWindow to change other properties, based on the mask
     [self setPropertiesForStyleBits:newBits mask:mask];
-    if (!fullscreen) [self _deliverMoveResizeEvent];
+    if (!fullscreen && !self.nsWindow.miniaturized) [self _deliverMoveResizeEvent];
 
     if (enabled != (self.customTitleBarConstraints != nil)) {
         if (!fullscreen) {
@@ -1648,6 +1870,8 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
             } else {
                 [self resetCustomTitleBar];
             }
+        } else {
+            [self updateFullScreenButtons];
         }
     } else if (enabled) {
         [self updateCustomTitleBarConstraints];
@@ -1688,10 +1912,6 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
     return hitTest <= java_awt_Window_CustomTitleBar_HIT_TITLEBAR;
 }
 
-- (BOOL) mouseDownCanMoveWindow {
-    return NO;
-}
-
 - (BOOL) acceptsFirstMouse:(NSEvent *)event {
     return YES;
 }
@@ -1766,6 +1986,96 @@ static const CGFloat DefaultHorizontalTitleBarButtonOffset = 20.0;
 
 @end
 
+@implementation AWTButtonsView
+
+- (void)dealloc {
+    [_color release];
+    [super dealloc];
+}
+
+- (void)mouseEntered:(NSEvent *)theEvent {
+    [self updateButtons:YES];
+}
+
+- (void)mouseExited:(NSEvent *)theEvent {
+    [self updateButtons:NO];
+}
+
+- (void)configureColors {
+    JNIEnv *env = [ThreadUtilities getJNIEnvUncached];
+    NSString *javaColor = [PropertiesUtilities javaSystemPropertyForKey:@"apple.awt.newFullScreeControls.background" withEnv:env];
+
+    [_color release];
+
+    if (javaColor == nil) {
+        _color = nil;
+    } else {
+        int rgb = [javaColor intValue];
+
+        CGFloat alpha = (((rgb >> 24) & 0xff) / 255.0);
+        CGFloat red   = (((rgb >> 16) & 0xff) / 255.0);
+        CGFloat green = (((rgb >>  8) & 0xff) / 255.0);
+        CGFloat blue  = (((rgb >>  0) & 0xff) / 255.0);
+
+        _color = [NSColor colorWithDeviceRed:red green:green blue:blue alpha:alpha];
+        [_color retain];
+    }
+
+    [self updateButtons:NO];
+}
+
+- (void)updateButtons:(BOOL) flag {
+    _showButtons = flag;
+
+    if (self.subviews.count == 3) {
+        [self updateButton:0 flag:flag]; // close
+        [self updateButton:1 flag:NO];   // miniaturize
+        [self updateButton:2 flag:flag]; // zoom
+    }
+
+    [self setNeedsDisplay:YES];
+}
+
+- (void)updateButton: (int)index flag:(BOOL) flag {
+    NSButton *button = (NSButton*)self.subviews[index];
+    [button setHidden:!flag];
+    [button setHighlighted:flag];
+}
+
+- (void)drawRect: (NSRect)dirtyRect {
+    if (self.subviews.count != 3) {
+        return;
+    }
+
+    if (_color == nil) {
+        [[NSColor whiteColor] setFill];
+    } else {
+        [_color setFill];
+    }
+
+    if (_showButtons) {
+        [self drawButton:1]; // miniaturize
+    } else {
+        for (int i = 0; i < 3; i++) {
+            [self drawButton:i];
+        }
+    }
+}
+
+- (void)drawButton: (int)index {
+    NSButton *button = (NSButton*)self.subviews[index];
+    NSRect rect = button.frame;
+    CGFloat r = 12;
+    CGFloat x = rect.origin.x + (rect.size.width - r) / 2;
+    CGFloat y = rect.origin.y + (rect.size.height - r) / 2;
+
+    NSBezierPath* circlePath = [NSBezierPath bezierPath];
+    [circlePath appendBezierPathWithOvalInRect:CGRectMake(x, y, r, r)];
+    [circlePath fill];
+}
+
+@end
+
 /*
  * Class:     sun_lwawt_macosx_CPlatformWindow
  * Method:    nativeSetAllAllowAutomaticTabbingProperty
@@ -2593,7 +2903,7 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeCallDeliverMo
 }
 
 JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetRoundedCorners
-(JNIEnv *env, jclass clazz, jlong windowPtr, jfloat radius)
+(JNIEnv *env, jclass clazz, jlong windowPtr, jfloat radius, jint borderWidth, jint borderRgb)
 {
     JNI_COCOA_ENTER(env);
 
@@ -2603,6 +2913,18 @@ JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CPlatformWindow_nativeSetRoundedCor
         w.contentView.wantsLayer = YES;
         w.contentView.layer.cornerRadius = radius;
         w.contentView.layer.masksToBounds = YES;
+
+        if (borderWidth > 0) {
+            CGFloat alpha = (((borderRgb >> 24) & 0xff) / 255.0);
+            CGFloat red   = (((borderRgb >> 16) & 0xff) / 255.0);
+            CGFloat green = (((borderRgb >>  8) & 0xff) / 255.0);
+            CGFloat blue  = (((borderRgb >>  0) & 0xff) / 255.0);
+            NSColor *color = [NSColor colorWithDeviceRed:red green:green blue:blue alpha:alpha];
+
+            w.contentView.layer.borderWidth = borderWidth;
+            w.contentView.layer.borderColor = color.CGColor;
+        }
+
         w.backgroundColor = NSColor.clearColor;
         w.opaque = NO;
         // remove corner radius animation

src/java.desktop/macosx/native/libawt_lwawt/awt/CWrapper.m

@@ -516,6 +516,31 @@ JNI_COCOA_ENTER(env);
 JNI_COCOA_EXIT(env);
 }
 
+/*
+ * Class:     sun_lwawt_macosx_CWrapper$NSWindow
+ * Method:    isTabbedWindow
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL
+Java_sun_lwawt_macosx_CWrapper_00024NSWindow_isTabbedWindow
+(JNIEnv *env, jclass cls, jlong windowPtr)
+{
+    __block jboolean isTabbedWindow = JNI_FALSE;
+
+JNI_COCOA_ENTER(env);
+
+    if (@available(macOS 10.13, *)) {
+        NSWindow *window = (NSWindow *)jlong_to_ptr(windowPtr);
+        [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
+            isTabbedWindow = [[[window tabGroup] windows] count] > 1;
+        }];
+    }
+
+JNI_COCOA_EXIT(env);
+
+    return isTabbedWindow;
+}
+
 /*
  * Class:     sun_lwawt_macosx_CWrapper$NSView
  * Method:    addSubview

src/java.desktop/windows/classes/sun/awt/windows/WWindowPeer.java

@@ -846,19 +846,30 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer,
 
     private void setRoundedCornersImpl(Object params) {
         if (params instanceof String) {
-            int type = 0; // default
-            if ("none".equals(params)) {
-                type = 1;
-            } else if ("full".equals(params)) {
-                type = 2;
-            } else if ("small".equals(params)) {
-                type = 3;
+            setRoundedCorners(getRoundedType(params), false, 0);
+        } else if (params instanceof Object[]) {
+            Object[] values = (Object[]) params;
+            if (values.length == 2 && values[0] instanceof String && values[1] instanceof Color) {
+                Color color = (Color) values[1];
+                setRoundedCorners(getRoundedType(values[0]), true, color.getRGB());
             }
-            setRoundedCorners(type);
         }
     }
 
-    private native void setRoundedCorners(int type);
+    private static int getRoundedType(Object params) {
+        if ("none".equals(params)) {
+            return  1;
+        }
+        if ("full".equals(params)) {
+            return 2;
+        }
+        if ("small".equals(params)) {
+            return 3;
+        }
+        return 0; // default
+    }
+
+    private native void setRoundedCorners(int type, boolean isBorderColor, int borderColor);
 
     native void updateWindowImpl(int[] data, int width, int height);
 

src/java.desktop/windows/native/libawt/windows/awt_Window.cpp

@@ -54,6 +54,7 @@ typedef __int32 LONG_PTR;
 // Define these to be able to build with older SDKs
 #define DWM_WINDOW_CORNER_PREFERENCE int
 #define DWMWA_WINDOW_CORNER_PREFERENCE 33
+#define DWMWA_BORDER_COLOR 34
 
 // Used for Swing's Menu/Tooltip animation Support
 const int UNSPECIFIED = 0;
@@ -134,6 +135,8 @@ struct OpaqueStruct {
 struct RoundedCornersStruct {
     jobject window;
     DWM_WINDOW_CORNER_PREFERENCE type;
+    jboolean isBorderColor;
+    jint borderColor;
 };
 // struct for _UpdateWindow() method
 struct UpdateWindowStruct {
@@ -3397,6 +3400,13 @@ void AwtWindow::_SetRoundedCorners(void *param) {
 
     DwmSetWindowAttribute(window->GetHWnd(), DWMWA_WINDOW_CORNER_PREFERENCE, &rcs->type, sizeof(DWM_WINDOW_CORNER_PREFERENCE));
 
+    if (rcs->isBorderColor) {
+        jint red = (rcs->borderColor >> 16) & 0xff;
+        jint green = (rcs->borderColor >> 8) & 0xff;
+        jint blue  = (rcs->borderColor >> 0) & 0xff;
+        COLORREF borderColor = RGB(red, green, blue);
+        DwmSetWindowAttribute(window->GetHWnd(), DWMWA_BORDER_COLOR, &borderColor, sizeof(COLORREF));
+    }
   ret:
     env->DeleteGlobalRef(self);
     delete rcs;
@@ -4171,16 +4181,18 @@ Java_sun_awt_windows_WWindowPeer_repositionSecurityWarning(JNIEnv *env,
 /*
  * Class:     sun_awt_windows_WWindowPeer
  * Method:    setRoundedCorners
- * Signature: (I)V
+ * Signature: (IZI)V
  */
 JNIEXPORT void JNICALL
-Java_sun_awt_windows_WWindowPeer_setRoundedCorners(JNIEnv *env, jobject self, jint type)
+Java_sun_awt_windows_WWindowPeer_setRoundedCorners(JNIEnv *env, jobject self, jint type, jboolean isBorderColor, jint borderColor)
 {
     TRY;
 
     RoundedCornersStruct *rcs = new RoundedCornersStruct;
     rcs->window = env->NewGlobalRef(self);
     rcs->type = (DWM_WINDOW_CORNER_PREFERENCE)type;
+    rcs->isBorderColor = isBorderColor;
+    rcs->borderColor = borderColor;
 
     AwtToolkit::GetInstance().SyncCall(AwtWindow::_SetRoundedCorners, rcs);
     // global refs and rcs are deleted in _SetRoundedCorners

src/jetbrains.api/src/com/jetbrains/RoundedCornersManager.java

@@ -33,7 +33,8 @@ import java.awt.Window;
  */
 public interface RoundedCornersManager {
     /**
-     * @param params for macOS is Float object with radius.
+     * @param params for macOS is Float object with radius or
+     *               Array with {Float for radius, Integer for border width, java.awt.Color for border color}.
      *
      * @param params for Windows 11 is String with values:
      * "default" - let the system decide whether or not to round window corners,

src/jetbrains.api/version.properties

@@ -6,9 +6,9 @@
 # 2. When only new API is added, or some existing API was @Deprecated - increment MINOR, reset PATCH to 0
 # 3. For major backwards incompatible API changes - increment MAJOR, reset MINOR and PATCH to 0
 
-VERSION = 0.0.14
+VERSION = 0.0.15
 
 # Hash is used to track changes to jetbrains.api, so you would not forget to update version when needed.
 # When you make any changes, "make jbr-api" will fail and ask you to update hash and version number here.
 
-HASH = D28F22789F62EA4F8B8F4E7EC8B342E5
+HASH = 944323BE83C422C02167A3D328955130

test/hotspot/jtreg/jbFdProblemList.txt

@@ -0,0 +1,88 @@
+#
+# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#############################################################################
+#
+# List of quarantined tests -- tests that should not be run by default, because
+# they may fail due to known reason. The reason (CR#) must be mandatory specified.
+#
+# List items are testnames followed by labels, all MUST BE commented
+#   as to why they are here and use a label:
+#     generic-all   Problems on all platforms
+#     generic-ARCH  Where ARCH is one of: x64, i586, ppc64, ppc64le, s390x etc.
+#     OSNAME-all    Where OSNAME is one of: linux, windows, macosx, aix
+#     OSNAME-ARCH   Specific on to one OSNAME and ARCH, e.g. macosx-x64
+#     OSNAME-REV    Specific on to one OSNAME and REV, e.g. macosx-10.7.4
+#
+# More than one label is allowed but must be on the same line.
+#
+#############################################################################
+
+
+#############################################################################
+
+# gtest
+
+#gtest/AsyncLogGtest.java initial_run generic-all
+
+# :hotspot_compiler
+
+compiler/ciReplay/TestServerVM.java NOBUG generic-all
+compiler/ciReplay/TestInlining.java NOBUG generic-all
+compiler/ciReplay/TestIncrementalInlining.java NOBUG generic-all
+compiler/ciReplay/TestInliningProtectionDomain.java NOBUG generic-all
+compiler/ciReplay/TestLambdas.java NOBUG generic-all
+compiler/ciReplay/TestUnresolvedClasses.java NOBUG generic-all
+
+#############################################################################
+
+# :hotspot_gc
+
+gc/stress/gcold/TestGCOldWithShenandoah.java#iu-aggressive NOBUG generic-all timeout
+
+#############################################################################
+
+# :hotspot_runtime
+
+#runtime/CompressedOops/CompressedClassPointers.java 8305765 generic-all
+
+#############################################################################
+
+# :hotspot_serviceability
+
+#serviceability/sa/sadebugd/DebugdConnectTest.java 8239062,8270326 macosx-x64,macosx-aarch64
+
+#############################################################################
+
+# :hotspot_misc
+
+#############################################################################
+
+
+#############################################################################
+
+# :vmTestbase_*
+
+#############################################################################
+
+vmTestbase/gc/gctests/LargeObjects/large002/TestDescription.java NOBUG linux-all timeout

test/hotspot/jtreg/jbProblemList.txt

@@ -44,15 +44,18 @@
 # gtest
 
 gtest/AsyncLogGtest.java initial_run generic-all
-gtest/MetaspaceGtests.java#reclaim-none-ndebug initial_run generic-all
-gtest/LargePageGtests.java#use-large-pages-sysV initial_run linux-all
-gtest/LargePageGtests.java#use-large-pages-1G initial_run linux-all
 gtest/GTestWrapper.java initial_run generic-all
-gtest/MetaspaceUtilsGtests.java initial_run generic-all
-gtest/MetaspaceGtests.java#balanced-no-ccs initial_run generic-all
-gtest/MetaspaceGtests.java#reclaim-aggressive-ndebug initial_run generic-all
 gtest/LargePageGtests.java#use-large-pages initial_run linux-all,windows-all
+gtest/LargePageGtests.java#use-large-pages-1G initial_run linux-all
+gtest/LargePageGtests.java#use-large-pages-sysV initial_run linux-all
+gtest/MetaspaceGtests.java#balanced-no-ccs initial_run generic-all
+gtest/MetaspaceGtests.java#balanced-with-guards JBR-5718 generic-all
+gtest/MetaspaceGtests.java#default-debug JBR-5718 generic-all
+gtest/MetaspaceGtests.java#reclaim-aggressive-ndebug initial_run generic-all
+gtest/MetaspaceGtests.java#reclaim-none-ndebug initial_run generic-all
+gtest/MetaspaceUtilsGtests.java initial_run generic-all
 
+gtest/NativeHeapTrimmerGtest.java JBR-5718 generic-all
 gtest/NMTGtests.java#nmt-detail JBR-5718 generic-all
 gtest/NMTGtests.java#nmt-off JBR-5718 generic-all
 gtest/NMTGtests.java#nmt-summary JBR-5718 generic-all
@@ -61,7 +64,7 @@ gc/stress/TestReclaimStringsLeaksMemory.java initial_run windows-all
 
 gc/shenandoah/TestAllocObjects.java#aggressive initial_run generic-all
 gc/shenandoah/TestAllocObjects.java#iu-aggressive initial_run generic-all
-gc/shenandoah/mxbeans/TestChurnNotifications.java#aggressive initial_run generic-all
+gc/shenandoah/mxbeans/TestChurnNotifications.java#aggressive JBR-6262 generic-all
 gc/shenandoah/mxbeans/TestChurnNotifications.java#iu initial_run linux-x64
 
 # :hotspot_compiler
@@ -90,7 +93,7 @@ compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java 8183263 generic-x64
 compiler/c2/Test8004741.java 8235801 generic-all
 
 compiler/vectorapi/VectorCastShape64Test.java  initial_run generic-aarch64
-compiler/vectorapi/VectorRebracket128Test.java initial_run generic-aarch64
+compiler/vectorapi/VectorRebracket128Test.java#ZSinglegen initial_run generic-aarch64
 
 #############################################################################
 
@@ -112,8 +115,25 @@ gc/stress/gcold/TestGCOldWithShenandoah.java initial_run windows-all
 
 # :hotspot_runtime
 
-runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java 8253437 windows-x64
+runtime/CompressedOops/CompressedClassPointers.java 8305765 generic-all
+
 runtime/cds/CheckDefaultArchiveFile.java JBR-4227 generic-all
+runtime/cds/SharedBaseAddress.java initial_run generic-all
+runtime/cds/TestCDSVMCrash.java JBR-6246 generic-all
+runtime/cds/appcds/CommandLineFlagCombo.java JBR-6246 generic-all
+runtime/cds/appcds/TestDumpClassListSource.java JBR-6099 generic-all
+runtime/cds/appcds/TestZGCWithCDS.java#ZGenerational 8316319 generic-all
+runtime/cds/appcds/dynamicArchive/CDSStreamTestDriver.java initial_run generic-all
+runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveNoDefaultArchive.java JBR-6246 generic-all
+runtime/cds/appcds/jigsaw/modulepath/ModulePathAndCP_JFR.java 8253437 windows-x64
+runtime/cds/appcds/methodHandles/MethodHandlesAsCollectorTest.java initial_run generic-all
+runtime/cds/appcds/methodHandles/MethodHandlesCastFailureTest.java initial_run generic-all
+runtime/cds/appcds/methodHandles/MethodHandlesGeneralTest.java initial_run generic-all
+runtime/cds/appcds/methodHandles/MethodHandlesInvokersTest.java initial_run generic-all
+runtime/cds/appcds/methodHandles/MethodHandlesPermuteArgumentsTest.java initial_run generic-all
+runtime/cds/appcds/methodHandles/MethodHandlesSpreadArgumentsTest.java initial_run generic-all
+
+runtime/jni/daemonDestroy/TestDaemonDestroy.java JBR-6261 windows-x64
 runtime/jni/terminatedThread/TestTerminatedThread.java 8219652 aix-ppc64
 runtime/handshake/HandshakeSuspendExitTest.java 8294313 generic-all
 runtime/os/TestTracePageSizes.java#no-options 8267460 linux-aarch64
@@ -122,7 +142,8 @@ runtime/os/TestTracePageSizes.java#compiler-options 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#G1 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#Parallel 8267460 linux-aarch64
 runtime/os/TestTracePageSizes.java#Serial 8267460 linux-aarch64
-runtime/ErrorHandling/CreateCoredumpOnCrash.java 8267433 macosx-x64
+runtime/ErrorHandling/CreateCoredumpOnCrash.java 8267433,initial_run macosx-x64,windows-aarch64
+runtime/ErrorHandling/MachCodeFramesInErrorFile.java JBR-6258 windows-aarch64
 runtime/vthread/RedefineClass.java 8297286 generic-all
 runtime/vthread/TestObjectAllocationSampleEvent.java 8297286 generic-all
 runtime/StackGuardPages/TestStackGuardPages.java 8293452 linux-all
@@ -134,17 +155,9 @@ containers/docker/TestJcmd.java 8278102 linux-all
 runtime/memory/ReserveMemory.java initial_run windows-aarch64
 runtime/memory/ReadFromNoaccessArea.java initial_run windows-aarch64
 
-runtime/cds/appcds/methodHandles/MethodHandlesInvokersTest.java initial_run generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesCastFailureTest.java initial_run generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesGeneralTest.java initial_run generic-all
 runtime/ReservedStack/ReservedStackTestCompiler.java initial_run windows-aarch64
-runtime/cds/appcds/dynamicArchive/CDSStreamTestDriver.java initial_run generic-all
-runtime/ErrorHandling/CreateCoredumpOnCrash.java initial_run windows-aarch64
 runtime/ReservedStack/ReservedStackTest.java initial_run windows-aarch64
-runtime/cds/appcds/methodHandles/MethodHandlesPermuteArgumentsTest.java initial_run generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesAsCollectorTest.java initial_run generic-all
-runtime/cds/SharedBaseAddress.java initial_run generic-all
-runtime/cds/appcds/methodHandles/MethodHandlesSpreadArgumentsTest.java initial_run generic-all
+runtime/reflect/ReflectOutOfMemoryError.java 8316060 generic-all
 
 #############################################################################
 
@@ -158,14 +171,16 @@ serviceability/jvmti/vthread/GetSetLocalTest/GetSetLocalTest.java 8286836 generi
 serviceability/dcmd/gc/RunFinalizationTest.java 8227120 linux-all,windows-x64
 
 serviceability/sa/ClhsdbCDSCore.java 8294316,8267433 macosx-x64
-serviceability/sa/ClhsdbFindPC.java#xcomp-core 8294316,8267433 macosx-x64
-serviceability/sa/ClhsdbFindPC.java#no-xcomp-core 8294316,8267433 macosx-x64,linux_aarch64
-serviceability/sa/ClhsdbPmap.java#core 8294316,8267433 macosx-x64
-serviceability/sa/ClhsdbPstack.java#core 8294316,8267433 macosx-x64
+serviceability/sa/ClhsdbFindPC.java#xcomp-core 8294316,8267433,JBR-6259 macosx-x64,windows-aarch64
+serviceability/sa/ClhsdbFindPC.java#no-xcomp-core 8294316,8267433,JBR-6259 macosx-x64,linux_aarch64,windows-aarch64
+serviceability/sa/ClhsdbPmap.java#core 8294316,8267433,JBR-6259 macosx-x64,windows-aarch64
+serviceability/sa/ClhsdbPstack.java#core 8294316,8267433,JBR-6259 macosx-x64,windows-aarch64
+serviceability/sa/ClhsdbThreadContext.java JBR-6260 windows-aarch64
 serviceability/sa/TestJmapCore.java 8294316,8267433 macosx-x64
 serviceability/sa/TestJmapCoreMetaspace.java 8294316,8267433 macosx-x64
 
 serviceability/attach/ConcAttachTest.java 8290043 linux-all
+serviceability/jvmti/RedefineClasses/RedefineSharedClassJFR.java JBR-6245 generic-all
 serviceability/jvmti/RedefineClasses/TestMultipleClasses.java initial_run windows-all
 serviceability/jvmti/SetBreakpoint/TestManyBreakpoints.java initial_run generic-aarch64
 
@@ -213,6 +228,7 @@ vmTestbase/nsk/jdi/LaunchingConnector/launchnosuspend/launchnosuspend001/TestDes
 
 vmTestbase/nsk/jdi/ThreadReference/stop/stop001/TestDescription.java 7034630 generic-all
 vmTestbase/nsk/jdi/ReferenceType/instances/instances002/instances002.java initial_run linux-all
+vmTestbase/nsk/jdi/stress/ClassPrepareEvents/ClassPrepareEvents001/ClassPrepareEvents001.java
 
 vmTestbase/metaspace/gc/firstGC_10m/TestDescription.java 8208250 generic-all
 vmTestbase/metaspace/gc/firstGC_50m/TestDescription.java 8208250 generic-all
@@ -231,6 +247,9 @@ vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t001/TestDescription.java initi
 vmTestbase/nsk/jvmti/scenarios/sampling/SP04/sp04t002/TestDescription.java initial_run windows-x64
 vmTestbase/nsk/jvmti/scenarios/sampling/SP05/sp05t003/TestDescription.java initial_run generic-all
 
+vmTestbase/gc/gctests/LargeObjects/large003/TestDescription.java 8307788 generic-all
+vmTestbase/gc/gctests/LargeObjects/large004/TestDescription.java 8307788 generic-all
+vmTestbase/gc/gctests/LargeObjects/large005/TestDescription.java 8307788 generic-all
 vmTestbase/gc/lock/jni/jnilock002/TestDescription.java 8192647 generic-all
 
 vmTestbase/jit/escape/LockCoarsening/LockCoarsening001.java 8148743 generic-all
@@ -244,7 +263,7 @@ vmTestbase/vm/mlvm/meth/stress/jdi/breakpointInCompiledCode/Test.java 8257761 ge
 vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2none_a/TestDescription.java 8013267 generic-all
 vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manyDiff_b/TestDescription.java 8013267 generic-all
 vmTestbase/vm/mlvm/indy/func/jvmti/mergeCP_indy2manySame_b/TestDescription.java 8013267 generic-all
-vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java initial_run macos-aarch64
+vmTestbase/vm/mlvm/meth/stress/compiler/deoptimize/Test.java#id0 initial_run macos-aarch64
 
 vmTestbase/nsk/jdwp/ThreadReference/ForceEarlyReturn/forceEarlyReturn001/forceEarlyReturn001.java 7199837 generic-all
 
@@ -256,15 +275,7 @@ vmTestbase/nsk/monitoring/ThreadMXBean/ThreadInfo/Multi/Multi005/TestDescription
 
 ### initial_runs
 
-gc/shenandoah/mxbeans/TestChurnNotifications.java#aggressive NO_BUG macosx_all
-
-runtime/cds/appcds/CommandLineFlagCombo.java NO_BUG generic_all
-runtime/cds/appcds/TestDumpClassListSource.java JBR-6099 generic_all
-runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveNoDefaultArchive.java NO_BUG generic_all
-runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveUpgrade.java NO_BUG generic_all
-
 vmTestbase/nsk/stress/thread/thread008.java initial_run windows-all
-compiler/vectorapi/VectorRebracket128Test.java NO_BUG linux_aarch64
 
 vmTestbase/nsk/sysdict/vm/stress/btree/btree001/btree001.java initial_run windows-aarch64
 vmTestbase/nsk/sysdict/vm/stress/btree/btree005/btree005.java initial_run windows-aarch64

test/jdk/jb/build/jsa6246.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+# @test
+# @summary jsa6246.sh checks jsa files exist in jbrsdk distributions, jbr distributions are skipped
+# @run shell jsa6246.sh
+
+if [ -z "${TESTJAVA}" ]; then
+  echo "TESTJAVA undefined: testing cancelled"
+  exit 1
+fi
+
+source ${TESTJAVA}/release
+echo "Checking $IMPLEMENTOR_VERSION"
+if [[ "$IMPLEMENTOR_VERSION" != *"JBRSDK"* ]]; then
+  echo "Test executed for JBRSDK only"
+  echo "skipping the test"
+  exit 0
+fi
+
+FIND="/usr/bin/find"
+files=$(${FIND} ${TESTJAVA} -name "*.jsa")
+ls -l $files
+if [ $? != 0 ]; then
+    echo "Command failed."
+    exit 1
+elif [ -z "$files" ]; then
+    echo "*** FAILED *** jsa-files not found"
+    echo "\n*** FAILED *** Test failed"
+    exit 1
+fi
+echo "\nTest passed"

test/jdk/jbMMProblemList.txt

@@ -3,11 +3,10 @@ java/awt/Debug/X11Trace.java JBR-5442 linux-all
 java/awt/Multiscreen/MultiScreenLocationTest/MultiScreenLocationTest.java JBR-6058 windows-all
 java/awt/FullScreen/CurrentDisplayModeTest/CurrentDisplayModeTest.java JBR-5059 linux-all
 java/awt/FullScreen/MultimonFullscreenTest/MultimonDeadlockTest.java JBR-4379 windows-all
-java/awt/Frame/FramesGC/FramesGC.java JBR-6057 windows-all
+java/awt/Frame/FramesGC/FramesGC.java 8079069,JBR-6057 macosx-all,windows-all
 java/awt/GraphicsDevice/DisplayModes/CompareToXrandrTest.java JBR-5062 linux-all
 java/awt/datatransfer/Clipboard/GetContentsInterruptedTest.java JBR-5086 linux-5.15.0-46-generic Ubuntu 20.04
 java/awt/dnd/MissedDragEnterTest.java JBR-6091 windows-all
-java/awt/Frame/FramesGC/FramesGC.java JBR-6057 windows-all
 java/awt/Frame/GetGraphicsStressTest/GetGraphicsStressTest.java JBR-5117 linux-all
 java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java 8311535 windows-all
 java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java#id1 JBR-5442 linux-all
@@ -19,7 +18,6 @@ java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.java JBR-5531,JBR-544
 java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java JBR-5442 linux-all
 java/awt/PopupMenu/PopupMenuLocation.java 8238720,JBR-5442 windows-all,linux-all
 java/awt/Robot/CheckCommonColors/CheckCommonColors.java 8253184,JBR-5510,JBR-5442,JBR-6092 windows-all,linux-all,macosx-aarch64
-java/awt/Robot/CheckCommonColors/CheckCommonColors.java JBR-6092 macosx-aarch64
 java/awt/Robot/HiDPIScreenCapture/ScreenCaptureTest.java 8253184,JBR-5442 windows-all,linux-all
 java/awt/Robot/MouseLocationOnScreen/MouseLocationOnScreen.java JBR-5390 macosx-all,linux-all
 java/awt/Robot/NonEmptyErrorStream.java JBR-5442 linux-all
@@ -38,7 +36,6 @@ javax/swing/JMenu/4692443/bug4692443.java JBR-6065 windows-all
 javax/swing/JMenuBar/4750590/bug4750590.java JBR-6065 windows-all
 javax/swing/JMenuItem/4171437/bug4171437.java JBR-6065 windows-all
 javax/swing/JTable/7124218/SelectEditTableCell.java JBR-5442 linux-all
-javax/swing/JTextArea/8149849/DNDTextToScaledArea.java 8253184 windows-all
 javax/swing/JTextField/8036819/bug8036819.java JBR-6065 windows-all
 javax/swing/JTree/4927934/bug4927934.java JBR-6065 windows-all
 javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java JBR-5442 linux-all

test/jdk/jbProblemList.txt

@@ -115,7 +115,6 @@
 
 java/awt/Button/DisabledButtonPress.java JBR-5799 windows-aarch64
 java/awt/Desktop/8064934/bug8064934.java JBR-5764 windows-all
-java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKeypress.java JBR-5915 linux-all
 java/awt/Debug/DumpOnKey/DumpOnKey.java JBR-5225,JBR-5359 windows-all,windows-aarch64
 java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java 8168389 windows-all,macosx-all
 java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java 8224055 macosx-all
@@ -652,7 +651,7 @@ java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java JBR-5210 window
 java/awt/FullScreen/8013581/bug8013581.java 8169471,JBR-80 macosx-all,windows-all
 java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java 8233568,JBR-5583 macosx-all,windows-x64
 java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java 8233568 macosx-all
-java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKeypress.java 8233568 macosx-all
+java/awt/event/MouseEvent/ClickDuringKeypress/ClickDuringKeypress.java 8233568,JBR-5915 macosx-all,linux-all
 java/awt/event/KeyEvent/DeadKey/DeadKeyMacOSXInputText.java 8233568 macosx-all
 java/awt/event/KeyEvent/DeadKey/deadKeyMacOSX.java 8233568 macosx-all
 java/awt/TrayIcon/RightClickWhenBalloonDisplayed/RightClickWhenBalloonDisplayed.java 8238720 windows-all
@@ -884,7 +883,7 @@ javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java 8253184 linux-all,win
 javax/swing/plaf/nimbus/8041642/bug8041642.java 8253184,JBR-5510 windows-all,linux-5.18.2-arch1-1
 javax/swing/plaf/nimbus/8057791/bug8057791.java 8253184,JBR-5510 windows-all,linux-5.18.2-arch1-1
 javax/swing/plaf/nimbus/TestNimbusBGColor.java JBR-5359 windows-aarch64
-javax/swing/plaf/nimbus/TestNimbusOverride.java 8253184, JBR-5829 windows-all,linux-all
+javax/swing/plaf/nimbus/TestNimbusOverride.java 8253184,JBR-5829 windows-all,linux-all
 javax/swing/plaf/windows/6921687/bug6921687.java 8253184 windows-all
 javax/swing/plaf/windows/WindowsRootPaneUI/WrongAltProcessing/WrongAltProcessing.java JBR-4372 windows-all
 
@@ -975,7 +974,7 @@ javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelO
 javax/swing/JSplitPane/4885629/bug4885629.java 8019935,JBR-5359,JBR-5510 macosx-all,windows-aarch64,linux-5.18.2-arch1-1
 javax/swing/JTabbedPane/4361477/bug4361477.java JBR-5932 linux-all
 javax/swing/JTabbedPane/8007563/Test8007563.java 8051591 generic-all
-javax/swing/JTabbedPane/4624207/bug4624207.java 8064922,8197552 macosx-all,windows-all 8064922:macosx-all, 8197552:windows-all
+javax/swing/JTabbedPane/4624207/bug4624207.java 8064922,8197552,JBR-6235 macosx-all,windows-all,linux-all 8064922:macosx-all, 8197552:windows-all
 javax/swing/JTabbedPane/TestBackgroundScrollPolicy.java 8253184,windows-all
 javax/swing/JToggleButton/TestSelectedKey.java JBR-5846 windows-all
 javax/swing/JToolBar/4529206/bug4529206.java JBR-5387 linux-all

test/jdk/jbScale2ProblemList.txt

@@ -7,10 +7,10 @@ java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsol
 java/awt/Focus/6378278/InputVerifierTest.java JBR-6090 windows-all
 java/awt/Focus/6382144/EndlessLoopTest.java JBR-6090 windows-all
 java/awt/Focus/8282640/ScrollPaneFocusBugTest.java JBR-6090 windows-all
-java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java JBR-6090 windows-all
+java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java 8198618,JBR-814,JBR-6090 macosx-all,linux-all,windows-all
 java/awt/Focus/LabelScrollBarFocus.java JBR-6090 windows-x64
 java/awt/Focus/ModalExcludedWindowClickTest/ModalExcludedWindowClickTest.java JBR-6090 windows-x64
-java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java JBR-6090 windows-x64
+java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java 8194753,JBR-6090 linux-all,macosx-all,windows-x64
 java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java JBR-6089 windows-all
 java/awt/Focus/WindowUpdateFocusabilityTest/WindowUpdateFocusabilityTest.java JBR-6090 windows-all
 java/awt/Frame/InvisibleOwner/InvisibleOwner.java JBR-6090 windows-all
@@ -23,7 +23,7 @@ java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java JBR-4199,
 
 java/awt/Graphics/LineClipTest.java                                                 JBR-5071 linux-all
 java/awt/image/VolatileImage/DrawHugeImageTest.java JBR-5071,JBR-5359 linux-all,windows-aarch64
-java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java        JBR-5071 linux-all
+java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java 8159252,JBR-5050,JBR-5071 windows-all,macosx-all,linux-all
 java/awt/Mixing/AWT_Mixing/JComboBoxOverlapping.java 8049405,JBR-5359,JBR-5510,JBR-6090 macosx-all,windows-aarch64,linux-5.18.2-arch1-1,windows-all
 java/awt/Mixing/AWT_Mixing/JGlassPaneMoveOverlapping.java JBR-5359,JBR-5510,JBR-6090 windows-aarch64,linux-5.18.2-arch1-1,windows-all
 java/awt/Mixing/MixingOnDialog.java JBR-6090 windows-all

test/jdk/jbcommitProblemList.txt

@@ -2,90 +2,6 @@
 javax/imageio/stream/StreamCloserLeak/run_test.sh nobug generic-all
 javax/imageio/spi/AppletContextTest/BadPluginConfigurationTest.sh nobug generic-all
 
-#
-# intermittently failed, they were muted in regular runs with the option "unmute manually"
-#
-sun/awt/dnd/8024061/bug8024061.java nobug windows-all
-java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java nobug windows-all
-java/awt/hidpi/SetMaximizedBoundsTest.java nobug windows-all
-java/awt/Focus/8000326/SetFocusTraversalKeysEnabledTest.java nobug windows-all
-java/awt/Focus/FocusSubRequestTest/FocusSubRequestTest.java nobug windows-all
-java/awt/Focus/FocusTraversalPolicy/ButtonGroupLayoutTraversal/ButtonGroupLayoutTraversalTest.java nobug windows-all
-java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java nobug windows-all
-java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java nobug windows-all
-java/awt/Focus/ShowFrameCheckForegroundTest/ShowFrameCheckForegroundTest.java nobug windows-all
-java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java nobug windows-all,macosx-all,linux-all
-java/awt/Focus/UnaccessibleChoice/AccessibleChoiceTest.java nobug windows-all
-java/awt/KeyboardFocusmanager/TypeAhead/FreezeTest/FreezeTest.java nobug windows-all
-java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.java nobug windows-all
-java/awt/MenuBar/SeparatorsNavigation/SeparatorsNavigation.java nobug windows-all
-java/awt/Mixing/AWT_Mixing/JGlassPaneInternalFrameOverlapping.java nobug windows-all
-java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java JBR-4354 windows-all,linux-all # linux: JBR-4354
-java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java nobug windows-all
-java/awt/Paint/PaintNativeOnUpdate.java nobug windows-all
-java/awt/TextArea/OverScrollTest/OverScrollTest.java nobug windows-all
-java/awt/TextField/OverScrollTest/OverScrollTest.java nobug windows-all
-java/awt/Window/8159168/SetShapeTest.java nobug windows-all
-java/awt/Window/BackgroundIsNotUpdated/BackgroundIsNotUpdated.java nobug windows-all
-
 javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh nobug generic-all # line 59: /opt/teamcity-agent/work/efb45cc305c2e813/jbr/Contents/Home/bin/jar: No such file or directory
 
-
-javax/swing/dnd/7171812/bug7171812.java nobug windows-all
-javax/swing/event/RightAltKeyTest.java nobug windows-all
-javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java nobug windows-all
-javax/swing/JComboBox/8033069/bug8033069ScrollBar.java nobug windows-all
-javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java nobug windows-all
-javax/swing/JComboBox/8072767/bug8072767.java nobug windows-all
-javax/swing/JComboBox/8136998/bug8136998.java nobug windows-all
-javax/swing/JComboBox/8182031/ComboPopupTest.java nobug windows-all
-javax/swing/JComponent/7154030/bug7154030.java nobug windows-all
-javax/swing/JEditorPane/6917744/bug6917744.java 8213124 macosx-all,windows-all
-javax/swing/JEditorPane/8195095/ImageViewTest.java nobug windows-all
-javax/swing/JFrame/8016356/bug8016356.java nobug windows-all
-javax/swing/JFrame/8175301/ScaledFrameBackgroundTest.java nobug windows-all
-javax/swing/JInternalFrame/5066752/bug5066752.java nobug windows-all
-javax/swing/JInternalFrame/8145060/TestJInternalFrameMinimize.java nobug windows-all,linux-all
-javax/swing/JInternalFrame/Test6505027.java nobug windows-all
-javax/swing/JLabel/7004134/bug7004134.java nobug linux-all
-javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java nobug windows-all,linux-all
-javax/swing/JMenuItem/4654927/bug4654927.java nobug windows-all,linux-all
-javax/swing/JMenuItem/6209975/bug6209975.java JBR-4894 windows-all
-javax/swing/JMenuItem/6249972/bug6249972.java JBR-4894 windows-all
-javax/swing/JPopupMenu/4634626/bug4634626.java nobug windows-all
-javax/swing/JPopupMenu/4760494/bug4760494.java JBR-4894 windows-all
-javax/swing/JPopupMenu/6415145/bug6415145.java nobug windows-all
-javax/swing/JPopupMenu/6515446/bug6515446.java JBR-4894 windows-all
-javax/swing/JPopupMenu/7156657/bug7156657.java nobug windows-all
-javax/swing/JPopupMenu/8075063/ContextMenuScrollTest.java JBR-4894 windows-all
-javax/swing/JPopupMenu/SetInvokerJPopupMenuTest.java nobug linux-all
-javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java nobug windows-all
-javax/swing/JRadioButton/8033699/bug8033699.java nobug windows-all
-javax/swing/JRadioButton/8075609/bug8075609.java nobug windows-all
-javax/swing/JRadioButton/ButtonGroupFocus/ButtonGroupFocusTest.java nobug windows-all
-javax/swing/JRootPane/4670486/bug4670486.java nobug windows-all
-javax/swing/JSpinner/4788637/bug4788637.java nobug windows-all
-javax/swing/JSpinner/8223788/JSpinnerButtonFocusTest.java nobug windows-all
-javax/swing/JSpinner/TestJSpinnerFocusLost.java nobug windows-all
-javax/swing/JTabbedPane/4624207/bug4624207.java 8064922,8197552 macosx-all,windows-all,linux-all 8064922:macosx-all, 8197552:windows-all
-javax/swing/JTabbedPane/TestBackgroundScrollPolicy.java nobug windows-all
-javax/swing/JTable/7124218/SelectEditTableCell.java JBR-4894 windows-all
-javax/swing/JToolTip/4846413/bug4846413.java nobug windows-all
-javax/swing/JToolTip/6219960/bug6219960.java nobug windows-all
-javax/swing/JTree/4633594/JTreeFocusTest.java 8173125 macosx-all,windows-all
-javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java 8159131 linux-all,windows-all
-javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentSwing.java 8194128 macosx-all,windows-all
 javax/swing/JWindow/ShapedAndTranslucentWindows/SetShapeAndClickSwing.java 8013450 macosx-all,windows-all
-javax/swing/JWindow/ShapedAndTranslucentWindows/ShapedPerPixelTranslucentGradient.java 8233582,nobug linux-all,windows-all
-javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java 8024627 macosx-all,windows-all
-javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentWindowClickSwing.java nobug windows-all
-javax/swing/plaf/nimbus/8057791/bug8057791.java nobug windows-all
-javax/swing/plaf/nimbus/TestNimbusOverride.java nobug linux-all,windows-all
-javax/swing/plaf/windows/6921687/bug6921687.java nobug windows-all
-javax/swing/ProgressMonitor/ProgressMonitorEscapeKeyPress.java nobug windows-all
-javax/swing/SwingUtilities/7088744/bug7088744.java nobug windows-all
-javax/swing/text/CSSBorder/6796710/bug6796710.java nobug windows-all
-javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java nobug windows-all
-javax/swing/text/JTextComponent/6361367/bug6361367.java nobug windows-all
-javax/swing/text/View/8014863/bug8014863.java nobug windows-all
-javax/swing/text/View/8156217/FPMethodCalledTest.java nobug linux-all