From 4991b20f3068812f8a1f2dff16f9b9ed745ee403 Mon Sep 17 00:00:00 2001
From: fotis <fotis@unknown>
Date: Tue, 1 Aug 2000 22:36:28 +0000
Subject: [PATCH] update: use Messagehandler instead of System.err.println

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193572 13f79535-47bb-0310-9956-ffa450edef68
---
 lib/Fop.class | Bin 3980 -> 3926 bytes
 lib/Fop.java  |  29 ++++++++++++++++-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/lib/Fop.class b/lib/Fop.class
index 9fd7c437d41031593b4ebeae558b776af6b07178..bbb65d17bd55ffea9fd2bb8b93245c641b7fc333 100644
GIT binary patch
delta 1759
zcmZ9MiC<Jz6vw}B<}vT_e2P6yMO;wIWn?jz7Q{*or4-CC1D6V6L<$%LOfz&eOIs|L
z=TewU=8{VWqB8@STBatY?P_~{KK%v#0ew1m9E^{j`Mh(^-1EC<`Q3BxhQZecg*yIi
zJA;=D{<N4$X(9!bDG@MPWKqsylL~|9EDTCbo>#h3i7Ja~f)+I_QKHtM&Y<38sak)*
zV42BsgBML!7`$ZCV6f66nN>=JOjcX0;bn`^8rCZF6&3SUgLMY$O<uDY%Iiu<njx$*
zc*EdLlMNOlREW2D+hn83CX>x7;1(0tWUD20Z!_6$vZEVGykqdLNu$Y5)yR7WyDYL*
z7rT|-W3ty`N;dDC>@)blV86v=6@3y16yTr=cSu<uDsfneBL+uJj#+%fag&b?nhcs-
zrfP<!op1|0{r!c^wt1XcHcv21!wJ@wXD+X*%&aR}o>@~;TNe<bT5L{o%H84_=GExq
zu1W0UUi0)B7$#y9rPZL#rkx^#(>9-Q#^x;N+(hq$z8XnWf=esQQmcdYsf#MA%TjGV
zrO2J<Z5v%kk<DkcYV=rCQ5ndr3rM<>`k>@HZ}T}9Y%X%i<_j*{gz0c|^)cQ;zI0dU
zMZT|WuF&e<&?kDY^0nJ9VS;xq^V~TJrQUD&);*oD&iftTySct;-XHkU-RR5kUX#3M
zeX|D?a^2<zKiSM@fz8kSV)Lsa;WuWxS;ko3?>2u(?8U}GH{G0@Ib0aYDyb<cT^z_-
z6s*ar3e?q=lvh-jXXVGNKwe38S!JMBBcU=_?(Q?IOe0WR8?3FYZt0ac&J!w-F$Ir&
zLbFH|(;|In2>T+Rlz#(7YoZhU5wvD8H0H!X#6V9`6o(F#U@Dx?Kk5{o|FKqVbv_9!
z5M*&2A3~<G%Lec58_Hxu023iFp5PzBCrE<rjvggpy8jYB$2Ywlqd0=;B!;p4@`dRZ
z#r8+(9;U}RlA308BJSvl2swwCncwN^-PI+Y@dcfpKDT*Nvh}!2C3E_Th-GxNCUnxs
zlwZ%7&ZAdMFXYacZlG_RJwI|`At+og5wn)=)C**pY+XSf4J;IQgWTq=tR*%OaRyrC
zaw`Vv+DR^!6X`!=RG5@}XMpfgka3Z|8DR$Mdr3;q@P--GGb_yC{B&8{&5-n)D|_f0
zt3QOP+^OPK4G0rMirX1l?4)Vw5$+0ecZ6Y0s@W06&d3P<vr@w>x&P%1kGC<5M5$$?
z$W8QMGrieDDlX|#_e8b{dWWEQ3i@do6_1)Htx<ZG4m2y|&51JV)&Zz8)aOVCmj5Ik
zWoO>BrSSNv#@ZIAbRH(Fku*K0^PEO^*>_Lp1}Dmxf{aTNYHSoo&&hDc>8*_Sa)?l`
zY~8s}R-OBmE6M{Yjf&T78Kw!@da~~1NIerpKN#jAQ4hydJClT_$;DElH^P(%kA%rh
z)-zPeQKp8OmaK=#Q{vG>q}>`8XS&p+R%gU(3*AiW<jb%&3pw?yWHt8+b${_UkHsmj
zCPgUTFa85U+(E{1m|Tu9jiYioj#EJsRW!>8osb9-iO|Y=+Sniu-zLsTv~%o|x9xyD
uX~#HEi@abRT;Mt*FUs?BNm5;w>)oO0T+tG_$}^Hqm*mgNS0c8Dh5rGyM1G$D

delta 1814
zcmZvcYg80v7{`CJJM0YOh&CpKD554Qg7<Eqm0D^Fc*AlnEfh2qSzJIfwY5ys!s}R>
zme&-^8-gy#hMJj_n%ynC-%elp(m8#vo_E=lJe@i7f8KeY`~Q9By^>npJ#^u(rc-#y
z;#Z4_6vZ=vVg++d=2|>KiOIZpk@F2oEli3`7ARS!AYf6>LW>|33Mvh%3>GQ##U@W0
zEHQb?V5!M6gXJbq8-y&nutLEzCeK=gR`Q(1N>(XYtztfJu*P7m$qN>}cu|3*>B$O%
zYJ+tq>n-}K5F6NNvdLt#iK_x`F?q@4WlM^G#bm3=tL^B>HiPXZubI5Ay4hi{(;`Q8
zu}jI_V@>v`#a@#)4E7o9w-}|OkEBNJA5h`mRI9fX98_?~;IPRNi=)(<95bjhsIMQP
z8Csv?8rGCRRd9Ck=#tW64Rds$y#KtyMTIs6OtqQBWSc2WcFR3Uz7sZK8r*fBbknAh
zlNyO`AU@H(<Voz-M8xK8nhj3boW^f(#^xQ)+Pup-_is;5lFfU{rNgK|RcTRLS)ej)
zPDxo&nmftcG_U}_&3T$N66Q!9{VR&g3xkD~fuKQ)&HH>{bAgLCm-x`8iOX(|KG<8p
zM{c=3&G)g*Cp5d4_2J%6`OHm-%ke(Kqi$~8Z13lM;nu~i_FmyjH^(=|`xRH+RlY3m
z*ZAENzJjg=d}H%1-`UJyrp@>KVDqEu`zNNly^SHhpKX4T*fWj&Dc(R;rAFsm#m<0|
zz<`OtlCsJvmBHe|1+He!=-TOj6dFdkGIOiV1-iF57_8Ughk8O2WOBhHukb5~qFB&}
zrf3&@NWQv>)I`Q*G@u=mg~r1%Bju<u4Zol=?J2=jIA2D;6L_xMTG3rUaZDG>=`s7z
z4G!KL9SX%^mW;O0*qT7o<d=(+1p6Glk+|_0E%+SY_&SUTroVxB#|qOfL*6iUnD!Zs
zB!ua3hK{wlbvXYTb!s&V#jI+Wme)qx`9C3Q$jNV`Ou9jtnyp{gs>DvRKx=lb7M*kk
z$#YXw=5upY&L>gH5No(a8dGd$U<sBA^<}aO(4K{2QYo&B$!7`kStiy`vzHY_rzFOB
zJw}v}iU?i&azH7${law3bGivV`B~>l$_kUJ@1jFymN!iIjswD^<z>p=4tj(#Teo(S
z6k|rIdx%ywkQbq+KSD3RbE}rwK<_Z=4cu0ntw-qVcO+H6(^A7E=E~D2)<rt;(nYo4
zIuckf?QS5AjbyTk;cOP`En>Y@tRIu{3VGDfXh)@KIa95>cUU8tauU}LQ)+Lgs&V=Y
zWE{t%)>5KcOX)G1qn(RVnh!H@8|nJ6>qp`YYU4WinolD`^0PuMv=>Wfs7#7JEX%oF
zKgk_lYDkVAs&kj@EB)O{-$-`KHWo$5kvSWdttacwaH;Jck@tqVPsE6*h%i!E8|7Ce
zHgJCf4}=+=tY@k68yOR3Y_cBaK?R|4HKezlA17A|RGPeNg{r*5h?6fh9FxCjIjdRA
zoiYc1@F(MAyqA$8yzdtM9wBqD==U>L8X3m{nVf?%Plu`C2utPaUCwcd5XL31f$egC
z?j#~E%^c#Cs7}k*8P3X`c~$T?xi)|2oTNIhIkaerT+mXv$m5bum*j==&XTo<+5Z5V
CI*rZ%

diff --git a/lib/Fop.java b/lib/Fop.java
index 03d7debf6..2b9b7d539 100644
--- a/lib/Fop.java
+++ b/lib/Fop.java
@@ -52,7 +52,7 @@
 // Ant
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
-import org.apache.fop.apps.*;
+
 
 // SAX
 import org.xml.sax.XMLReader;
@@ -69,6 +69,9 @@ import java.io.IOException;
 import java.io.FileNotFoundException;
 import java.net.URL;
 
+// FOP
+import org.apache.fop.messaging.MessageHandler;
+import org.apache.fop.apps.*;
 
 /**
  * extension to Ant which allows usage of Fop in the 
@@ -110,20 +113,20 @@ public class Fop {
     if (parserClassName == null) {
         parserClassName = "org.apache.xerces.parsers.SAXParser";
     }
-    System.out.println("using SAX parser " + parserClassName);
+    MessageHandler.logln("using SAX parser " + parserClassName);
 
     try {
         return (XMLReader)
           Class.forName(parserClassName).newInstance();
     } catch (ClassNotFoundException e) {
-        System.err.println("Could not find " + parserClassName);
+        MessageHandler.errorln("Could not find " + parserClassName);
     } catch (InstantiationException e) {
-        System.err.println("Could not instantiate "
+        MessageHandler.errorln("Could not instantiate "
                        + parserClassName);
     } catch (IllegalAccessException e) {
-        System.err.println("Could not access " + parserClassName);
+        MessageHandler.errorln("Could not access " + parserClassName);
     } catch (ClassCastException e) {
-        System.err.println(parserClassName + " is not a SAX driver"); 
+        MessageHandler.errorln(parserClassName + " is not a SAX driver"); 
     }
     return null;
   }  // end: createParser
@@ -160,18 +163,18 @@ public class Fop {
   public void execute () throws BuildException {
     boolean errors = false;
     String version = Version.getVersion();
-    System.out.println("=======================\nTask " + version + 
+    MessageHandler.logln("=======================\nTask " + version + 
                        "\nconverting file " + fofile + " to " + pdffile);
   
     if (!(new File(fofile).exists())) {
       errors = true;
-      System.err.println("Task Fop - ERROR: Formatting objects file " + fofile + " missing.");
+      MessageHandler.errorln("Task Fop - ERROR: Formatting objects file " + fofile + " missing.");
     }
   
     XMLReader parser = createParser();
   
     if (parser == null) {
-        System.err.println("Task Fop - ERROR: Unable to create SAX parser");
+        MessageHandler.errorln("Task Fop - ERROR: Unable to create SAX parser");
         errors = true;
     }
 
@@ -179,8 +182,8 @@ public class Fop {
     try {
       parser.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
     } catch (SAXException e) {
-      System.err.println("Error in setting up parser feature namespace-prefixes");
-      System.err.println("You need a parser which supports SAX version 2");  
+      MessageHandler.errorln("Error in setting up parser feature namespace-prefixes");
+      MessageHandler.errorln("You need a parser which supports SAX version 2");  
       System.exit(1);  
     }
 
@@ -195,11 +198,11 @@ public class Fop {
         driver.format();
         driver.render();
       } catch (Exception e) {
-        System.err.println("Task Fop - FATAL ERROR: " + e.getMessage());
+        MessageHandler.errorln("Task Fop - FATAL ERROR: " + e.getMessage());
         System.exit(1);
       }
     }
-    System.out.println("=======================\n");  
+    MessageHandler.logln("=======================\n");  
   } // end: execute
 }
 
-- 
2.39.5