Reduce minimum required JDK from 21 to 11

Valkryst · Jan 6, 2024 · 869ef1c · 869ef1c
1 parent c156fdc
commit 869ef1c
Show file tree

Hide file tree

Showing 14 changed files with 84 additions and 73 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -44,7 +44,7 @@ jobs:
     - uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: 21
+        java-version: 11
         java-package: jdk
         architecture: x64
 

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 21
+          java-version: 11
           java-package: jdk
           architecture: x64
 

diff --git a/pom.xml b/pom.xml
@@ -11,9 +11,9 @@
     <name>VTerminal</name>
 
     <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
-        <maven.compiler.release>21</maven.compiler.release>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>11</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>

diff --git a/src/example/gui/view/EditorPaneView.java b/src/example/gui/view/EditorPaneView.java
@@ -12,40 +12,36 @@ public EditorPaneView() {
 		var component = new VEditorPane();
 		component.setContentType("text/html");
 		component.setEditable(true);
-		component.setText("""
-				<html>
-					<head>
-						<style type="text/css">
-							i {
-								color: red;
-							}
-						</style>
-					</head>
-					<body>
-						<p>This <i>VEditorPane</i> is editable and <b>enabled</b>.</p>
-					</body>
-				</html>
-				""");
+		component.setText("<html>\n" +
+                          "	<head>\n" +
+                          "		<style type=\"text/css\">\n" +
+                          "			i {\n" +
+                          "				color: red;\n" +
+                          "			}\n" +
+                          "		</style>\n" +
+                          "	</head>\n" +
+                          "	<body>\n" +
+                          "		<p>This <i>VEditorPane</i> is editable and <b>enabled</b>.</p>\n" +
+                          "	</body>\n" +
+                          "</html>\n");
 		this.add(component, BorderLayout.NORTH);
 
 		component = new VEditorPane();
 		component.setContentType("text/html");
 		component.setEditable(true);
 		component.setEnabled(false);
-		component.setText("""
-				<html>
-					<head>
-						<style type="text/css">
-							i {
-								color: red;
-							}
-						</style>
-					</head>
-					<body>
-						<p>This <i>VEditorPane</i> is editable and <b>disabled</b>.</p>
-					</body>
-				</html>
-				""");
+		component.setText("<html>\n" +
+                          "	<head>\n" +
+                          "		<style type=\"text/css\">\n" +
+                          "			i {\n" +
+                          "				color: red;\n" +
+                          "			}\n" +
+                          "		</style>\n" +
+                          "	</head>\n" +
+                          "	<body>\n" +
+                          "		<p>This <i>VEditorPane</i> is editable and <b>disabled</b>.</p>\n" +
+                          "	</body>\n" +
+                          "</html>\n");
 		this.add(component, BorderLayout.SOUTH);
 	}
 

diff --git a/src/example/repainting_a_screen/ExampleB.java b/src/example/repainting_a_screen/ExampleB.java
@@ -50,13 +50,13 @@ private static int getRandomCodePoint() {
 
 	private static Color getRandomColor() {
 		switch (ThreadLocalRandom.current().nextInt(0, 6)) {
-			case 0 -> { return Color.MAGENTA; }
-			case 1 -> { return Color.GREEN; }
-			case 2 -> { return Color.YELLOW; }
-			case 3 -> { return Color.BLUE; }
-			case 4 -> { return Color.RED; }
-			case 5 -> { return Color.ORANGE; }
-			default -> { return Color.WHITE; }
+			case 0: { return Color.MAGENTA; }
+			case 1: { return Color.GREEN; }
+			case 2: { return Color.YELLOW; }
+			case 3: { return Color.BLUE; }
+			case 4: { return Color.RED; }
+			case 5: { return Color.ORANGE; }
+			default: { return Color.WHITE; }
 		}
 	}
 }
diff --git a/src/example/resetting_a_screen/ExampleC.java b/src/example/resetting_a_screen/ExampleC.java
@@ -39,13 +39,13 @@ public static void main(final String[] args) {
 
 	private static Color getRandomColor() {
 		switch (ThreadLocalRandom.current().nextInt(0, 6)) {
-			case 0 -> { return Color.MAGENTA; }
-			case 1 -> { return Color.GREEN; }
-			case 2 -> { return Color.YELLOW; }
-			case 3 -> { return Color.BLUE; }
-			case 4 -> { return Color.RED; }
-			case 5 -> { return Color.ORANGE; }
-			default -> { return Color.WHITE; }
+			case 0: { return Color.MAGENTA; }
+			case 1: { return Color.GREEN; }
+			case 2: { return Color.YELLOW; }
+			case 3: { return Color.BLUE; }
+			case 4: { return Color.RED; }
+			case 5: { return Color.ORANGE; }
+			default: { return Color.WHITE; }
 		}
 	}
 }
diff --git a/src/example/resetting_a_screen/ExampleD.java b/src/example/resetting_a_screen/ExampleD.java
@@ -44,13 +44,13 @@ private static int getRandomCodePoint() {
 
 	private static Color getRandomColor() {
 		switch (ThreadLocalRandom.current().nextInt(0, 6)) {
-			case 0 -> { return Color.MAGENTA; }
-			case 1 -> { return Color.GREEN; }
-			case 2 -> { return Color.YELLOW; }
-			case 3 -> { return Color.BLUE; }
-			case 4 -> { return Color.RED; }
-			case 5 -> { return Color.ORANGE; }
-			default -> { return Color.WHITE; }
+			case 0: { return Color.MAGENTA; }
+			case 1: { return Color.GREEN; }
+			case 2: { return Color.YELLOW; }
+			case 3: { return Color.BLUE; }
+			case 4: { return Color.RED; }
+			case 5: { return Color.ORANGE; }
+			default: { return Color.WHITE; }
 		}
 	}
 }
diff --git a/src/example/resetting_a_screen/ExampleF.java b/src/example/resetting_a_screen/ExampleF.java
@@ -48,13 +48,13 @@ private static int getRandomCodePoint() {
 
 	private static Color getRandomColor() {
 		switch (ThreadLocalRandom.current().nextInt(0, 6)) {
-			case 0 -> { return Color.MAGENTA; }
-			case 1 -> { return Color.GREEN; }
-			case 2 -> { return Color.YELLOW; }
-			case 3 -> { return Color.BLUE; }
-			case 4 -> { return Color.RED; }
-			case 5 -> { return Color.ORANGE; }
-			default -> { return Color.WHITE; }
+			case 0: { return Color.MAGENTA; }
+			case 1: { return Color.GREEN; }
+			case 2: { return Color.YELLOW; }
+			case 3: { return Color.BLUE; }
+			case 4: { return Color.RED; }
+			case 5: { return Color.ORANGE; }
+			default: { return Color.WHITE; }
 		}
 	}
 }
diff --git a/src/main/java/com/valkryst/VTerminal/plaf/VBasicArrowButton.java b/src/main/java/com/valkryst/VTerminal/plaf/VBasicArrowButton.java
@@ -23,31 +23,35 @@ public void paint(final Graphics graphics) {
 
 		graphics.setColor(isPressed ? super.getForeground() : super.getBackground());
 		switch (super.getDirection()) {
-			case SwingConstants.NORTH -> {
+			case SwingConstants.NORTH: {
 				graphics.fillRect(0, 0, width, height - 2);
 				graphics.setColor(super.getForeground());
 				graphics.drawLine(0, 0, 0, height);
 				graphics.drawLine(1, height - 2, width - 1, height - 2);
+				break;
 			}
-			case SwingConstants.SOUTH -> {
+			case SwingConstants.SOUTH: {
 				graphics.fillRect(0, 2, width, height - 2);
 				graphics.setColor(super.getForeground());
 				graphics.drawLine(0, 0, 0, height);
 				graphics.drawLine(1, 1, width - 1, 1);
 				graphics.drawLine(1, height - 1, width - 1, height - 1);
+				break;
 			}
-			case SwingConstants.WEST -> {
+			case SwingConstants.WEST: {
 				graphics.fillRect(0, 0, width - 2, height);
 				graphics.setColor(super.getForeground());
 				graphics.drawLine(0, 0, width, 0);
 				graphics.drawLine(width - 2, 0, width - 2, height - 1);
+				break;
 			}
-			case SwingConstants.EAST -> {
+			case SwingConstants.EAST: {
 				graphics.fillRect(2, 0, width, height);
 				graphics.setColor(super.getForeground());
 				graphics.drawLine(0, 0, width, 0);
 				graphics.drawLine(1, 0, 1, height - 1);
 				graphics.drawLine(width - 1, 0, width - 1, height - 1);
+				break;
 			}
 		}
 
@@ -87,10 +91,11 @@ public Dimension getPreferredSize() {
 		final var laf = VTerminalLookAndFeel.getInstance();
 
 		switch (super.getDirection()) {
-			case SwingConstants.EAST, SwingConstants.WEST -> {
+			case SwingConstants.EAST:
+			case SwingConstants.WEST: {
 				return new Dimension(laf.getTileWidth() * 2, laf.getTileHeight());
 			}
-			default -> {
+			default: {
 				return new Dimension(laf.getTileWidth(), laf.getTileHeight());
 			}
 		}

diff --git a/src/main/java/com/valkryst/VTerminal/plaf/VButtonUI.java b/src/main/java/com/valkryst/VTerminal/plaf/VButtonUI.java
@@ -26,7 +26,8 @@ public void keyReleased(final KeyEvent e) {
 				}
 
 				switch (e.getKeyCode()) {
-					case KeyEvent.VK_ENTER, KeyEvent.VK_SPACE -> {
+					case KeyEvent.VK_ENTER:
+					case KeyEvent.VK_SPACE: {
 						((JButton) component).doClick();
 					}
 				}

diff --git a/src/main/java/com/valkryst/VTerminal/plaf/VCheckBoxUI.java b/src/main/java/com/valkryst/VTerminal/plaf/VCheckBoxUI.java
@@ -25,9 +25,11 @@ public void keyReleased(final KeyEvent e) {
 			}
 
 			switch (e.getKeyCode()) {
-				case KeyEvent.VK_ENTER, KeyEvent.VK_SPACE -> {
+				case KeyEvent.VK_ENTER:
+				case KeyEvent.VK_SPACE: {
 					final var checkBox = (JCheckBox) component;
 					checkBox.setSelected(!checkBox.isSelected());
+					break;
 				}
 			}
 			}

diff --git a/src/main/java/com/valkryst/VTerminal/plaf/VPanelUI.java b/src/main/java/com/valkryst/VTerminal/plaf/VPanelUI.java
@@ -39,7 +39,8 @@ public Dimension getMinimumSize(final JComponent component) {
 
 	@Override
 	public Dimension getPreferredSize(final JComponent component) {
-		if (component instanceof final VPanel panel) {
+		if (component instanceof VPanel) {
+			final var panel = (VPanel) component;
 			final var laf = VTerminalLookAndFeel.getInstance();
 			final var height = laf.getTileHeight() * panel.getHeightInTiles();
 			final var width = laf.getTileWidth() * panel.getWidthInTiles();

diff --git a/src/main/java/com/valkryst/VTerminal/plaf/VRadioButtonUI.java b/src/main/java/com/valkryst/VTerminal/plaf/VRadioButtonUI.java
@@ -25,9 +25,11 @@ public void keyReleased(final KeyEvent e) {
 			}
 
 			switch (e.getKeyCode()) {
-				case KeyEvent.VK_ENTER, KeyEvent.VK_SPACE -> {
+				case KeyEvent.VK_ENTER:
+				case KeyEvent.VK_SPACE: {
 					final var checkBox = (JRadioButton) component;
 					checkBox.setSelected(!checkBox.isSelected());
+					break;
 				}
 			}
 			}

diff --git a/src/main/java/com/valkryst/VTerminal/plaf/VScrollPaneUI.java b/src/main/java/com/valkryst/VTerminal/plaf/VScrollPaneUI.java
@@ -31,11 +31,15 @@ public void keyPressed(final KeyEvent e) {
 			}
 
 			switch (e.getKeyCode()) {
-				case KeyEvent.VK_LEFT, KeyEvent.VK_HOME -> {
+				case KeyEvent.VK_LEFT:
+				case KeyEvent.VK_HOME: {
 					horizontalScrollBar.setValue(horizontalScrollBar.getValue() - horizontalScrollBar.getUnitIncrement());
+					break;
 				}
-				case KeyEvent.VK_RIGHT, KeyEvent.VK_END -> {
+				case KeyEvent.VK_RIGHT:
+				case KeyEvent.VK_END: {
 					horizontalScrollBar.setValue(horizontalScrollBar.getValue() + horizontalScrollBar.getUnitIncrement());
+					break;
 				}
 			}
 			}