repair merge, must be clean as it was before

Author: GoeLin

src/java.desktop/share/classes/javax/swing/JViewport.java

@@ -603,15 +603,11 @@ public final Insets getInsets(Insets insets) {
 
 
     private Graphics getBackingStoreGraphics(Graphics g) {
-        if (!SwingUtilities2.isPrinting(g)) {
-            Graphics bsg = backingStoreImage.getGraphics();
-            bsg.setColor(g.getColor());
-            bsg.setFont(g.getFont());
-            bsg.setClip(g.getClipBounds());
-            return bsg;
-        } else {
-            return g;
-        }
+        Graphics bsg = backingStoreImage.getGraphics();
+        bsg.setColor(g.getColor());
+        bsg.setFont(g.getFont());
+        bsg.setClip(g.getClipBounds());
+        return bsg;
     }
 
 

src/java.desktop/share/classes/sun/print/PathGraphics.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2024, 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

src/java.desktop/share/classes/sun/swing/SwingUtilities2.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2024, 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
@@ -1317,7 +1317,7 @@ public int hashCode() {
      * returns true if the Graphics is print Graphics
      * false otherwise
      */
-    public static boolean isPrinting(Graphics g) {
+    static boolean isPrinting(Graphics g) {
         return (g instanceof PrinterGraphics || g instanceof PrintGraphics);
     }