From 8b0109ca1b6bb45bc575cd7f9c65a81a4e3a912f Mon Sep 17 00:00:00 2001 From: zgu Date: Mon, 3 Jun 2019 15:58:44 +0100 Subject: [PATCH] 8055705: Rename UnixPrintServiceLookup and Win32PrintServiceLookup as a platform neutral class name Reviewed-by: andrew --- make/CopyIntoClasses.gmk | 4 +- .../services/javax.print.PrintServiceLookup | 2 + .../javax.print.StreamPrintServiceFactory | 0 .../classes/sun/print/CUPSPrinter.java | 4 +- .../classes/sun/print/IPPPrintService.java | 4 +- ...p.java => PrintServiceLookupProvider.java} | 6 +- .../classes/sun/print/UnixPrintJob.java | 4 +- .../classes/sun/print/UnixPrintService.java | 58 +++++++++---------- .../services/javax.print.PrintServiceLookup | 2 - .../classes/sun/awt/windows/WPrinterJob.java | 6 +- ...p.java => PrintServiceLookupProvider.java} | 8 +-- .../services/javax.print.PrintServiceLookup | 2 - .../javax.print.StreamPrintServiceFactory | 2 - .../native/sun/windows/WPrinterJob.cpp | 10 ++-- 14 files changed, 54 insertions(+), 58 deletions(-) create mode 100644 src/share/classes/sun/print/services/javax.print.PrintServiceLookup rename src/{solaris => share}/classes/sun/print/services/javax.print.StreamPrintServiceFactory (100%) rename src/solaris/classes/sun/print/{UnixPrintServiceLookup.java => PrintServiceLookupProvider.java} (99%) delete mode 100644 src/solaris/classes/sun/print/services/javax.print.PrintServiceLookup rename src/windows/classes/sun/print/{Win32PrintServiceLookup.java => PrintServiceLookupProvider.java} (98%) delete mode 100644 src/windows/classes/sun/print/services/javax.print.PrintServiceLookup delete mode 100644 src/windows/classes/sun/print/services/javax.print.StreamPrintServiceFactory diff --git a/make/CopyIntoClasses.gmk b/make/CopyIntoClasses.gmk index a7ad4007b..e093e9a95 100644 --- a/make/CopyIntoClasses.gmk +++ b/make/CopyIntoClasses.gmk @@ -195,9 +195,9 @@ OUT_SERVICES_FILES := $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, \ $(shell $(PRINTF) "$(SRC_SERVICES_FILES)\n" | $(SED) -e 's|/[^ ]*/META-INF/services/||g')) OUT_SERVICES_FILES_COLON := $(addsuffix :, $(OUT_SERVICES_FILES)) # Exception handling for print services with no META-INF directory -SRC_SERVICES_FILES_PRINT = $(wildcard $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/*) +SRC_SERVICES_FILES_PRINT = $(wildcard $(JDK_TOPDIR)/src/share/classes/sun/print/services/*) OUT_SERVICES_FILES_PRINT = $(addprefix $(JDK_OUTPUTDIR)/classes/META-INF/services/, \ - $(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/sun/print/services/%, %, \ + $(patsubst $(JDK_TOPDIR)/src/share/classes/sun/print/services/%, %, \ $(SRC_SERVICES_FILES_PRINT))) OUT_SERVICES_FILES_PRINT_COLON = $(addsuffix :, $(OUT_SERVICES_FILES_PRINT)) RULES_SERVICES_PRINT = $(join $(OUT_SERVICES_FILES_PRINT_COLON), $(SRC_SERVICES_FILES_PRINT)) diff --git a/src/share/classes/sun/print/services/javax.print.PrintServiceLookup b/src/share/classes/sun/print/services/javax.print.PrintServiceLookup new file mode 100644 index 000000000..bbeb657da --- /dev/null +++ b/src/share/classes/sun/print/services/javax.print.PrintServiceLookup @@ -0,0 +1,2 @@ +# Provider for Java Print Service +sun.print.PrintServiceLookupProvider diff --git a/src/solaris/classes/sun/print/services/javax.print.StreamPrintServiceFactory b/src/share/classes/sun/print/services/javax.print.StreamPrintServiceFactory similarity index 100% rename from src/solaris/classes/sun/print/services/javax.print.StreamPrintServiceFactory rename to src/share/classes/sun/print/services/javax.print.StreamPrintServiceFactory diff --git a/src/solaris/classes/sun/print/CUPSPrinter.java b/src/solaris/classes/sun/print/CUPSPrinter.java index ef33dde42..479071c65 100644 --- a/src/solaris/classes/sun/print/CUPSPrinter.java +++ b/src/solaris/classes/sun/print/CUPSPrinter.java @@ -318,8 +318,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 (String[])printerInfo.clone(); diff --git a/src/solaris/classes/sun/print/IPPPrintService.java b/src/solaris/classes/sun/print/IPPPrintService.java index ee8cf6217..c8ed952b3 100644 --- a/src/solaris/classes/sun/print/IPPPrintService.java +++ b/src/solaris/classes/sun/print/IPPPrintService.java @@ -1042,7 +1042,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); } } @@ -1586,7 +1586,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); diff --git a/src/solaris/classes/sun/print/UnixPrintServiceLookup.java b/src/solaris/classes/sun/print/PrintServiceLookupProvider.java similarity index 99% rename from src/solaris/classes/sun/print/UnixPrintServiceLookup.java rename to src/solaris/classes/sun/print/PrintServiceLookupProvider.java index 373494e51..e1432b9ff 100644 --- a/src/solaris/classes/sun/print/UnixPrintServiceLookup.java +++ b/src/solaris/classes/sun/print/PrintServiceLookupProvider.java @@ -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 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(); diff --git a/src/solaris/classes/sun/print/UnixPrintJob.java b/src/solaris/classes/sun/print/UnixPrintJob.java index c18bb757d..314f7e9d8 100644 --- a/src/solaris/classes/sun/print/UnixPrintJob.java +++ b/src/solaris/classes/sun/print/UnixPrintJob.java @@ -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; @@ -873,7 +873,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"; diff --git a/src/solaris/classes/sun/print/UnixPrintService.java b/src/solaris/classes/sun/print/UnixPrintService.java index bb9a6dfce..9d22b666a 100644 --- a/src/solaris/classes/sun/print/UnixPrintService.java +++ b/src/solaris/classes/sun/print/UnixPrintService.java @@ -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 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(); diff --git a/src/solaris/classes/sun/print/services/javax.print.PrintServiceLookup b/src/solaris/classes/sun/print/services/javax.print.PrintServiceLookup deleted file mode 100644 index 74beed617..000000000 --- a/src/solaris/classes/sun/print/services/javax.print.PrintServiceLookup +++ /dev/null @@ -1,2 +0,0 @@ -# Provider for Java Print Service -sun.print.UnixPrintServiceLookup diff --git a/src/windows/classes/sun/awt/windows/WPrinterJob.java b/src/windows/classes/sun/awt/windows/WPrinterJob.java index 3b7c5f3c9..e32bd5099 100644 --- a/src/windows/classes/sun/awt/windows/WPrinterJob.java +++ b/src/windows/classes/sun/awt/windows/WPrinterJob.java @@ -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 diff --git a/src/windows/classes/sun/print/Win32PrintServiceLookup.java b/src/windows/classes/sun/print/PrintServiceLookupProvider.java similarity index 98% rename from src/windows/classes/sun/print/Win32PrintServiceLookup.java rename to src/windows/classes/sun/print/PrintServiceLookupProvider.java index 06d4b0840..78ca5f06b 100644 --- a/src/windows/classes/sun/print/Win32PrintServiceLookup.java +++ b/src/windows/classes/sun/print/PrintServiceLookupProvider.java @@ -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; diff --git a/src/windows/classes/sun/print/services/javax.print.PrintServiceLookup b/src/windows/classes/sun/print/services/javax.print.PrintServiceLookup deleted file mode 100644 index b3844117e..000000000 --- a/src/windows/classes/sun/print/services/javax.print.PrintServiceLookup +++ /dev/null @@ -1,2 +0,0 @@ -# Provider for Java Print Service -sun.print.Win32PrintServiceLookup diff --git a/src/windows/classes/sun/print/services/javax.print.StreamPrintServiceFactory b/src/windows/classes/sun/print/services/javax.print.StreamPrintServiceFactory deleted file mode 100644 index 6ab63408b..000000000 --- a/src/windows/classes/sun/print/services/javax.print.StreamPrintServiceFactory +++ /dev/null @@ -1,2 +0,0 @@ -# Providers for Java 2D/JPS Stream print services. -sun.print.PSStreamPrinterFactory diff --git a/src/windows/native/sun/windows/WPrinterJob.cpp b/src/windows/native/sun/windows/WPrinterJob.cpp index 70aaa7423..bf8b49ab0 100644 --- a/src/windows/native/sun/windows/WPrinterJob.cpp +++ b/src/windows/native/sun/windows/WPrinterJob.cpp @@ -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; -- GitLab