From 8057faa083b70ff3645675a37a17fc8043dd5d3b Mon Sep 17 00:00:00 2001
From: mrserb <14138494+mrserb@users.noreply.github.com>
Date: Wed, 23 Dec 2020 00:51:42 +0000
Subject: [PATCH 1/2] Revert "8230869: [macos 10.15] The String "X Y Z" was not
 set to application's icon in the taskbar"

This reverts commit 0fcb58c5d580686e8192b84af79536c7d5c1cf94.
---
 .../macosx/classes/apple/laf/JRSUIUtils.java        | 13 +------------
 .../classes/sun/lwawt/macosx/CTaskbarPeer.java      |  7 ++-----
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
index b21093d33be..69fdf688013 100644
--- a/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
+++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -36,11 +36,6 @@ public final class JRSUIUtils {
 
     static boolean isLeopard = isMacOSXLeopard();
     static boolean isSnowLeopardOrBelow = isMacOSXSnowLeopardOrBelow();
-    static boolean isCatalinaOrAbove = isMacOSXCatalinaOrAbove();
-
-    static boolean isMacOSXCatalinaOrAbove() {
-        return currentMacOSXVersionMatchesGivenVersionRange(15, true, false, true);
-    }
 
     static boolean isMacOSXLeopard() {
         return isCurrentMacOSXVersion(5);
@@ -79,12 +74,6 @@ static boolean currentMacOSXVersionMatchesGivenVersionRange(
         return false;
     }
 
-    public static class TaskBar {
-        public static boolean isIconBadgeSupported() {
-            return !isCatalinaOrAbove;
-        }
-    }
-
     public static class TabbedPane {
         public static boolean useLegacyTabs() {
             return isLeopard;
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java
index e01c664fe55..df6073e841a 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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,14 +25,12 @@
 
 package sun.lwawt.macosx;
 
+import com.apple.eawt.Application;
 import java.awt.Image;
 import java.awt.PopupMenu;
 import java.awt.Taskbar.Feature;
 import java.awt.peer.TaskbarPeer;
 
-import apple.laf.JRSUIUtils;
-import com.apple.eawt.Application;
-
 final public class CTaskbarPeer implements TaskbarPeer {
 
     CTaskbarPeer() {}
@@ -42,7 +40,6 @@ public boolean isSupported(Feature feature) {
         switch(feature) {
             case ICON_BADGE_TEXT:
             case ICON_BADGE_NUMBER:
-                return JRSUIUtils.TaskBar.isIconBadgeSupported();
             case ICON_IMAGE:
             case MENU:
             case PROGRESS_VALUE:

From 6fcd8087319f3408d24a0f9ffaa3f538d7ebf43f Mon Sep 17 00:00:00 2001
From: mrserb <14138494+mrserb@users.noreply.github.com>
Date: Tue, 22 Dec 2020 17:02:06 -0800
Subject: [PATCH 2/2] fix the date

---
 src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java       | 2 +-
 .../macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
index 69fdf688013..5b04e5170ac 100644
--- a/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
+++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020, 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
diff --git a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java
index df6073e841a..6b30aaf9f3c 100644
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, 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