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

7067052: Default printer media is ignored

Browse Source 
Reviewed-by: bae, prr
This commit is contained in:
Jennifer Godinez 2014-06-26 13:46:27 -07:00
parent c08e2bf586
commit dfc9a84755
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jdk/src/solaris/classes/sun/print/CUPSPrinter.java
View File

@ -140,6 +140,9 @@ public class CUPSPrinter {
return cupsCustomMediaSNames;
}
public int getDefaultMediaIndex() {
return ((pageSizes.length >1) ? (int)(pageSizes[pageSizes.length -1]) : 0);
}
/**
* Returns array of MediaPrintableArea derived from PPD.
@ -201,8 +204,15 @@ public class CUPSPrinter {
// add this new custom msn to MediaSize array
if ((width > 0.0) && (length > 0.0)) {
try {
new MediaSize(width, length,
Size2DSyntax.INCH, msn);
} catch (IllegalArgumentException e) {
/* PDF printer in Linux for Ledger paper causes
"IllegalArgumentException: X dimension > Y dimension".
We rotate based on IPP spec. */
new MediaSize(length, width, Size2DSyntax.INCH, msn);
}
}
}

17
jdk/src/solaris/classes/sun/print/IPPPrintService.java
View File

@ -413,6 +413,7 @@ public class IPPPrintService implements PrintService, SunPrinterJobService {
mediaSizeNames = cps.getMediaSizeNames();
mediaTrays = cps.getMediaTrays();
customMediaSizeNames = cps.getCustomMediaSizeNames();
defaultMediaIndex = cps.getDefaultMediaIndex();
urlConnection.disconnect();
init = true;
return;
@ -1427,7 +1428,9 @@ public class IPPPrintService implements PrintService, SunPrinterJobService {
return JobSheets.STANDARD;
}
} else if (category == Media.class) {
defaultMediaIndex = 0;
if (defaultMediaIndex == -1) {
defaultMediaIndex = 0;
}
if (mediaSizeNames.length == 0) {
String defaultCountry = Locale.getDefault().getCountry();
if (defaultCountry != null &&
@ -1443,17 +1446,7 @@ public class IPPPrintService implements PrintService, SunPrinterJobService {
if (attribClass != null) {
String name = attribClass.getStringValue();
if (isCupsPrinter) {
for (int i=0; i< customMediaSizeNames.length; i++) {
//REMIND: get default from PPD. In native _getMedia,
// move default (ppd_option_t->defchoice) to index 0.
// In the meantime, use indexOf because PPD name
// may be different from the IPP attribute name.
if (customMediaSizeNames[i].toString().indexOf(name)
!= -1) {
defaultMediaIndex = i;
return mediaSizeNames[defaultMediaIndex];
}
}
return mediaSizeNames[defaultMediaIndex];
} else {
for (int i=0; i< mediaSizeNames.length; i++) {
if (mediaSizeNames[i].toString().indexOf(name) != -1) {

7
jdk/src/solaris/native/sun/awt/CUPSfuncs.c
View File

@ -349,7 +349,8 @@ Java_sun_print_CUPSPrinter_getPageSizes(JNIEnv *env,
// create array of dimensions - (num_choices * 6)
//to cover length & height
DPRINTF( "CUPSfuncs::option->num_choices %d\n", option->num_choices)
sizeArray = (*env)->NewFloatArray(env, option->num_choices*6);
// +1 is for storing the default media index
sizeArray = (*env)->NewFloatArray(env, option->num_choices*6+1);
if (sizeArray == NULL) {
unlink(filename);
j2d_ppdClose(ppd);
@ -369,6 +370,10 @@ Java_sun_print_CUPSPrinter_getPageSizes(JNIEnv *env,
}
for (i = 0; i<option->num_choices; i++) {
choice = (option->choices)+i;
// get the index of the default page
if (!strcmp(choice->choice, option->defchoice)) {
dims[option->num_choices*6] = (float)i;
}
size = j2d_ppdPageSize(ppd, choice->choice);
if (size != NULL) {
// paper width and height