src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m

*** 366,375 ****
--- 366,377 ----
      static JNF_CLASS_CACHE(jc_Pageable, "java/awt/print/Pageable");
      static JNF_MEMBER_CACHE(jm_getCopies, sjc_CPrinterJob, "getCopiesInt", "()I");
      static JNF_MEMBER_CACHE(jm_isCollated, sjc_CPrinterJob, "isCollated", "()Z");
      static JNF_MEMBER_CACHE(jm_getFromPage, sjc_CPrinterJob, "getFromPageAttrib", "()I");
      static JNF_MEMBER_CACHE(jm_getToPage, sjc_CPrinterJob, "getToPageAttrib", "()I");
+     static JNF_MEMBER_CACHE(jm_getMinPage, sjc_CPrinterJob, "getMinPageAttrib", "()I");
+     static JNF_MEMBER_CACHE(jm_getMaxPage, sjc_CPrinterJob, "getMaxPageAttrib", "()I");
      static JNF_MEMBER_CACHE(jm_getSelectAttrib, sjc_CPrinterJob, "getSelectAttrib", "()I");
      static JNF_MEMBER_CACHE(jm_getNumberOfPages, jc_Pageable, "getNumberOfPages", "()I");
      static JNF_MEMBER_CACHE(jm_getPageFormat, sjc_CPrinterJob, "getPageFormatFromAttributes", "()Ljava/awt/print/PageFormat;");
  
      NSMutableDictionary* printingDictionary = [dst dictionary];
*** 377,411 ****
      jint copies = JNFCallIntMethod(env, srcPrinterJob, jm_getCopies); // AWT_THREADING Safe (known object)
      [printingDictionary setObject:[NSNumber numberWithInteger:copies] forKey:NSPrintCopies];
  
      jboolean collated = JNFCallBooleanMethod(env, srcPrinterJob, jm_isCollated); // AWT_THREADING Safe (known object)
      [printingDictionary setObject:[NSNumber numberWithBool:collated ? YES : NO] forKey:NSPrintMustCollate];
-     jint jNumPages = JNFCallIntMethod(env, srcPageable, jm_getNumberOfPages); // AWT_THREADING Safe (!appKit)
-     if (jNumPages != java_awt_print_Pageable_UNKNOWN_NUMBER_OF_PAGES)
-     {
          jint selectID = JNFCallIntMethod(env, srcPrinterJob, jm_getSelectAttrib);
          if (selectID ==0) {
              [printingDictionary setObject:[NSNumber numberWithBool:YES] forKey:NSPrintAllPages];
          } else if (selectID == 2) {
              // In Mac 10.7,  Print ALL is deselected if PrintSelection is YES whether
              // NSPrintAllPages is YES or NO
              [printingDictionary setObject:[NSNumber numberWithBool:NO] forKey:NSPrintAllPages];
              [printingDictionary setObject:[NSNumber numberWithBool:YES] forKey:NSPrintSelectionOnly];
          } else {
              [printingDictionary setObject:[NSNumber numberWithBool:NO] forKey:NSPrintAllPages];
          }
  
-         jint fromPage = JNFCallIntMethod(env, srcPrinterJob, jm_getFromPage);
-         jint toPage = JNFCallIntMethod(env, srcPrinterJob, jm_getToPage);
          // setting fromPage and toPage will not be shown in the dialog if printing All pages
          [printingDictionary setObject:[NSNumber numberWithInteger:fromPage] forKey:NSPrintFirstPage];
          [printingDictionary setObject:[NSNumber numberWithInteger:toPage] forKey:NSPrintLastPage];
!     }
!     else
!     {
!         [printingDictionary setObject:[NSNumber numberWithBool:YES] forKey:NSPrintAllPages];
!     }
      jobject page = JNFCallObjectMethod(env, srcPrinterJob, jm_getPageFormat); 
      if (page != NULL) {
          javaPageFormatToNSPrintInfo(env, NULL, page, dst);
      }
  }
--- 379,415 ----
      jint copies = JNFCallIntMethod(env, srcPrinterJob, jm_getCopies); // AWT_THREADING Safe (known object)
      [printingDictionary setObject:[NSNumber numberWithInteger:copies] forKey:NSPrintCopies];
  
      jboolean collated = JNFCallBooleanMethod(env, srcPrinterJob, jm_isCollated); // AWT_THREADING Safe (known object)
      [printingDictionary setObject:[NSNumber numberWithBool:collated ? YES : NO] forKey:NSPrintMustCollate];
      jint selectID = JNFCallIntMethod(env, srcPrinterJob, jm_getSelectAttrib);
+     jint fromPage = JNFCallIntMethod(env, srcPrinterJob, jm_getFromPage);
+     jint toPage = JNFCallIntMethod(env, srcPrinterJob, jm_getToPage);
      if (selectID ==0) {
          [printingDictionary setObject:[NSNumber numberWithBool:YES] forKey:NSPrintAllPages];
      } else if (selectID == 2) {
          // In Mac 10.7,  Print ALL is deselected if PrintSelection is YES whether
          // NSPrintAllPages is YES or NO
          [printingDictionary setObject:[NSNumber numberWithBool:NO] forKey:NSPrintAllPages];
          [printingDictionary setObject:[NSNumber numberWithBool:YES] forKey:NSPrintSelectionOnly];
      } else {
+         jint minPage = JNFCallIntMethod(env, srcPrinterJob, jm_getMinPage);
+         jint maxPage = JNFCallIntMethod(env, srcPrinterJob, jm_getMaxPage);
+ 
+         // for PD_SELECTION or PD_NOSELECTION, check from/to page
+         // to determine which radio button to select
+         if (fromPage > minPage || toPage < maxPage) {
              [printingDictionary setObject:[NSNumber numberWithBool:NO] forKey:NSPrintAllPages];
+         } else {
+             [printingDictionary setObject:[NSNumber numberWithBool:YES] forKey:NSPrintAllPages];
+         }
      }
  
      // setting fromPage and toPage will not be shown in the dialog if printing All pages
      [printingDictionary setObject:[NSNumber numberWithInteger:fromPage] forKey:NSPrintFirstPage];
      [printingDictionary setObject:[NSNumber numberWithInteger:toPage] forKey:NSPrintLastPage];
! 
      jobject page = JNFCallObjectMethod(env, srcPrinterJob, jm_getPageFormat); 
      if (page != NULL) {
          javaPageFormatToNSPrintInfo(env, NULL, page, dst);
      }
  }