stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8055705: Rename UnixPrintServiceLookup and Win32PrintServiceLookup as a platform neutral class name

Browse Source 
Reviewed-by: jgodinez, bae
This commit is contained in:
Phil Race 2014-10-10 09:03:28 -07:00
parent d30a6e88b8
commit 24155c8965
13 changed files with 52 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/java.desktop/share/classes/META-INF/services/javax.print.PrintServiceLookup Normal file
View File

@ -0,0 +1,2 @@
# Provider for Java Print Service
sun.print.PrintServiceLookupProvider

0
jdk/src/java.desktop/unix/classes/META-INF/services/javax.print.StreamPrintServiceFactory → jdk/src/java.desktop/share/classes/META-INF/services/javax.print.StreamPrintServiceFactory
View File

2
jdk/src/java.desktop/unix/classes/META-INF/services/javax.print.PrintServiceLookup
View File

@ -1,2 +0,0 @@
# Provider for Java Print Service
sun.print.UnixPrintServiceLookup

4
jdk/src/java.desktop/unix/classes/sun/print/CUPSPrinter.java
View File

@ -324,8 +324,8 @@ public class CUPSPrinter {
* reported, exec lpstat -d which has all the Apple
* special behaviour for this built in.
*/
if (UnixPrintServiceLookup.isMac()) {
printerInfo[0] = UnixPrintServiceLookup.
if (PrintServiceLookupProvider.isMac()) {
printerInfo[0] = PrintServiceLookupProvider.
getDefaultPrinterNameSysV();
printerInfo[1] = null;
return printerInfo.clone();

4
jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java
View File

@ -1045,7 +1045,7 @@ public class IPPPrintService implements PrintService, SunPrinterJobService {
setting like collation. Therefore, we temporarily exclude
Linux.
*/
if (!UnixPrintServiceLookup.isLinux()) {
if (!PrintServiceLookupProvider.isLinux()) {
catList.add(SheetCollate.class);
}
}
@ -1637,7 +1637,7 @@ public class IPPPrintService implements PrintService, SunPrinterJobService {
* Mac is using printer-info IPP attribute for its human-readable printer
* name and is also the identifier used in NSPrintInfo:setPrinter.
*/
if (UnixPrintServiceLookup.isMac()) {
if (PrintServiceLookupProvider.isMac()) {
PrintServiceAttributeSet psaSet = this.getAttributes();
if (psaSet != null) {
PrinterInfo pName = (PrinterInfo)psaSet.get(PrinterInfo.class);

6
jdk/src/java.desktop/unix/classes/sun/print/UnixPrintServiceLookup.java → jdk/src/java.desktop/unix/classes/sun/print/PrintServiceLookupProvider.java
View File

@ -58,7 +58,7 @@ import java.nio.file.Files;
* Remind: This class uses solaris commands. We also need a linux
* version
*/
public class UnixPrintServiceLookup extends PrintServiceLookup
public class PrintServiceLookupProvider extends PrintServiceLookup
implements BackgroundServiceLookup, Runnable {
/* Remind: the current implementation is static, as its assumed
@ -70,7 +70,7 @@ public class UnixPrintServiceLookup extends PrintServiceLookup
private PrintService defaultPrintService;
private PrintService[] printServices; /* includes the default printer */
private Vector<BackgroundLookupListener> lookupListeners = null;
private static String debugPrefix = "UnixPrintServiceLookup>> ";
private static String debugPrefix = "PrintServiceLookupProvider>> ";
private static boolean pollServices = true;
private static final int DEFAULT_MINREFRESH = 120; // 2 minutes
private static int minRefreshTime = DEFAULT_MINREFRESH;
@ -208,7 +208,7 @@ public class UnixPrintServiceLookup extends PrintServiceLookup
}
public UnixPrintServiceLookup() {
public PrintServiceLookupProvider() {
// start the printer listener thread
if (pollServices) {
PrinterChangeListener thr = new PrinterChangeListener();

4
jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java
View File

@ -122,7 +122,7 @@ public class UnixPrintJob implements CancelablePrintJob {
UnixPrintJob(PrintService service) {
this.service = service;
mDestination = service.getName();
if (UnixPrintServiceLookup.isMac()) {
if (PrintServiceLookupProvider.isMac()) {
mDestination = ((IPPPrintService)service).getDest();
}
mDestType = UnixPrintJob.DESTPRINTER;
@ -880,7 +880,7 @@ public class UnixPrintJob implements CancelablePrintJob {
pFlags |= NOSHEET;
ncomps+=1;
}
if (UnixPrintServiceLookup.osname.equals("SunOS")) {
if (PrintServiceLookupProvider.osname.equals("SunOS")) {
ncomps+=1; // lp uses 1 more arg than lpr (make a copy)
execCmd = new String[ncomps];
execCmd[n++] = "/usr/bin/lp";

58
jdk/src/java.desktop/unix/classes/sun/print/UnixPrintService.java
View File

@ -220,7 +220,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater,
private PrinterIsAcceptingJobs getPrinterIsAcceptingJobsSysV() {
String command = "/usr/bin/lpstat -a " + printer;
String results[]= UnixPrintServiceLookup.execCmd(command);
String results[]= PrintServiceLookupProvider.execCmd(command);
if (results != null && results.length > 0) {
if (results[0].startsWith(printer + " accepting requests")) {
@ -244,20 +244,20 @@ public class UnixPrintService implements PrintService, AttributeUpdater,
}
private PrinterIsAcceptingJobs getPrinterIsAcceptingJobsBSD() {
if (UnixPrintServiceLookup.cmdIndex ==
UnixPrintServiceLookup.UNINITIALIZED) {
if (PrintServiceLookupProvider.cmdIndex ==
PrintServiceLookupProvider.UNINITIALIZED) {
UnixPrintServiceLookup.cmdIndex =
UnixPrintServiceLookup.getBSDCommandIndex();
PrintServiceLookupProvider.cmdIndex =
PrintServiceLookupProvider.getBSDCommandIndex();
}
String command = "/usr/sbin/lpc status " + printer
+ lpcStatusCom[UnixPrintServiceLookup.cmdIndex];
String results[]= UnixPrintServiceLookup.execCmd(command);
+ lpcStatusCom[PrintServiceLookupProvider.cmdIndex];
String results[]= PrintServiceLookupProvider.execCmd(command);
if (results != null && results.length > 0) {
if (UnixPrintServiceLookup.cmdIndex ==
UnixPrintServiceLookup.BSD_LPD_NG) {
if (PrintServiceLookupProvider.cmdIndex ==
PrintServiceLookupProvider.BSD_LPD_NG) {
if (results[0].startsWith("enabled enabled")) {
return PrinterIsAcceptingJobs.ACCEPTING_JOBS ;
}
@ -276,7 +276,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater,
// Filter the list of possible AIX Printers and remove header lines
// and extra lines which have been added for remote printers.
// 'protected' because this method is also used from UnixPrintServiceLookup.
// 'protected' because this method is also used from PrintServiceLookupProvider.
protected static String[] filterPrinterNamesAIX(String[] posPrinters) {
ArrayList<String> printers = new ArrayList<>();
String [] splitPart;
@ -301,7 +301,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater,
private PrinterIsAcceptingJobs getPrinterIsAcceptingJobsAIX() {
// On AIX there should not be a blank after '-a'.
String command = "/usr/bin/lpstat -a" + printer;
String results[]= UnixPrintServiceLookup.execCmd(command);
String results[]= PrintServiceLookupProvider.execCmd(command);
// Remove headers and bogus entries added by remote printers.
results = filterPrinterNamesAIX(results);
@ -320,11 +320,11 @@ public class UnixPrintService implements PrintService, AttributeUpdater,
}
private PrinterIsAcceptingJobs getPrinterIsAcceptingJobs() {
if (UnixPrintServiceLookup.isSysV()) {
if (PrintServiceLookupProvider.isSysV()) {
return getPrinterIsAcceptingJobsSysV();
} else if (UnixPrintServiceLookup.isBSD()) {
} else if (PrintServiceLookupProvider.isBSD()) {
return getPrinterIsAcceptingJobsBSD();
} else if (UnixPrintServiceLookup.isAIX()) {
} else if (PrintServiceLookupProvider.isAIX()) {
return getPrinterIsAcceptingJobsAIX();
} else {
return PrinterIsAcceptingJobs.ACCEPTING_JOBS;
@ -351,29 +351,29 @@ public class UnixPrintService implements PrintService, AttributeUpdater,
private QueuedJobCount getQueuedJobCountSysV() {
String command = "/usr/bin/lpstat -R " + printer;
String results[]= UnixPrintServiceLookup.execCmd(command);
String results[]= PrintServiceLookupProvider.execCmd(command);
int qlen = (results == null) ? 0 : results.length;
return new QueuedJobCount(qlen);
}
private QueuedJobCount getQueuedJobCountBSD() {
if (UnixPrintServiceLookup.cmdIndex ==
UnixPrintServiceLookup.UNINITIALIZED) {
if (PrintServiceLookupProvider.cmdIndex ==
PrintServiceLookupProvider.UNINITIALIZED) {
UnixPrintServiceLookup.cmdIndex =
UnixPrintServiceLookup.getBSDCommandIndex();
PrintServiceLookupProvider.cmdIndex =
PrintServiceLookupProvider.getBSDCommandIndex();
}
int qlen = 0;
String command = "/usr/sbin/lpc status " + printer
+ lpcQueueCom[UnixPrintServiceLookup.cmdIndex];
String results[] = UnixPrintServiceLookup.execCmd(command);
+ lpcQueueCom[PrintServiceLookupProvider.cmdIndex];
String results[] = PrintServiceLookupProvider.execCmd(command);
if (results != null && results.length > 0) {
String queued;
if (UnixPrintServiceLookup.cmdIndex ==
UnixPrintServiceLookup.BSD_LPD_NG) {
if (PrintServiceLookupProvider.cmdIndex ==
PrintServiceLookupProvider.BSD_LPD_NG) {
queued = results[0];
} else {
queued = results[3].trim();
@ -396,7 +396,7 @@ public class UnixPrintService implements PrintService, AttributeUpdater,
private QueuedJobCount getQueuedJobCountAIX() {
// On AIX there should not be a blank after '-a'.
String command = "/usr/bin/lpstat -a" + printer;
String results[]= UnixPrintServiceLookup.execCmd(command);
String results[]= PrintServiceLookupProvider.execCmd(command);
// Remove headers and bogus entries added by remote printers.
results = filterPrinterNamesAIX(results);
@ -413,11 +413,11 @@ public class UnixPrintService implements PrintService, AttributeUpdater,
}
private QueuedJobCount getQueuedJobCount() {
if (UnixPrintServiceLookup.isSysV()) {
if (PrintServiceLookupProvider.isSysV()) {
return getQueuedJobCountSysV();
} else if (UnixPrintServiceLookup.isBSD()) {
} else if (PrintServiceLookupProvider.isBSD()) {
return getQueuedJobCountBSD();
} else if (UnixPrintServiceLookup.isAIX()) {
} else if (PrintServiceLookupProvider.isAIX()) {
return getQueuedJobCountAIX();
} else {
return new QueuedJobCount(0);
@ -468,9 +468,9 @@ public class UnixPrintService implements PrintService, AttributeUpdater,
}
private PrintServiceAttributeSet getDynamicAttributes() {
if (UnixPrintServiceLookup.isSysV()) {
if (PrintServiceLookupProvider.isSysV()) {
return getSysVServiceAttributes();
} else if (UnixPrintServiceLookup.isAIX()) {
} else if (PrintServiceLookupProvider.isAIX()) {
return getAIXServiceAttributes();
} else {
return getBSDServiceAttributes();

2
jdk/src/java.desktop/windows/classes/META-INF/services/javax.print.PrintServiceLookup
View File

@ -1,2 +0,0 @@
# Provider for Java Print Service
sun.print.Win32PrintServiceLookup

2
jdk/src/java.desktop/windows/classes/META-INF/services/javax.print.StreamPrintServiceFactory
View File

@ -1,2 +0,0 @@
# Providers for Java 2D/JPS Stream print services.
sun.print.PSStreamPrinterFactory

6
jdk/src/java.desktop/windows/classes/sun/awt/windows/WPrinterJob.java
View File

@ -93,7 +93,7 @@ import sun.print.SunAlternateMedia;
import sun.print.SunPageSelection;
import sun.print.Win32MediaTray;
import sun.print.Win32PrintService;
import sun.print.Win32PrintServiceLookup;
import sun.print.PrintServiceLookupProvider;
import sun.print.ServiceDialog;
import sun.print.DialogOwner;
@ -454,7 +454,7 @@ public final class WPrinterJob extends RasterPrinterJob
// native printer is different !
// we update the current PrintService
try {
setPrintService(Win32PrintServiceLookup.
setPrintService(PrintServiceLookupProvider.
getWin32PrintLUS().
getPrintServiceByName(printerName));
} catch (PrinterException e) {
@ -628,7 +628,7 @@ public final class WPrinterJob extends RasterPrinterJob
String printerName = getNativePrintService();
if (printerName != null) {
myService = Win32PrintServiceLookup.getWin32PrintLUS().
myService = PrintServiceLookupProvider.getWin32PrintLUS().
getPrintServiceByName(printerName);
// no need to call setNativePrintService as this name is
// currently set in native

8
jdk/src/java.desktop/windows/classes/sun/print/Win32PrintServiceLookup.java → jdk/src/java.desktop/windows/classes/sun/print/PrintServiceLookupProvider.java
View File

@ -47,7 +47,7 @@ import javax.print.attribute.PrintServiceAttribute;
import javax.print.attribute.PrintServiceAttributeSet;
import javax.print.attribute.standard.PrinterName;
public class Win32PrintServiceLookup extends PrintServiceLookup {
public class PrintServiceLookupProvider extends PrintServiceLookup {
private String defaultPrinter;
private PrintService defaultPrintService;
@ -70,10 +70,10 @@ public class Win32PrintServiceLookup extends PrintServiceLookup {
* javax.print.PrintServiceLookup.defaultPrintService() so that the
* same instance is stored there.
*/
private static Win32PrintServiceLookup win32PrintLUS;
private static PrintServiceLookupProvider win32PrintLUS;
/* Think carefully before calling this. Preferably don't call it. */
public static Win32PrintServiceLookup getWin32PrintLUS() {
public static PrintServiceLookupProvider getWin32PrintLUS() {
if (win32PrintLUS == null) {
/* This call is internally synchronized.
* When it returns an instance of this class will have
@ -84,7 +84,7 @@ public class Win32PrintServiceLookup extends PrintServiceLookup {
return win32PrintLUS;
}
public Win32PrintServiceLookup() {
public PrintServiceLookupProvider() {
if (win32PrintLUS == null) {
win32PrintLUS = this;

10
jdk/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp
View File

@ -68,7 +68,7 @@ static BOOL IsSupportedLevel(HANDLE hPrinter, DWORD dwLevel) {
extern "C" {
JNIEXPORT jstring JNICALL
Java_sun_print_Win32PrintServiceLookup_getDefaultPrinterName(JNIEnv *env,
Java_sun_print_PrintServiceLookupProvider_getDefaultPrinterName(JNIEnv *env,
jobject peer)
{
TRY;
@ -119,7 +119,7 @@ Java_sun_print_Win32PrintServiceLookup_getDefaultPrinterName(JNIEnv *env,
JNIEXPORT jobjectArray JNICALL
Java_sun_print_Win32PrintServiceLookup_getAllPrinterNames(JNIEnv *env,
Java_sun_print_PrintServiceLookupProvider_getAllPrinterNames(JNIEnv *env,
jobject peer)
{
TRY;
@ -176,7 +176,7 @@ Java_sun_print_Win32PrintServiceLookup_getAllPrinterNames(JNIEnv *env,
JNIEXPORT jlong JNICALL
Java_sun_print_Win32PrintServiceLookup_notifyFirstPrinterChange(JNIEnv *env,
Java_sun_print_PrintServiceLookupProvider_notifyFirstPrinterChange(JNIEnv *env,
jobject peer,
jstring printer) {
HANDLE hPrinter;
@ -210,7 +210,7 @@ Java_sun_print_Win32PrintServiceLookup_notifyFirstPrinterChange(JNIEnv *env,
JNIEXPORT void JNICALL
Java_sun_print_Win32PrintServiceLookup_notifyClosePrinterChange(JNIEnv *env,
Java_sun_print_PrintServiceLookupProvider_notifyClosePrinterChange(JNIEnv *env,
jobject peer,
jlong chgObject) {
FindClosePrinterChangeNotification((HANDLE)chgObject);
@ -218,7 +218,7 @@ Java_sun_print_Win32PrintServiceLookup_notifyClosePrinterChange(JNIEnv *env,
JNIEXPORT jint JNICALL
Java_sun_print_Win32PrintServiceLookup_notifyPrinterChange(JNIEnv *env,
Java_sun_print_PrintServiceLookupProvider_notifyPrinterChange(JNIEnv *env,
jobject peer,
jlong chgObject) {
DWORD dwChange;