From eb065726f2b489c9f0f7d76ea75a2eb4d60347b7 Mon Sep 17 00:00:00 2001
From: Alexey Ivanov <aivanov@openjdk.org>
Date: Tue, 22 Aug 2023 17:14:29 +0000
Subject: [PATCH] 8313408: Use SVG for BoxLayout example

Reviewed-by: serb, tr, prr
---
 .../share/classes/javax/swing/BoxLayout.java  |   6 +-
 .../javax/swing/doc-files/BoxLayout-1.gif     | Bin 1779 -> 0 bytes
 .../javax/swing/doc-files/BoxLayout-1.svg     |  74 ++++++++++++++++++
 3 files changed, 77 insertions(+), 3 deletions(-)
 delete mode 100644 src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.gif
 create mode 100644 src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.svg

diff --git a/src/java.desktop/share/classes/javax/swing/BoxLayout.java b/src/java.desktop/share/classes/javax/swing/BoxLayout.java
index fe11a08bc64..cbc2bbd3092 100644
--- a/src/java.desktop/share/classes/javax/swing/BoxLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/BoxLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, 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
@@ -38,9 +38,9 @@ import java.io.PrintStream;
  * arranged when the frame is resized.
  * <div style="float:right;text-align:center">
  *   <p><b>Example:</b>
- *   <p><img src="doc-files/BoxLayout-1.gif"
+ *   <p><img src="doc-files/BoxLayout-1.svg"
  *      alt="The following text describes this graphic."
- *      width="191" height="201">
+ *      width="160" height="160">
  * </div>
  * <p>
  * Nesting multiple panels with different combinations of horizontal and
diff --git a/src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.gif b/src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.gif
deleted file mode 100644
index 8493ab8ec14bd62e32eb9ee72a022f3c368b0240..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1779
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
V8uqY=O{`)U%h<*`)~XQz06X>qj>Z50

diff --git a/src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.svg b/src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.svg
new file mode 100644
index 00000000000..84235395ae6
--- /dev/null
+++ b/src/java.desktop/share/classes/javax/swing/doc-files/BoxLayout-1.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.  Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
+ by Oracle in the LICENSE file that accompanied this code.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<svg width="160" height="160"
+     version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink">
+    <style><![CDATA[
+        rect {
+            fill: none;
+            stroke: black;
+            stroke-width: 1;
+        }
+        text {
+            font: 16px 'DejaVu Sans', sans-serif;
+            text-anchor: middle;
+            dominant-baseline: middle;
+        }
+        text.left {
+            text-anchor: start;
+            dominant-baseline: auto;
+        }
+    ]]></style>
+
+    <rect x="8" y="8"
+          width="144" height="144"/>
+    <text x="16" y="24" class="left">P1</text>
+    <g id="leftBox">
+        <rect x="16" y="28"
+              width="56" height="116"/>
+
+        <rect x="24" y="36"
+              width="40" height="28"/>
+        <rect x="24" y="72"
+              width="40" height="28"/>
+        <rect x="24" y="108"
+              width="40" height="28"/>
+    </g>
+
+    <text x="44" y="50">C1</text>
+    <text x="44" y="86">C2</text>
+    <text x="44" y="122">C3</text>
+
+    <use xlink:href="#leftBox" x="72" y="0"/>
+    <text x="86" y="24" class="left">P2</text>
+    <text x="116" y="50">C4</text>
+    <text x="116" y="86">C5</text>
+    <text x="116" y="122">C6</text>
+
+</svg>