From 55994b73d85ef2e927c9911634a99b1f3c1a4f3e Mon Sep 17 00:00:00 2001 From: Anadroid Date: Thu, 10 Sep 2020 17:36:12 +0200 Subject: [PATCH] Cleaned up xml leftovers, and changed paths --- .../bin/ProcessingWeblet.class | Bin 4601 -> 4443 bytes .../bin/writers/BaseWriter.class | Bin 14011 -> 12931 bytes .../bin/writers/ClassWriter.class | Bin 4554 -> 4595 bytes .../bin/writers/FieldWriter.class | Bin 3497 -> 3538 bytes .../bin/writers/FunctionWriter.class | Bin 2661 -> 2702 bytes .../bin/writers/LibraryIndexWriter.class | Bin 4637 -> 0 bytes .../bin/writers/LibraryWriter.class | Bin 2168 -> 1878 bytes .../bin/writers/Shared.class | Bin 5224 -> 4462 bytes .../ReferenceGenerator/processingrefBuild.sh | 24 ++-- .../src/ProcessingWeblet.java | 9 -- .../src/writers/BaseWriter.java | 58 +------- .../src/writers/LibraryIndexWriter.java | 130 ------------------ .../src/writers/LibraryWriter.java | 24 +--- .../src/writers/Shared.java | 30 +--- 14 files changed, 23 insertions(+), 252 deletions(-) delete mode 100644 doclet/ReferenceGenerator/bin/writers/LibraryIndexWriter.class delete mode 100644 doclet/ReferenceGenerator/src/writers/LibraryIndexWriter.java diff --git a/doclet/ReferenceGenerator/bin/ProcessingWeblet.class b/doclet/ReferenceGenerator/bin/ProcessingWeblet.class index eaf1d8486695adc3f631c18fbc2de02015704585..d941c41a97bdae834e095237df56295ee04f36eb 100644 GIT binary patch delta 2114 zcmZ9M349Yp6vn?vHr>r;OT&^Dg0z%^6dFpk6oqmhqG$^WVgW^MOT;3yHK`Oti3f^^ z;;~+dsDNTr>OmI+rCP<4Lp)IM01r^S5ygwk*7tTP^hc84y#LHMZ+7N;lReyhS5{<8 z^M)n>1tL|&MAUjP7xPq1!1XHT;|6YSl(9fX5^CKv9C70&+^pah6}Ms`PrOaR?Ftt0 zj5}m3R^i2+3YNGj^DYHQp?B7r6VP2QOg_@3x+W zh{=O%RlJOZ2kWp##(EV4QOivO&!D;Uu|YNOTpU;-cj(bf=voGE7+o7tAh7rY?JZ6fEJuvI=k9jBD_K@HkLVhNgv4g(Aead zocxiD?J_==@rjHbMy|8-@KTh~n1-GBRKwM%knx#@&+&zZT__XiP#dbK35LRXV=Jcz z=ayI<4Oiew8M`%niLZ=B&OFc88ot3E4V9=eHaY`FvDDYO7iGo*sgv_ticzU&)_2$^ zkWwA0Di4Ok6_qpkmRE&>GQQXF1Af%-6ZRQ2hxV!X5#yb&AaLs>+&RWlgv+Q^Vi*N5j83 zM2j58Au>qA5ge6qOv7IMr=b}wGWjZmaA?9QBu%(Pk|t!DD-@a|+_F&Hm^ErvX*k?! z)?VS!geH=Wt*+d>b|OU+UbJYUJz4}(TkS2XC<~Q_<{i%wy6C{m`poR4aSmgrGRzNSe&MJY{Q+HbBY2@L!3j?yQ~zxNFY7G zQ1VO8{CfBk=p2QY()^N?pTKEx9I%xxrzq)h?68%LQK?};Tk6q9V&(KWX4^_nOYzy~v-g);632L3&9>BJQl$iX#WBDh?%gIS?POACTg@Rg z5(Q`3T4145#GChX&1|nTpfw{PW2O+t&|Stge*UDVr5{1sAu`;JS(t5?fZo;)B4B2Y z?PLrSiP*Uq#uBkpF$^Q(UB%F!C^HdZ3=py@F?1th4`S#@#Al8nnTWRQYQP!BU~g9LnSM8oCy?KOehw6>ezhrz6uPQ@w_kNqeF_#TBHpr@Gx{4#yxk&a zMbVX$&bB9=NFU(9$@!b&sBXl-DeF+^r_~4frPikmrl+|4uGXhWewURM$8c-LkSMa~ zFpU^Wxx@6~35?)Jj}#zEU=-QuX~bv}&*5cQ8^hYUR$;fFENn57o8gmDEkp|n;FfW% z)sYdB5vHG@Qud<~H^VEVMu>tIDz~f6G{Divk$nU{z6aM)Atb84cRUo#Iq@bKW?cwc xNI%a+7k#V=zka@n4E+KVnR=0lEWOx74}F}8p89wb+4_Yhdg~XN$lANu+2mZO`_!eUDt)%L+T^y;45k%y-X!&wtLn=lvTMd1WzA}`mr8e zT~1iI*i_k$6?&HHp_H-jH}xVzb0s5^oRC@Q#Let%V{}2-CdQRp5C~!~5n2*R-S$ zG<>LGi-xTlJ~D^6v&M%ohkObj;}eA@%-8U#!e{tg;S0H_Bukf|G*j?iPM&Vn0rw~S)X}OE?6~0HW05trdunpS<_SY*aDmcBdxgmGj zl&WHLg*z=nU^uxeo9mkv&JN|yZVZR&BQ4>@<}2>;?j4w8CVMj7JINM$hDU$IPXfuU z;g8C_7i?m zQ(aqIZFnHJf$4w}X(C-9!|d^Am=}0clQKl65<&DTk%eA!r8i3s5`#H3+j`1-yvvo^ zVE!lrX@P%MsflvF{F0FXADfh&(`?QrrK5} z5Qsxo6(x|)YzBEf9kgVSww+1e5`nq)_U^xMT#bf#9y$`e49=z^3^%-hm`MArL#7c- zAgh*ebR7m6ga4Z_&SqR#Rn$}AJ|cVYY7r>PE-m*2J?_#@fpVi-rL*hZrX zu}Co#5n@eZ7)ppWh#`XzpE-skLQbV#ZwF!LtX@xtyJJtG8t7ik5PaY13rCgEO%(UQ zW6&!AaWvnkgXl&TcHv-iL2@uq+K#PupA#6>&TZ*JnYl7KuXuFONB#s3>B6Bdld zB`?F=vCJK3w{r8|R!%`u9|9U8LhMEvd>R(o6AgdN$;V4r&UAZT<1eTu5tDipoNSo3%SM=3pvK|7V?a03&V^W3&V{Q aEEE_gS|~K8S|~D3vQTWCY+)pqO3%OG_xN}K diff --git a/doclet/ReferenceGenerator/bin/writers/BaseWriter.class b/doclet/ReferenceGenerator/bin/writers/BaseWriter.class index 471ce00670b0be7f652327ee68d473ace6568839..969096f16ed91b0b9ba54f6390bcf7cab5e1ac1d 100644 GIT binary patch literal 12931 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 literal 14011 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 delta 46 xcmeyYd`fx45oSe2Jw1I0Dk#cNPAx9Z%uClTPfaS$EJ@YRD$dW_%*XPS7XW**5L*BM diff --git a/doclet/ReferenceGenerator/bin/writers/FieldWriter.class b/doclet/ReferenceGenerator/bin/writers/FieldWriter.class index 3addad6fddb4ef5eba92035d3f44d7d020b5840c..5a34bd21b94d42854503c2636038650bc6d45410 100644 GIT binary patch delta 64 zcmZ1}eMx%5TV_VD$?uqDbd&S*N>cMm^ovr{Qj1dal2eQIONtWnigOZ6GV}9_^;7fo T3ySiA!o`_+>6`gjW^)1nI-?lg delta 23 fcmca4y;6F^TV_VZ$?uqDSh9-q^ER8a%;p3DZD9yx diff --git a/doclet/ReferenceGenerator/bin/writers/FunctionWriter.class b/doclet/ReferenceGenerator/bin/writers/FunctionWriter.class index d031cd27f8a128250b7d4fa5044e31388704b973..2829364768ac3c9ba38ce90a1ae1fdf15b4e5f71 100644 GIT binary patch delta 64 zcmaDV(kHqhmWk18avYP4ZgPHJNorn+eo<;#YEf!la%!=DNl{{6aZX}MW`16=erle6 SK~X+XxHvN}eRCbtb9MmuMi^fJ delta 23 ecmeAZeJZjcmWfeuavYNkOIC4y-sa^@&)ET6)HEfrjb$}JO(F=z7(?9J#=#T=Y11y!+7^+t>PiOF z`yfqvpJ}0IN)PvLAVFL$P470no8E1DpXq(1rAdSPW_Kk^w#b*y*6i#YZ~p)N$NYQm z#k1!DtQGzcw!xOjhfoJQh^;6{jECTNUk<2|gAx-V1l^HCA&xw!0nf$rRPXsAyZ|p$ z&5Km?;t*bfmr5KCVLon=cv%RI>UnDrx8dayuLvOmTf-~W^Hr*ObqKG)YeRS)Uay)r zXn11~Z^G>jcr)H2aYVyW4R2M_y-ma0CEgK2D{j&7&Jf;(JCvaBZoo0TM>X%&@IDRi z*D$HX{eXrKDiJ@V;lt|r5w-ZE4fq&79>SeCu9_1X?$U6#T7FVPQNt+>r`6&!8qTWG zbL!<25}%YfFQDbkL?LBm^8)kx_8SL`*mxn8j$Lo$$NG)jdV%0jYBXyU#%)vJ+Sw~M zxI<|pI~p4**s1L3`q?8Ji6awfBcC^UPGbd1mu(w|`cnAMDrpEFe8PExhg*q1gXJ|!@3)GX}o@9WKuSa!xx zLENC@X&93Dl8!IqULE^! zGwIjy6?|34*YI^6-@rE|zNO>axKE%%oiq`f$fRRA!_J#_o{plP-BxxaH9BrP<}H(? z<2y?5#g;wl?8$TQP}lDAd`a|_737riv1eTQiw$HUuud?&7m)GW(CaXr5-Z(3hl_OE0g8Y*E zGDOESj7HD1wi=0oWgnup%4ZL*NyL&&jHN}Cy{7rfyBcdw(-j;)a*`D@2BXAMnR#Z; zElJ8_W~26@3*s#B)M*2x)iHia_L2 ztGR6XG{F@x%;d@uR4ox0+PQ-{mWjr>m0W*NLGGA3c7w9II?g;`q{o>W1cqwRQE{Vf z-?yLDm0M8MMytGiz14L0oU+9=mDrU?E`i=iO#mk>-9oP0N~g;eo-c3NM4s;%!U9hDr;SntS_L4sutYl`zs>PP!LZH+%D-ZH?MSrYCKxM0iQ4dKNA-3bzvH z)O>lZ6jPbA=9cpH&=^w$kwl6Kg2YyjD}PGmhs}MqIU;c7W0ID~2OX3?%gPC?e{`D5 zB~oq1mXWc|cFG*7xZbzgR%XZ=w^gptos$OLJCL6MkA7ImrZtVD3S-wU>Hycc)Ocq0 zs3j*>@S|lLzwdnfu?U2~Q`oD+Q`xfeE58r$okd{PJIg+fN{;Qo5Zj%6>qb5QfOT!B zAllBMZqF&ypM;NHKf8gGkkeg_-5^IpC(+Qhs{Iu7Ti8@ANnN8-2&n7;W^gjtANzfg2NZ(9F1B+}cM)?XhK0C*#e~_7JuavS zQ{Nz$+;JM0^|$+qxLm}2?M2KRh^{Ik9QRFPP23;x7qMUxt!{7OBpw&{pTOdCh*0Jw z;iW}1adlG>%ZgZj{Ir@@Tbkp6NFcl-;yZ!IpTQMA+=C~?C5Kj44{2?8!xz3XB8#|c z*y*=KG}WI(i0e7rcARqRlzl0`k=1i0zme55hD8|0?Kr|OTvypm2uyLAUt+JsjS^2M zY0rR=xT#m-nfyI#=@bnrtL7yPiG6BSB0zqUFxe_A-o&S$&yC?#{i{x+ooYr0qG!+{ za1?Fq#Dt@j&*OsBHAP5cQ}~H4A^nq6_qE?i1XsGbsCxvuBiP78l-~8RQO=IhChnP0 zo><2nD@a8{_-aLnhptEtuXcfpSmXLgic5V2Si~Q{HrP^d8rF{xXYTjht>5#&0q+_2 zMSS74ROv~IX!bkVU#I%*O8#qx>1EdnC_|p_4AghZM%frRhMtJOQLc__rx8~sT7MML z5@0YA46luF#zhQ^gF_Q5_f!Ke?ozv$-j}sidNs?4n?s z)jIBy&d%;=5nB}Cw2NPX`YDF3=2$f?k&(zc|CV5l{4h3OARhubJlo}m9^iLEeN%~- bDA{nOQB3rB2Wp;VuEg%SW!siSAkF^=oXRE| diff --git a/doclet/ReferenceGenerator/bin/writers/LibraryWriter.class b/doclet/ReferenceGenerator/bin/writers/LibraryWriter.class index 06c2e443c9837ac8222fff72594eb9a8933c6261..2c3a41d5ed755cf979f26d6aa25d1eb20edee8a4 100644 GIT binary patch delta 1019 zcmbu8OLG)e6vuyeUboZfkkA1$lNTTm;v|zsK!FgABtak$o)GUE;gPwxS+Xca4F7o+2k{>#BjBlu5qR{pPTf=p*_rKzA)Lzmzvq{?~g@2>W56Z zG&fPIL=RNInvMQegYH+FuQlIju4!BeuyEL~7#$jN8f&Q%6umGk`3r?R-dtF!dQLI$ ztDawVD&BRk;`w5BsukA{%Wkz4_@U$Zj>Qmt7X7>zT}*T(^9)2mBD?dN#T-S8c|42j zc#6dAkW^r?zzs!5^di-3ZI}LTV`M9ReYIZd0(VS z(JP??`3+RwPCO?0kkoTpo{*l|AoGaSLv&p>W;Rx7dW2pVf5id87809uqBIAQ*Qn%? zf6z#*+DXwQF3%)<;5SS~jplo#*8d}0(+!K=Qe(^16I$iOw!y)tsrdsnw%WEpjrMZ| zds~g|KVlV**zX8;4=ZnHACp_7JO4H+{|iZRFEm2L_A8yD%hl+TGrFT?-M!c&>3eg! zq295EIc(&N8oR#DsI|>M*QM~ExX-%$jYfCF7;XPDuK7@N*vP&nr#Yh3rZ^bVvF2#Q SRM%>T<2f9AMdqdaXx;#laMW4= literal 2168 zcmaJ?*;gA?82??e+%OCUQc?(%E^2MUHWn>ff~{;-l+A)rpe~bS3-%up-MP|G)G3lIb;RV1o<$6oG`V*p)&-sR)*p9 zM8?W1PSI3W)jKL3DKlzjP0eYeRwhMEg|!?*bV6JzhHB=NS=ZLh99`AvW>(u+uyt3n zg`Rcq%TXruw5{5kz8ghX zHLnyF_xHAvj`XNkjdtO9)J= zg*i2CXdYA{FE)m=iKn5Joab2OSmQ7_@*E~5f}zQiy`kk*GG^v(<_!uYQSFeB&Tv>V zRnTP_y-*lVd9t>n97adR3%JB^(o4!=G{^%P1>BZl!;#^FV5_;+OD@SM;toU0(M%2( zbt9|UGS;!dz!VvqxJ@aqm>yQ0N9pS7?N$6=!L~A*<4{07>ss2O8c}{rHBVL9oG4fJ;U=$(_5)ayp=kP)`%Du-b!Nu41M%n zgBR)DVPcjL?WdDbI%Bk6=-dI@M$I3n-$h_?2f+uZ*+$6QhiT6rAhbn{3@;O{N6kK( z!8l$48tCu}27HaI4k6SM%Qi`O{e}ob3AOhS+&ZwA7W|uNT?z8!F6zm^iSF*bV79M> zhG-*^5}Kwu%Qw-JbkO4;K1B1ch;{yg<`Pa3L(5{9*zBP7A>yR9jbR`d5AOAc0{!7w zI2QT|o$+8S+&92?(N1v1lc}4osp_@j%xyy*ZxKL9|EEVLm2jf!5TpyAz)IwIJelfgY%Q! xB|J0LbJX3Avb%9!!n4umO1N+j0nfv~A1B}p0{e)U9V3@UI7aCw9BUJX@jn;!CuINt diff --git a/doclet/ReferenceGenerator/bin/writers/Shared.class b/doclet/ReferenceGenerator/bin/writers/Shared.class index 951921d58dfbe383670dd7bfe86b6001782f929d..c8a7cb8202795a510a9049398a44070a82ee3949 100644 GIT binary patch delta 1607 zcmZuvS!^3s6g`u~dC&HUj1qx+f3gQz935g#heh~ML$6z5#qkHZ>cR6p~eZL<4 z`-1AezxT`nScIQL=*PIkh9J6etHf=Lw@ci?c&Ef&jCV`i!?;o6UdH<*HZi&qn;ExA z+|T%c#Dk0vNj%K>2%AR*9t$CfaSpb!c|2Gp`-H@{5aE+dJtgoo2jc?ULpT!SY@U&L zmhrhDp2rS}7ebi8ixMyKxR)h%hB1j(!kEG|GrKsPVe=}R*Vs(6*&W6nOiR2j@CJ*# z8JdsdF&iTD7RPfEd&77eGZOCzygRkTm}zsf?fuo|SYe=jonBSZBMPTtz<{!~9@1lu zu9&%^!fDKjY^Gc;YDeL84kOesL>;=K&Ae7PlgW;vmCqF$>9d$_FO+hl+EzH5qd?zk zr$kfF;UMT#b*Ws;Ih;P18O4M3SdLicvdoEsnJ=y#CYfa%F74|}*S>Pa%4^#$n4=4+ z%`P}PowrO!n@;-Qv)O5{g)MW6W;jUE4YCk>u7(#ql@>+PS9?~W~q!oHdKM4a% zJbx+G(H1?Q*5)BC%tP9hhqNINX)7MmIy|I1Bm`e0StA9y$A-ZMUui?UfTZZz5p%J7 zcw~dP1ebdLM5HHs84YNK5hG$H2AL)zPG}GYQqySNNe+o%sA)P-PhXB4ce~xuq*zre zbu-b_NWR9?hy)#@g|I!x-2~sPxe4GUmC?~68QfQ99k=_ z-FktF*EClQ))lX4su-**7JbES9Z6C0e{^q0moR<)7vilNzbV!w%6>^EdWd^$tW#X+ zmt|u~QSozSs$l!y?2J=S~8*+iG9;s(#R5=n8RFTOEh z1r6NfzpFpy9hbQow{R8BSmdwzu-?RpyKzzrX15~HHqo0nxglzu@E(A#8I1t{0QrMA A)Bpeg literal 5224 zcma)A349b+8UGL2WG0&lNtV#i0wsvlWCN@UY72-BA!uqKk)-8l6^Gp+4D8Otoe4*) z)>~_}9`&GA>n$Et>9L^{#anE>@2lSRKI(nj`v2zGOm+v6AG~kg_rBx*-uvGFJ@(!Q z?>-G+jiRRUWE|CSQ!|$0W({u;`9=+I5_yY;H;a6WhPR4*n})ZGe20d2ihP%bVm*x%)ccv*T(wSCqLOMrP+?B>M9F^vz zhPy?cYQ~4~VGXC#_y|6#;bRi*;~GBEf=}X8E%-Ffh~_iWy+@jRrTMHhXQcUD3qFrC z8or?7i<0C^X?mZfo1p$Bg2;KF;w%IHDMdxRGGPYlWf-41K2>nHfPG4obonVWi#(NS|ww`jM=sBwTkB8Vb8Q(qEpb}nWf31;l*v*&BF$jvs9LyFHRNWs@DCkW5*&l z+K%NCiLy(9E-Nx>0$wJp_1;J%wBU@ut)_qq9i<{uOi3yQ*`#_McFGgEL#y+-0)a-h>s0(i#r-ONN|Gcwk{7FqHX3gA zKwEM$)9yZJs#q8)S3E8CggGwN4z=T0>zq`9cBF(Azy^cTNk1GD8MGWiM5tl{J3zM5veN1rHqkNHgv^R|seXENRQ}ZNDicyhQeFJYFddCq3 zi{SIt(sR-q9}9WM_6*+M_C$EOE4YvsQk`pX^9x-lxZv!gy!>tdou!3=$w4U=J4GVH zU0IijS141ETK(6BPq{-jNocPjFTA!Hyy5tw1hoE8fOSDF)@Y1dS~|e9L1Znqd1$Em zh+Glg$FmDPxm<`;t}l5cx|0Ohe~8acz5p1o#zDdI|0ga3E!hR_ZhUF!cvBL*d6F* z|2XvuCfE{iJ3sfq3f(#=We$zmJJBF^V!1zYxG@?&fMV#KVNyxkl8Me7-jgBTtGEDycl37j zgpe}5#L^ewnMRff7e^zat&XhN9v@mcdnf`@hRgU;8*w0u10X@MdW14n1vF~`o1-uX z6X(+$&F4_Edt2mwIMKZ=azB#n-VwQ9o#@^XxnENqPT1WJu1oFiJ~KJryeQwZssZDR zHZRKe?CNkrzOICP*Cyv{jq*L`e+6t!2>9IOfGtr#K2gH@N5Ri|UvpX~=IJ^Ka z3>}uRzNCWZu^Jclox~~yCy`SyjYr-}wVd7;RgL>XH=M+y=HT=#P*cZ{Y7pyy z6B;ombE&Yvi>r=9q2p?1c(j6>q4Q(4f}6-&cVZDcYl4(v?=gbnu~ig7+!W)sGVDum z9oyPNu^@u`Qd}Pn&m4w@WWs25UshfH{YdfrlB;8<_iKP?XUc57+nrU1zGj;-N zx2%}Py6v+q)+bm5d7JTa+z{frk69a;_r|;M_~E|PG&U$(nez!-R%EAf>DFVoW^F14 zX(NMjKnRY6!h!SYGQiJc*miEiLEo_V+=fr2;mYHL)`Ii++g86XH}YpF=^x map = new HashMap(); - map.put( "anchor", anchor ); - - related.add( anchor ); - } catch (XPathExpressionException e) - { - e.printStackTrace(); - } - } + related.add( tag.text().concat("_") ); } return related; diff --git a/doclet/ReferenceGenerator/src/writers/LibraryIndexWriter.java b/doclet/ReferenceGenerator/src/writers/LibraryIndexWriter.java deleted file mode 100644 index 4d32d75ed..000000000 --- a/doclet/ReferenceGenerator/src/writers/LibraryIndexWriter.java +++ /dev/null @@ -1,130 +0,0 @@ -package writers; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; - -import org.w3c.dom.Document; -import org.xml.sax.SAXException; - -import com.sun.javadoc.ClassDoc; -import com.sun.javadoc.MethodDoc; -import com.sun.javadoc.PackageDoc; -/** - * Writes the index page of libraries. - * Also grabs the xml files in lib/dir/events - * and sends them to the XMLReferenceWriter - * - * @author davidwicks - * - */ -public class LibraryIndexWriter extends IndexWriter { - HashMap sections; - ArrayList classes; - ArrayList events; - TemplateWriter templateWriter; - - public LibraryIndexWriter(PackageDoc doc, String outputPath){ - sections = new HashMap(); - classes = new ArrayList(); - events = new ArrayList(); - - templateWriter = new TemplateWriter(); - writePartials(doc, outputPath); - } - - private void writePartials(PackageDoc doc, String outputPath){ - for( ClassDoc cd : doc.allClasses() ){ - addItem(cd); - } - } - - private void getXMLInformation(String path){ - - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - factory.setNamespaceAware(true); - DocumentBuilder builder; - Document xmlDoc = null; - try { - builder = factory.newDocumentBuilder(); - xmlDoc = builder.parse(path); - } catch (ParserConfigurationException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (SAXException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - System.out.println("WARNING: no index.xml file found at: " + path ); - return; - } - - XPathFactory xpathFactory = XPathFactory.newInstance(); - XPath xpath = xpathFactory.newXPath(); - try { - String name = (String) xpath.evaluate("//libraryName", xmlDoc, XPathConstants.STRING); - String desc = (String) xpath.evaluate("//libraryDescription", xmlDoc, XPathConstants.STRING); - - sections.put("libraryname", name); - sections.put("librarydescription", desc); - } catch (XPathExpressionException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - private String explode(ArrayList array){ - String ret = ""; - Collections.sort(array); - for(String s : array){ - ret += s + "\n"; - } - return ret; - } - - public void write (String path) throws IOException { - templateWriter.write("library.index.template.html", sections, path+"index.html"); - } - - public void addItem (ClassDoc doc) { - ArrayList> methods = new ArrayList>(); - HashMap cmap = new HashMap(); - - HashMap map = new HashMap(); - map.put("name", getName(doc)); - map.put("anchor", getLocalAnchor(doc)); - methods.add(map); - - for(MethodDoc m : doc.methods()){ - if(Shared.i().isWebref(m)){ - HashMap methodMap = new HashMap(); - methodMap.put("name", getName(m)); - methodMap.put("anchor", getLocalAnchor(m)); - methods.add(methodMap); - } - } - - cmap.put("methods", templateWriter.writeLoop("related.partial.html", methods)); - cmap.put("classname", getName(doc) + " Class"); - cmap.put("classdescription", getBriefDescriptionFromSource(doc)); - - classes.add(templateWriter.writePartial("library.section.partial.html", cmap)); - } - - public void addEvent(String name, String anchor){ - HashMap map = new HashMap(); - map.put("name", name); - map.put("anchor", getAnchorFromName(name)); - events.add(templateWriter.writePartial("related.partial.html", map) + "\n"); - } -} diff --git a/doclet/ReferenceGenerator/src/writers/LibraryWriter.java b/doclet/ReferenceGenerator/src/writers/LibraryWriter.java index 2fcc5e112..6f931ad10 100644 --- a/doclet/ReferenceGenerator/src/writers/LibraryWriter.java +++ b/doclet/ReferenceGenerator/src/writers/LibraryWriter.java @@ -10,11 +10,12 @@ import com.sun.javadoc.PackageDoc; public class LibraryWriter extends BaseWriter { PackageDoc doc; String pkg; - LibraryIndexWriter indexWriter; String dir; static TemplateWriter templateWriter; static ArrayList writtenLibraries; + + private String libDir ="../../../processing-website/content/references/translations/en/"; public LibraryWriter(){ if(templateWriter == null ){ @@ -38,10 +39,12 @@ public class LibraryWriter extends BaseWriter { String[] parts = doc.name().split("\\."); String pkg = parts[parts.length-1] + "/"; - dir = jsonDir + "libraries/"+pkg; + if (pkg.equals("data/") || pkg.equals("opengl/")) + dir = jsonDir; + else + dir = libDir + pkg; Shared.i().createOutputDirectory(dir); - indexWriter = new LibraryIndexWriter(doc, dir); //grab all relevant information for the doc for( ClassDoc classDoc : doc.allClasses() ){ @@ -58,19 +61,4 @@ public class LibraryWriter extends BaseWriter { } } - - private void writeRemainingXml( String xmlDir ) - { - File directory = new File( xmlDir ); - File[] files = directory.listFiles(); - for( File f : files ) - { - if( f.getAbsolutePath().endsWith("xml") ) - { - // try writing everything (will not overwrite any existing docs) - //XMLReferenceWriter.parseFile( f.getAbsoluteFile(), dir, indexWriter ); - } - - } - } } diff --git a/doclet/ReferenceGenerator/src/writers/Shared.java b/doclet/ReferenceGenerator/src/writers/Shared.java index 9cfc261d6..de1a0178b 100644 --- a/doclet/ReferenceGenerator/src/writers/Shared.java +++ b/doclet/ReferenceGenerator/src/writers/Shared.java @@ -4,12 +4,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - import org.w3c.dom.Document; -import org.xml.sax.SAXException; import com.sun.javadoc.Doc; import com.sun.javadoc.ProgramElementDoc; @@ -32,7 +27,7 @@ public class Shared { private String templateDirectory = "templates"; private String exampleDirectory = "web_examples"; private String includeDirectory = "include"; - private String jsonDirectory ="../../../processing-website/json/"; + private String jsonDirectory ="../../../processing-website/content/references/translations/en/processing/"; boolean noisy = false; public ArrayList corePackages; @@ -183,29 +178,6 @@ public class Shared { f.mkdirs(); } - public static Document loadXmlDocument( String path ) - { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - factory.setNamespaceAware(true); - DocumentBuilder builder; - Document doc = null; - try { - builder = factory.newDocumentBuilder(); - doc = builder.parse( path ); - } catch (ParserConfigurationException e) { - System.out.println("Failed to parse " + path ); - System.out.println( e.getLocalizedMessage() ); - } catch (SAXException e) { - System.out.println("Failed to parse " + path ); - System.out.println( e.getLocalizedMessage() ); - } catch (IOException e) { - System.out.println("Failed to parse " + path ); - System.out.println( e.getLocalizedMessage() ); - } - - return doc; - } - public void createBaseDirectories(){ File f = new File(getLocalOutputDirectory()); f.mkdirs();