diff --git a/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java b/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java
index 2fb66ab..42ae55e 100644
--- a/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java
+++ b/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java
@@ -64,10 +64,13 @@ public final class QrCodeGeneratorDemo {
 		ImageIO.write(img, "png", imgFile);             // Write image to file
 		
 		String svg = qr.toSvgString(4);  // Convert to SVG XML code
-		try (Writer out = new OutputStreamWriter(
+		Writer out = new OutputStreamWriter(
 				new FileOutputStream("hello-world-QR.svg"),
-				StandardCharsets.UTF_8)) {
+				StandardCharsets.UTF_8);
+		try {
 			out.write(svg);  // Create/overwrite file and write SVG data
+		} finally {
+			try { out.close(); } catch (IOException e) { }
 		}
 	}
 	
diff --git a/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java b/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java
index 74091e8..dd08f59 100644
--- a/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java
+++ b/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java
@@ -38,10 +38,10 @@ public final class QrCodeGeneratorWorker {
 	
 	public static void main(String[] args) {
 		// Set up input stream and start loop
-		try (Scanner input = new Scanner(System.in, "US-ASCII")) {
-			input.useDelimiter("\r\n|\n|\r");
-			while (processCase(input));
-		}
+		Scanner input = new Scanner(System.in, "US-ASCII");
+		input.useDelimiter("\r\n|\n|\r");
+		while (processCase(input));
+		input.close();
 	}
 	
 	
diff --git a/java/io/nayuki/qrcodegen/QrSegment.java b/java/io/nayuki/qrcodegen/QrSegment.java
index 4d2f55d..f851ff3 100644
--- a/java/io/nayuki/qrcodegen/QrSegment.java
+++ b/java/io/nayuki/qrcodegen/QrSegment.java
@@ -118,7 +118,7 @@ public final class QrSegment {
 		Objects.requireNonNull(text);
 		
 		// Select the most efficient segment encoding automatically
-		List<QrSegment> result = new ArrayList<>();
+		List<QrSegment> result = new ArrayList<QrSegment>();
 		if (text.equals(""));  // Leave result empty
 		else if (NUMERIC_REGEX.matcher(text).matches())
 			result.add(makeNumeric(text));
diff --git a/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java b/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java
index c7e987a..50e358f 100644
--- a/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java
+++ b/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java
@@ -174,7 +174,7 @@ public final class QrSegmentAdvanced {
 	
 	
 	private static List<QrSegment> splitIntoSegments(byte[] data, QrSegment.Mode[] charModes) {
-		List<QrSegment> result = new ArrayList<>();
+		List<QrSegment> result = new ArrayList<QrSegment>();
 		if (data.length == 0)
 			return result;