< prev index next >
src/java.desktop/unix/classes/sun/print/UnixPrintService.java
Print this page
rev 59106 : imported patch client
@@ -220,35 +220,10 @@
name = new PrinterName(printer, null);
}
return name;
}
- private PrinterIsAcceptingJobs getPrinterIsAcceptingJobsSysV() {
- String command = "/usr/bin/lpstat -a " + printer;
- String[] results= PrintServiceLookupProvider.execCmd(command);
-
- if (results != null && results.length > 0) {
- if (results[0].startsWith(printer + " accepting requests")) {
- return PrinterIsAcceptingJobs.ACCEPTING_JOBS;
- }
- else if (results[0].startsWith(printer)) {
- /* As well as "myprinter accepting requests", look for
- * "myprinter@somehost accepting requests".
- */
- int index = printer.length();
- String str = results[0];
- if (str.length() > index &&
- str.charAt(index) == '@' &&
- str.indexOf(" accepting requests", index) > 0 &&
- str.indexOf(" not accepting requests", index) == -1) {
- return PrinterIsAcceptingJobs.ACCEPTING_JOBS;
- }
- }
- }
- return PrinterIsAcceptingJobs.NOT_ACCEPTING_JOBS ;
- }
-
private PrinterIsAcceptingJobs getPrinterIsAcceptingJobsBSD() {
if (PrintServiceLookupProvider.cmdIndex ==
PrintServiceLookupProvider.UNINITIALIZED) {
PrintServiceLookupProvider.cmdIndex =
@@ -322,13 +297,11 @@
return PrinterIsAcceptingJobs.NOT_ACCEPTING_JOBS;
}
private PrinterIsAcceptingJobs getPrinterIsAcceptingJobs() {
- if (PrintServiceLookupProvider.isSysV()) {
- return getPrinterIsAcceptingJobsSysV();
- } else if (PrintServiceLookupProvider.isBSD()) {
+ if (PrintServiceLookupProvider.isBSD()) {
return getPrinterIsAcceptingJobsBSD();
} else if (PrintServiceLookupProvider.isAIX()) {
return getPrinterIsAcceptingJobsAIX();
} else {
return PrinterIsAcceptingJobs.ACCEPTING_JOBS;
@@ -351,18 +324,10 @@
} else {
return null;
}
}
- private QueuedJobCount getQueuedJobCountSysV() {
- String command = "/usr/bin/lpstat -R " + printer;
- String[] results= PrintServiceLookupProvider.execCmd(command);
- int qlen = (results == null) ? 0 : results.length;
-
- return new QueuedJobCount(qlen);
- }
-
private QueuedJobCount getQueuedJobCountBSD() {
if (PrintServiceLookupProvider.cmdIndex ==
PrintServiceLookupProvider.UNINITIALIZED) {
PrintServiceLookupProvider.cmdIndex =
@@ -415,28 +380,19 @@
}
return new QueuedJobCount(qlen);
}
private QueuedJobCount getQueuedJobCount() {
- if (PrintServiceLookupProvider.isSysV()) {
- return getQueuedJobCountSysV();
- } else if (PrintServiceLookupProvider.isBSD()) {
+ if (PrintServiceLookupProvider.isBSD()) {
return getQueuedJobCountBSD();
} else if (PrintServiceLookupProvider.isAIX()) {
return getQueuedJobCountAIX();
} else {
return new QueuedJobCount(0);
}
}
- private PrintServiceAttributeSet getSysVServiceAttributes() {
- PrintServiceAttributeSet attrs = new HashPrintServiceAttributeSet();
- attrs.add(getQueuedJobCountSysV());
- attrs.add(getPrinterIsAcceptingJobsSysV());
- return attrs;
- }
-
private PrintServiceAttributeSet getBSDServiceAttributes() {
PrintServiceAttributeSet attrs = new HashPrintServiceAttributeSet();
attrs.add(getQueuedJobCountBSD());
attrs.add(getPrinterIsAcceptingJobsBSD());
return attrs;
@@ -470,13 +426,11 @@
}
return new UnixPrintJob(this);
}
private PrintServiceAttributeSet getDynamicAttributes() {
- if (PrintServiceLookupProvider.isSysV()) {
- return getSysVServiceAttributes();
- } else if (PrintServiceLookupProvider.isAIX()) {
+ if (PrintServiceLookupProvider.isAIX()) {
return getAIXServiceAttributes();
} else {
return getBSDServiceAttributes();
}
}
< prev index next >