reviewer needed: Generating about, authors... from NEWS, AUTHORS....
Dr Andrew John Hughes
ahughes at redhat.com
Thu Mar 24 07:10:24 PDT 2011
On 17:08 Tue 22 Mar , Jiri Vanek wrote:
> Attached patch is fixed the one from week ago upon current head with
> screen-shots of about dialog (html code can be guessed from html templates).
>
> I still think that using of inner generating (public or unpublic) class
> is better solution then migrate NEWS and similar to xml or then using
> sed with its escaping of escaping....sequences.
>
What are all the attachments for?
I think the best solution may be to XMLify the AUTHORS and NEWS file, then
process them into text and HTML. The tests patch suggests we may be
introducing an xsltproc dependency anyway so why not use it for this too?
Let's reassess after that patch.
> diff -r a640b4e4d226 Makefile.am
> --- a/Makefile.am Mon Mar 21 17:27:20 2011 +0100
> +++ b/Makefile.am Tue Mar 22 16:45:50 2011 +0100
> @@ -308,6 +308,11 @@
> ${INSTALL_DATA} -D $${files} \
> $(NETX_EXTRA_DIST_DIR)/$${files}; \
> done)
> +#generate news and authors to be used by javaws -about
> + java -cp $(abs_top_builddir)/extra-lib net.sourceforge.javaws.about.Generator -i=$(abs_top_builddir)/NEWS -t=${NETX_EXTRA_DIST_DIR}/news.html -o=${NETX_EXTRA_DIST_DIR}/news.html
> + java -cp $(abs_top_builddir)/extra-lib net.sourceforge.javaws.about.Generator -i=$(abs_top_builddir)/README -t=${NETX_EXTRA_DIST_DIR}/readme.html -o=${NETX_EXTRA_DIST_DIR}/readme.html
> + java -cp $(abs_top_builddir)/extra-lib net.sourceforge.javaws.about.Generator -i=$(abs_top_builddir)/AUTHORS -t=${NETX_EXTRA_DIST_DIR}/authors.html -o=${NETX_EXTRA_DIST_DIR}/authors.html -b="<BR/>"
> + rm $(NETX_EXTRA_DIST_DIR)/../Generator.class
> mkdir -p stamps
> touch $@
>
> diff -r a640b4e4d226 extra/net/sourceforge/javaws/about/Generator.java
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/extra/net/sourceforge/javaws/about/Generator.java Tue Mar 22 16:45:50 2011 +0100
> @@ -0,0 +1,186 @@
> +package net.sourceforge.javaws.about;
> +
> +import java.io.BufferedReader;
> +import java.io.BufferedWriter;
> +import java.io.File;
> +import java.io.FileInputStream;
> +import java.io.FileOutputStream;
> +import java.io.IOException;
> +import java.io.InputStreamReader;
> +import java.io.OutputStreamWriter;
> +
> +/**
> + * This class is more controlable replcaement for this bash script
> + *
> + * CONTENT=`cat INPUTPLAINTEXT` (or CONTENT=`cat INPUTPLAINTEXT | sed s/" "/ / | sed s/$/"<br>"/`)
> + * cat template.html | sed s/$WHAT_TO_REPLACE/$CONTENT/ > templateWithContent.html
> + *
> + * But because sed really don't like escape sequencing of escape sequencing, and plaintexts can really conatins anything, this class is usefull.
> + *
> + *
> + * @author jvanek
> + */
> +public class Generator {
> + public Generator(){
> +
> +
> +}
> + public String sayHello(){
> + return "hello";
> + }
> +
> + public static void main(String[] args) throws IOException{
> + if (args.length==0){
> + System.out.println("-b=? -s=? -m=? -i=inputfile -t=inputtemplate -o=outputfile");
> + System.out.println("-b - optional. end of lines in input ar ereplaced by value . Default is <br/>");
> + System.out.println("-s - optional. spaces in lines in input are replaced value. Default is ");
> + System.out.println("-o - optional. outputfile. Defoult is stdout.");
> + System.out.println("-i - optional. inputfile. Defouult is stdin.");
> + System.out.println("-r - optional. replacement. Default is [%content%].");
> + }
> + if (args.length<1){
> + System.out.println("at least one arg is expected - template");
> + return;
> + }
> +
> + Generator g=new Generator();
> + for (int i = 0; i < args.length; i++) {
> + String s = args[i];
> + s=s.replaceAll("^-*", "");
> + String[] ss= s.split(" *= *");
> + String key=ss[0].toLowerCase();
> + String value=null;
> + if (ss.length>1){
> + value=s.substring(key.length()+1);
> + value=value.replaceAll("^ *= *", "");
> + }
> + if (key.equals("b")){
> + if (value==null){
> + value="<br/>";
> + }
> + g.setEnding(value);
> + }
> + if (key.equals("s")){
> + if (value==null){
> + value=" ";
> + }
> + g.setSpacing(value);
> + }
> + if (key.equals("i")){
> + if (value==null){
> + System.out.println("input file without arg. ignored");
> + }else{
> + g.setInput(new File(value));
> + }
> + }
> + if (key.equals("r")){
> + if (value==null){
> + System.out.println("replacement without arg. ignored");
> + }else{
> + g.setReplacement((value));
> + }
> + }
> + if (key.equals("t")){
> + if (value==null){
> + throw new IllegalArgumentException("Fatal - template file cant not be set");
> + }
> + g.setTemplate(new File(value));
> + }
> + if (key.equals("o")){
> + if (value==null){
> + System.out.println("output file without arg. ignored");
> + }else {
> + g.setOutput(new File(value));
> + }
> + }
> +
> +
> +
> +
> + }
> +
> + g.proceed();
> +
> + }
> + private File input;
> + private File template;
> + private String ending;
> + private String spacing;
> + private String replacement="[%content%]";
> + private File output;
> +
> +
> + private void setEnding(String value) {
> + ending=value;
> + }
> +
> + private void setSpacing(String value) {
> + spacing=value;
> + }
> +
> + private void setInput(File file) {
> + input=file;
> + }
> +
> + private void setTemplate(File file) {
> + template=file;
> + }
> +
> + private void setOutput(File file) {
> + output=file;
> + }
> +
> + private void proceed() throws IOException {
> + String inputS=readFile(input,true);
> + String templateS=readFile(template,false);
> + save(output,templateS.replace(replacement, inputS));
> +
> + }
> +
> + private String readFile(File input,boolean replace) throws IOException{
> + StringBuilder sb=new StringBuilder();
> + BufferedReader br=null;
> + if (input!=null){
> + br=new BufferedReader(new InputStreamReader(new FileInputStream(input), "utf-8"));
> + }else{
> + br=new BufferedReader(new InputStreamReader(System.in, "utf-8"));
> + }
> +while(true){
> + String s=br.readLine();
> + if(s==null) break;
> + if (replace){
> + if(spacing!=null) s=s.replaceAll(" ", spacing);
> + sb.append(s);
> + if (ending==null)sb.append("\n"); else sb.append(ending);
> + }else{
> + sb.append(s).append("\n");
> + }
> +
> +}
> + return sb.toString();
> + }
> +
> + private void save(File output,String s)throws IOException {
> + BufferedWriter br=null;
> + if (output!=null){
> + br=new BufferedWriter(new OutputStreamWriter(new FileOutputStream(output), "utf-8"));
> + }else{
> + br=new BufferedWriter(new OutputStreamWriter(System.out, "utf-8"));
> + }
> + try{
> + br.write(s);
> + }finally{
> + br.flush();
> + br.close();
> + }
> + }
> +
> +
> +
> +
> + private void setReplacement(String value) {
> + replacement=value;
> + }
> +
> +
> +}
> diff -r a640b4e4d226 extra/net/sourceforge/javaws/about/Main.java
> --- a/extra/net/sourceforge/javaws/about/Main.java Mon Mar 21 17:27:20 2011 +0100
> +++ b/extra/net/sourceforge/javaws/about/Main.java Tue Mar 22 16:45:50 2011 +0100
> @@ -51,24 +51,29 @@
> public class Main extends JPanel {
>
> private final String notes = "/net/sourceforge/javaws/about/resources/notes.html";
> - private final String apps = "/net/sourceforge/javaws/about/resources/applications.html";
> private final String about = "/net/sourceforge/javaws/about/resources/about.html";
> + private final String news = "/net/sourceforge/javaws/about/resources/news.html";
> + private final String readme = "/net/sourceforge/javaws/about/resources/readme.html";
> + private final String authors = "/net/sourceforge/javaws/about/resources/authors.html";
> +
> JTabbedPane tabbedPane;
>
> public Main() throws IOException {
> super(new BorderLayout());
>
> HTMLPanel notesPanel = new HTMLPanel(getClass().getResource(notes));
> - HTMLPanel appsPanel = new HTMLPanel(getClass().getResource(apps));
> HTMLPanel aboutPanel = new HTMLPanel(getClass().getResource(about));
> -
> -
> + HTMLPanel newsPannel = new HTMLPanel(getClass().getResource(news));
> + HTMLPanel readmePannel = new HTMLPanel(getClass().getResource(readme));
> + HTMLPanel authorsPannel = new HTMLPanel(getClass().getResource(authors));
>
> tabbedPane = new JTabbedPane();
>
> tabbedPane.add("About NetX", aboutPanel);
> - tabbedPane.add("Applications", appsPanel);
> tabbedPane.add("Notes", notesPanel);
> + tabbedPane.add("News", newsPannel);
> + tabbedPane.add("Readme", readmePannel);
> + tabbedPane.add("Authors", authorsPannel);
>
> tabbedPane.setPreferredSize(new Dimension(550,410));
> add(tabbedPane, BorderLayout.CENTER);
> diff -r a640b4e4d226 extra/net/sourceforge/javaws/about/resources/authors.html
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/extra/net/sourceforge/javaws/about/resources/authors.html Tue Mar 22 16:45:50 2011 +0100
> @@ -0,0 +1,5 @@
> +<html><body><h1>Authors</h1>
> +<div align="center"><img src="jamIcon.jpg" alt="Jam Icon" width="87" height="84" align="Center"/><br/>
> +[%content%]
> +</div>
> +</body></html>
> diff -r a640b4e4d226 extra/net/sourceforge/javaws/about/resources/news.html
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/extra/net/sourceforge/javaws/about/resources/news.html Tue Mar 22 16:45:50 2011 +0100
> @@ -0,0 +1,5 @@
> +<html><body><h1>News</h1>
> +<pre>
> +[%content%]
> +</pre>
> +</body></html>
> diff -r a640b4e4d226 extra/net/sourceforge/javaws/about/resources/notes.html
> --- a/extra/net/sourceforge/javaws/about/resources/notes.html Mon Mar 21 17:27:20 2011 +0100
> +++ b/extra/net/sourceforge/javaws/about/resources/notes.html Tue Mar 22 16:45:50 2011 +0100
> @@ -4,45 +4,7 @@
> <title>Release Notes</title>
> </head>
> <body>
> - <br>
> - <table cellpadding="2" cellspacing="2" border="0" width="100%">
> - <tbody>
> - <tr>
> - <td valign="Top" width="15"></td>
> - <td valign="Top" width="100%">
> - <table cellpadding="0" cellspacing="0" border="0" align="Center">
> - <tbody>
> - <tr>
> - <td valign="Middle" align="Center" nowrap="true"><div align="Center">
> - <img src="jamIcon.jpg" alt="Jam Icon" width="87" height="84" align="Center">
> - </div>
> - </td>
> - </tr>
> - <tr>
> - <td valign="Middle" nowrap="true" align="Justify">
> - <div align="Center">
> - <b>Lillian Angel</b> <br>
> - <b>Deepak Bhole</b> <br>
> - <b>Thomas Fitzsimmons</b> <br>
> - <b>Andrew John Hughes</b> <br>
> - <b>Matthias Klose </b> <br>
> - <b>Francis Kung</b> <br>
> - <b>Omair Majid</b> <br>
> - <b>Jon A. Maxwell</b> <br>
> - <b>Andrew Su</b> <br>
> - <b>Joshua Sumali</b> <br>
> - <b>Mark Wielaard</b> <br>
> - <b>Man Lung Wong</b> <br>
> - </div>
> - </td>
> - </tr>
> - </tbody>
> - </table>
> - </td>
> - </tr>
> - </tbody>
> - </table>
> -<br>
> +
> <big><b>Release Notes</b></big>
> <br>
> <table cellpadding="0" cellspacing="0" border="0">
> diff -r a640b4e4d226 extra/net/sourceforge/javaws/about/resources/readme.html
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/extra/net/sourceforge/javaws/about/resources/readme.html Tue Mar 22 16:45:50 2011 +0100
> @@ -0,0 +1,8 @@
> +<html><body><h1>Readme</h1>
> +<pre>
> +[%content%]
> +</pre>
> +<div>
> +try <b>http://www.sweethome3d.com/</b> or <b>http://java.sun.com/products/javawebstart/apps/notepad.jnlp</b> as examples of powers of IcedTea-web
> +</div>
> +</body></html>
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37
More information about the distro-pkg-dev
mailing list