From b656968688bc4d96e2abd606695f317cf2b37e39 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Tue, 27 Apr 2010 16:35:06 +0000 Subject: [PATCH] IppResponse.java (parseAttributes): Handle IppValueTag.UNKNOWN. 2010-04-27 Andrew Haley * gnu/javax/print/ipp/IppResponse.java (parseAttributes): Handle IppValueTag.UNKNOWN. * gnu/javax/print/ipp/IppRequest.java (writeOperationAttributes): Handle RequestedAttributes. * gnu/javax/print/ipp/IppPrintService.java (processResponse): Add DocFlavor.SERVICE_FORMATTED.PAGEABLE and DocFlavor.SERVICE_FORMATTED.PRINTABLE. From-SVN: r158789 --- libjava/classpath/ChangeLog | 10 ++++++++++ .../gnu/javax/print/ipp/IppPrintService.java | 11 ++++++++++- .../gnu/javax/print/ipp/IppRequest.java | 8 ++++++++ .../gnu/javax/print/ipp/IppResponse.java | 11 +++++++---- .../gnu/javax/print/ipp/IppPrintService.class | Bin 20186 -> 20439 bytes .../print/ipp/IppRequest$RequestWriter.class | Bin 9227 -> 9426 bytes .../lib/gnu/javax/print/ipp/IppRequest.class | Bin 8604 -> 8604 bytes .../ipp/IppResponse$ResponseReader.class | Bin 13156 -> 13186 bytes .../lib/gnu/javax/print/ipp/IppResponse.class | Bin 2476 -> 2476 bytes 9 files changed, 35 insertions(+), 5 deletions(-) diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 71db5159ff7..f98d1c95b1e 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,13 @@ +2010-04-27 Andrew Haley + + * gnu/javax/print/ipp/IppResponse.java (parseAttributes): Handle + IppValueTag.UNKNOWN. + * gnu/javax/print/ipp/IppRequest.java (writeOperationAttributes): + Handle RequestedAttributes. + * gnu/javax/print/ipp/IppPrintService.java (processResponse): Add + DocFlavor.SERVICE_FORMATTED.PAGEABLE and + DocFlavor.SERVICE_FORMATTED.PRINTABLE. + 2010-04-02 Ralf Wildenhues * HACKING: Update required Automake version. diff --git a/libjava/classpath/gnu/javax/print/ipp/IppPrintService.java b/libjava/classpath/gnu/javax/print/ipp/IppPrintService.java index ce3ef9e1538..56a41381fb6 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppPrintService.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppPrintService.java @@ -356,8 +356,17 @@ public class IppPrintService implements PrintService // should not happen, all fields are public } } + + if (this.getClass() + .isAssignableFrom(gnu.javax.print.CupsPrintService.class)) + { +// CUPS always provides filters to convert from Postscript. +// This logic looks odd, but it's what OpenJDK does. + flavors.add(DocFlavor.SERVICE_FORMATTED.PAGEABLE); + flavors.add(DocFlavor.SERVICE_FORMATTED.PRINTABLE); + } } - + // printer uris Set uris = getPrinterAttributeSet(PrinterUriSupported.class); printerUris = new ArrayList(uris.size()); diff --git a/libjava/classpath/gnu/javax/print/ipp/IppRequest.java b/libjava/classpath/gnu/javax/print/ipp/IppRequest.java index 3de88715a68..869f8224be9 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppRequest.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppRequest.java @@ -434,6 +434,8 @@ public class IppRequest PrinterURI printerUri = (PrinterURI) attributes.get(PrinterURI.class); JobUri jobUri = (JobUri) attributes.get(JobUri.class); JobId jobId = (JobId) attributes.get(JobId.class); + RequestedAttributes reqAttrs + = (RequestedAttributes)attributes.get(RequestedAttributes.class); if (printerUri != null && jobId == null && jobUri == null) { write(printerUri); @@ -467,6 +469,12 @@ public class IppRequest logger.log(Component.IPP, "Attribute: Name: <" + jobUri.getCategory() .getName() + "> Value: <" + jobUri.toString() + ">"); } + else if (reqAttrs != null) + { + write(reqAttrs); + attributes.remove(RequestedAttributes.class); + logger.log(Component.IPP, "RequestedAttributes: <" + reqAttrs + ">"); + } else { throw new IppException("Unknown target operation attribute combination."); diff --git a/libjava/classpath/gnu/javax/print/ipp/IppResponse.java b/libjava/classpath/gnu/javax/print/ipp/IppResponse.java index 21784d0f076..81a1eb47b03 100644 --- a/libjava/classpath/gnu/javax/print/ipp/IppResponse.java +++ b/libjava/classpath/gnu/javax/print/ipp/IppResponse.java @@ -302,11 +302,14 @@ public class IppResponse // out-of-band values case IppValueTag.UNSUPPORTED: case IppValueTag.UNKNOWN: - case IppValueTag.NO_VALUE: // TODO implement out-of-band handling - // We currently throw an exception to see when it occurs - not yet :-) - throw new IppException( - "Unexpected name value for out-of-band value tag"); + // We currently throw an exception to see when it occurs - not yet :-) + throw new IppException( + "Unexpected name value for out-of-band value tag " + tag); + case IppValueTag.NO_VALUE: + attribute = null; + + break; case IppValueTag.INTEGER: int intValue = IppUtilities.convertToInt(value); attribute = IppUtilities.getIntegerAttribute(name, intValue); diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppPrintService.class index c44e1cf7f15803a7d346d926ac3fda023c8cd260..7ec693ef159c1e0b0c181039742b3a780ada1838 100644 GIT binary patch delta 7031 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 Q<5?O1BlLI~&rsO^0nl!dHUIzs diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest$RequestWriter.class index c4e62948ad1aeb5773ba53c213b52e8675bbfb82..a7697f9415a210e041dd0f1d8f00683fefd5fb72 100644 GIT binary patch delta 868 zcmYL{YfwyK7{~wrr`p}NO?KHXWz@qsTG496E{ zm@z)o7nj1WiWDQ4Xrbh*2<++F5zubuDlY~4^)?s1o;M`fDP#jzHA;y5B<%93K& zHdoRnSIPRMrA5W=H6AT5BwXm!!mSzpQ5HsDT5WaEPMEg3OZDfJ1)+tB7AA3;w%eAL zoT4{8ptqi`(`KD!=v1WBES*;Bl&({biJ6yrY&(Jidk_F4Am_D`i00rp+vOTO5H#R& zx-FNJ7eBoCS%DFCXi~*+A0uwW#(5c8rIZOqsq<^h)ZRvA@A0CYSI|Kp-m?ZD zSc~thV*sx)M&%UNa|Roj$wn^ZP3H3!%T?~;ZSLnC9_C#h=RKb0eO9uWSNVW#Dm&Q1 z9zGN!TO^o|#lffIiRxu8@GmEEGW>9zU(~=;;g4o^GnR46a|hcQk46~OXNcB5 zM@KV3v&F1)Bv+t5-kH*fEhjKCR#5}C_?W64iLoc7Rp8iQtzfuT;N#2+>>gar8(z)x zaklm(CV!88SapW3dY>Pi@%3j0Uj5g-4NidHU}P^W{DBDmL?VA7OYs8!#$xuNfPdg( zKT0@&?fi><0vrmAon delta 692 zcmX|3{HsHxL*nRLvi8qKkbqgiTp(=HT2SrQSH?lPns)HVV^f+#9l)W7Mn zXwhPVh%%{3EiXh?PGy;kB&k&tBo%g5(>lL~95~-|KF;F(o^!f3o!;o_7-?*lRKTh_ z&lF!=5@}A2uOxnkmq2}!Z#tfddd562^I710m{wd8_9|VcJc2xz4!V@@(r%X)yR^fl zLYFqUw8W)bNi3}|PdPF%`M44^K{5xN&S1=mWNc-N^DASU(STEyd6vCSZ)Qbsa+BIC zQ}9Qb-V)BeLwcRfXq002b`>}$=d7>2tsbI!%Uyk>LBDClPXjZ#M-I&_qJm5%SBxb~OwQ*LD4I{tO?8%O0Bg_)=*{ib&+R!&>B7;oD=|0z)Lzdzd<1!(#tqKS@ zb-`38mNkjFPEXbza-6jx|N7jBuI9}yY*Y0GO$}RWRdtkw5uF?DR*ZKmqAZH2X0%&A z-Yt((;G7TboLm&qf0@NrrZXH0)P7PTee&{ILB1%TuUcby9sSzOH&yUmRs7H)e(Es4 zbd29R!+Cx6vzr1u8(8>1l;N0N!hXA%gSMEeqb6q@8wQDHl_ qD3ZT)%oIicO(l}YGL~CY$>eC4s;nu)3Rfm8DY4c5BD=aNmHq+CV4m>+ diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppRequest.class index aadef6cb135604c20c441c52872401eb0862b19d..039067c89a4649593976f9034ec723967824a6df 100644 GIT binary patch delta 559 zcmW;FO>7Hr7zXg?|32-ior?9)t=+U;WHLp4gfzuIWSF$wnvTvUQd>txvNXXWJ6W=D zS>j{<2MOgM6JHl}IEaJ!IQSYai-ZJahDa|ibuj-py-$95p1ir1T+7YhZmS1n;?I}d z4wc#ri`2m`TTvmca7zp|5=TJV5SDgCC4mlOJ0*!e>A-+&$DpJzES)$ZT{tCaG>afb{7gZb8khXgotjA!L<2vSPwVpO>w>r0`OxU3(Z@!g7~SK1Wn{|88zXQ3_wH9u zN8TI#VDu9_@)s`%>0j; z|26YD_^1$~ppis^7WB}HgDk@cZP1*DaoTZ*4m@Q!ra2$8bfUxs%E5)IQsz{EuKXEa zQ4I%RV=Y`3A958o)YcRyM=EXXUGK?`saDnS_i5qa8 z4Yxe3p>1ykIHcZ}jAV<<3=8MdLwxUw*z%9&Jd?oi$!Q_9C(s-C;mYNl0$ bJu1px)ya(N<~}vZel^1VYLxvtSbOLnYW#h} delta 559 zcmW;DO-R#m9LMp`@B7&_7dyI+nqq*yc8H&QHMf|9<0&BO^Qg?^OsKF4==v&Tr3y6`ps>3p+r3SqT6A* z8(@&qQkQ8!~#&zk% zec6mBx}V7wtH-;~?6e+x8_aI2%-3i?2)i7z+IU2Nk@JpG;4;u zD5VeO48X%6!VICBRjB0x)N>)4xd>@4#xA}6jNkxkkmV8#vlb^=hfyxad9J`kuEaIg zW1OpSk5Npr5l`8IX|Bc$V<<3=k8H&(na?)k=33*Au)~DdWvaQ+)G=kE>@i8E XO^UrH&8=pT8Ixt78D_?cRPFr-g_MB2 diff --git a/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class b/libjava/classpath/lib/gnu/javax/print/ipp/IppResponse$ResponseReader.class index 2d0d8045d7e2f5e016627ab35470ce059e002c5d..89113302b6839d6ffe8c910a80d8a57f67983e1c 100644 GIT binary patch delta 1234 zcmX|=dra3=7{;IHJ?DJ&2PDYFU8!gPRuCd}fZXjtYgFEc|8CGmnb7Txrhl-G2Q z{nl+owo37unyD2TBHj^isMyGwmaR4a$(Sy*tyf|F@$B=Q=bZDL?YsB;+nlP>T`@kU z1!8@v?6arHR~F~1fkPDFjSL* zi6=Oj7dVxzoW>h`P7J3@5Q`;}GbEWaC7rV*mnBl*=Ny^BQYq(Ld5vYVhV$fI&X&9}43FT4~L%&Jkns=3O1%++Qa*O+~L#~k8X)68|o|0CC%Ykc2a=STW=YRp}3us(ifBl)>a z(IbBkTTt@agevn#mWR&$5lz%T7q?zDTk+kV5ZZ6o*E7Vfu~ z_^rLl@9YiM*$#g191pk%{@@;By-Q((8^A`t8^XgbpGVwS9(B`r%+2L-SHTm`&n8#J zX19)~-3L75YI)Xu#dEHK=iMo`xXZlg+Suy;;AQuZ@?W-j!k@gJ{MqZxU%Xge_0o9F z%To?#Fd}vO!Vr6Jj&+*v&80f}>v<5oA8x@`oel9uuz`nQ;Jkb`s_D*oIpI8|g(2*(YSwiK$0LHL)jhyU%-|WGMGxMOF35ZqPhrkSMOh9D*~CR)1v=EH{R6RcJ$^gB=9yKWd|~OXV2zT z;W!UI@!fBXmJlRLC7rW4}Bg%G6Owi uCL(1P;^YPNl@bh;*?Mvga-|ecOPRhs4<)hy3uPfHWD(ww#euMliT?qi1PE9F delta 1211 zcmXw&drX#P7{;&bexB#mPXQ4=R1U*|hpnj~9|sQ%B~VjL({!nnqDX=$Hn%cn)JGn| zn17UCxmH%1WeI8rO)LuqluSYKgtbbi)7e&GEu77@>~7K@*M8S?zt4TW+xy=4y3*^* zK8f=&H5Bhl-9Oz|p5Uv7Lk!>rLXE?USP@Db9v`d+kfi!tm8?3U8lw71HClB?l?IT? zfO5GqU3pQN3CJd8Ru3QSVO|d>DYxqL$$)uQIR&r<%7>I?%Bg_gHmaEhIR9b9Er@Du zK<1JCSBDRAF`c04FxSitehopiW+kE~6gzTaFoV6B$v(_r1jjIjW0}bDOyUHlGnZM+ zV-E8NnnwT;1WsUQpsnD6b89Wo@A*!!!oJna(RX2@)lP}Jy*&>R!A#X$yq)nm$_Q5 za*h1TO1Z_ga+l8;$13CJ^JXw#Fewb0ajZ5|`J$P_b*7l>O$9fYDsD72e93HOjoHCX zW-nhhhgfTlakFXXYbMyiH}tE#X>M|x>E^rU9=F?Y?y!USo*mAeHjVGwiTuD8aF?CW z5A9NZWLI;ytzw<6Wxai!d+c`Zvpe~z-N(;tBM;an9<*(2u$Oqq-ryJZcYbOA;bG_F zSI*ByH;_kNGMn5eHV0icTig^Lb8~sz6|vQo^MtG5Nmt2JZav%F7Ph;$dD`va8P~uL z*TQqIl^5K3UUb)$Kl3~H8^3pd^9RrHN6+JBFP>Mtk;+u|gEx17(AWy2Vi)dt?DPaUwT}DyTNa?(hIZP z6`sH@^fuS@-nTpnpXtWO_nq8DCr@c_AKQlM_nk}r-vwPIX5KHNuQwEXuor!GIilF6 zfnkhMwd*;IIf&+Ib>S?=VxD0KB6tb&cvfru*o9o4Qy0nG7{~MK`b$3E;RSV3QivK| zvH+sZP3`a0K0ky9*?>@C>YUgv^x`dz{{w^gCz9BW5xj#8{Bbe gHWCgYy*j;>o&Y{kD o0m!mpyaVPh1oEGOS@(dfk6@NGry3K}UobO*Q=O50as#Ih0GdE5ZU6uP