joerg/graphics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do not return a printer if printer name does not match

Browse source
This commit is contained in:
Jörg Prante 2021-11-26 17:46:17 +01:00
parent 616e607b55
commit 12fc41639a
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
graphics-pdfbox-print/src/main/java/org/xbib/graphics/pdfbox/print/PrintUtility.java
View file

@ -27,9 +27,6 @@ import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/**
*
*/
public class PrintUtility { public class PrintUtility {
public static void print(InputStream inputStream, DocFlavor docFlavor) public static void print(InputStream inputStream, DocFlavor docFlavor)
@ -96,22 +93,20 @@ public class PrintUtility {
job.print(); job.print();
} }
public static Printer getDefaultPrinter() {
return createPrinter(PrintServiceLookup.lookupDefaultPrintService());
}
public static Printer getPrinter(String printerName, DocFlavor docFlavor) { public static Printer getPrinter(String printerName, DocFlavor docFlavor) {
Printer printer = null;
if (printerName != null) { if (printerName != null) {
List<Printer> printers = findPrinters(docFlavor); List<Printer> printers = findPrinters(docFlavor);
for (Printer p : printers) { for (Printer p : printers) {
if (printerName.equalsIgnoreCase(p.getName())) { if (printerName.equalsIgnoreCase(p.getName())) {
printer = p; return p;
break;
} }
} }
} }
if (printer == null) { return null;
PrintService service = PrintServiceLookup.lookupDefaultPrintService();
printer = createPrinter(service);
}
return printer;
} }
public static Printer findDefaultPrinter(DocFlavor docFlavor) { public static Printer findDefaultPrinter(DocFlavor docFlavor) {
@ -141,7 +136,6 @@ public class PrintUtility {
if (attr != null) { if (attr != null) {
printer.setModel(attr.toString()); printer.setModel(attr.toString());
} }
//attr = service.getAttribute( PrinterIsAcceptingJobs.class );
printer.setStatus(Printer.STATUS_ACCEPTING_JOBS); printer.setStatus(Printer.STATUS_ACCEPTING_JOBS);
attr = service.getAttribute(PrinterInfo.class); attr = service.getAttribute(PrinterInfo.class);
if (attr != null) { if (attr != null) {