From d52fa4733e063d1f71b61fcd191585537b2d2588 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sat, 13 Jul 2024 01:49:21 +0200 Subject: [PATCH] Add alternative paper size names --- .../openrocket/swing/gui/print/PaperSize.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/PaperSize.java b/swing/src/main/java/info/openrocket/swing/gui/print/PaperSize.java index 0b45bea7f..c69d8c69a 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/PaperSize.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/PaperSize.java @@ -3,6 +3,7 @@ package info.openrocket.swing.gui.print; import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; +import java.util.List; import java.util.Locale; import org.slf4j.Logger; @@ -19,16 +20,18 @@ public enum PaperSize { A5("A5", PageSize.A5), ANSI_D("ANSI D", new Rectangle(22 * 72, 34 * 72)), ANSI_C("ANSI C", new Rectangle(17 * 72, 22 * 72)), - TABLOID("Tabloid (ANSI B)", PageSize.TABLOID), + TABLOID("Tabloid (ANSI B)", PageSize.TABLOID, "Tabloid", "ANSI B"), LEGAL("Legal", PageSize.LEGAL), - LETTER("Letter (ANSI A)", PageSize.LETTER); + LETTER("Letter (ANSI A)", PageSize.LETTER, "Letter", "ANSI A"); private final String name; + private final List alternativeNames; private final Rectangle size; - - private PaperSize(String name, Rectangle size) { + + PaperSize(String name, Rectangle size, String... alternativeNames) { this.name = name; this.size = size; + this.alternativeNames = List.of(alternativeNames); } public Rectangle getSize() { @@ -163,6 +166,11 @@ public enum PaperSize { if (p.name.equalsIgnoreCase(size)) { return p; } + for (String alt : p.alternativeNames) { + if (alt.equalsIgnoreCase(size)) { + return p; + } + } } return null; }