From 0234f813e6113fee133a2cab77566d1fcb191c8b Mon Sep 17 00:00:00 2001 From: Andrey Turbanov Date: Fri, 6 Jan 2023 08:29:47 +0000 Subject: [PATCH] 8298447: Unnecessary Vector usage in DocPrintJob implementations Reviewed-by: serb --- .../classes/sun/print/PSStreamPrintJob.java | 16 ++++++++-------- .../unix/classes/sun/print/UnixPrintJob.java | 16 ++++++++-------- .../windows/classes/sun/print/Win32PrintJob.java | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java b/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java index 601fb69226d..3a75a3232b5 100644 --- a/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java +++ b/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java @@ -29,7 +29,7 @@ import java.net.URL; import java.io.InputStream; import java.io.IOException; import java.io.Reader; -import java.util.Vector; +import java.util.ArrayList; import javax.print.CancelablePrintJob; import javax.print.Doc; @@ -64,9 +64,9 @@ import java.awt.print.*; public class PSStreamPrintJob implements CancelablePrintJob { - private transient Vector jobListeners; - private transient Vector attrListeners; - private transient Vector listenedAttributeSets; + private transient ArrayList jobListeners; + private transient ArrayList attrListeners; + private transient ArrayList listenedAttributeSets; private PSStreamPrintService service; private boolean fidelity; @@ -115,7 +115,7 @@ public class PSStreamPrintJob implements CancelablePrintJob { return; } if (jobListeners == null) { - jobListeners = new Vector<>(); + jobListeners = new ArrayList<>(); } jobListeners.add(listener); } @@ -189,7 +189,7 @@ public class PSStreamPrintJob implements CancelablePrintJob { PrintJobListener listener; PrintJobEvent event = new PrintJobEvent(this, reason); for (int i = 0; i < jobListeners.size(); i++) { - listener = jobListeners.elementAt(i); + listener = jobListeners.get(i); switch (reason) { case PrintJobEvent.JOB_CANCELED : @@ -228,8 +228,8 @@ public class PSStreamPrintJob implements CancelablePrintJob { return; } if (attrListeners == null) { - attrListeners = new Vector<>(); - listenedAttributeSets = new Vector<>(); + attrListeners = new ArrayList<>(); + listenedAttributeSets = new ArrayList<>(); } attrListeners.add(listener); if (attributes == null) { diff --git a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java index 3f5a67aae10..913c69e40ee 100644 --- a/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java +++ b/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java @@ -42,7 +42,7 @@ import java.io.PrintWriter; import java.io.Reader; import java.io.StringWriter; import java.nio.file.Files; -import java.util.Vector; +import java.util.ArrayList; import javax.print.CancelablePrintJob; import javax.print.Doc; @@ -90,9 +90,9 @@ import java.awt.print.PrinterException; public class UnixPrintJob implements CancelablePrintJob { private static String debugPrefix = "UnixPrintJob>> "; - private transient Vector jobListeners; - private transient Vector attrListeners; - private transient Vector listenedAttributeSets; + private transient ArrayList jobListeners; + private transient ArrayList attrListeners; + private transient ArrayList listenedAttributeSets; private PrintService service; private boolean fidelity; @@ -155,7 +155,7 @@ public class UnixPrintJob implements CancelablePrintJob { return; } if (jobListeners == null) { - jobListeners = new Vector<>(); + jobListeners = new ArrayList<>(); } jobListeners.add(listener); } @@ -243,7 +243,7 @@ public class UnixPrintJob implements CancelablePrintJob { PrintJobListener listener; PrintJobEvent event = new PrintJobEvent(this, reason); for (int i = 0; i < jobListeners.size(); i++) { - listener = jobListeners.elementAt(i); + listener = jobListeners.get(i); switch (reason) { case PrintJobEvent.JOB_CANCELED : @@ -278,8 +278,8 @@ public class UnixPrintJob implements CancelablePrintJob { return; } if (attrListeners == null) { - attrListeners = new Vector<>(); - listenedAttributeSets = new Vector<>(); + attrListeners = new ArrayList<>(); + listenedAttributeSets = new ArrayList<>(); } attrListeners.add(listener); if (attributes == null) { diff --git a/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java b/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java index 44759358f25..53fe183e861 100644 --- a/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java +++ b/src/java.desktop/windows/classes/sun/print/Win32PrintJob.java @@ -35,7 +35,7 @@ import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; -import java.util.Vector; +import java.util.ArrayList; import javax.print.CancelablePrintJob; import javax.print.Doc; @@ -75,9 +75,9 @@ import java.awt.print.*; public class Win32PrintJob implements CancelablePrintJob { - private transient Vector jobListeners; - private transient Vector attrListeners; - private transient Vector listenedAttributeSets; + private transient ArrayList jobListeners; + private transient ArrayList attrListeners; + private transient ArrayList listenedAttributeSets; private Win32PrintService service; private boolean fidelity; @@ -135,7 +135,7 @@ public class Win32PrintJob implements CancelablePrintJob { return; } if (jobListeners == null) { - jobListeners = new Vector<>(); + jobListeners = new ArrayList<>(); } jobListeners.add(listener); } @@ -223,7 +223,7 @@ public class Win32PrintJob implements CancelablePrintJob { PrintJobListener listener; PrintJobEvent event = new PrintJobEvent(this, reason); for (int i = 0; i < jobListeners.size(); i++) { - listener = jobListeners.elementAt(i); + listener = jobListeners.get(i); switch (reason) { case PrintJobEvent.JOB_COMPLETE : @@ -262,8 +262,8 @@ public class Win32PrintJob implements CancelablePrintJob { return; } if (attrListeners == null) { - attrListeners = new Vector<>(); - listenedAttributeSets = new Vector<>(); + attrListeners = new ArrayList<>(); + listenedAttributeSets = new ArrayList<>(); } attrListeners.add(listener); if (attributes == null) {