Author: chatellier Date: 2009-02-17 13:34:45 +0000 (Tue, 17 Feb 2009) New Revision: 267 Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java Log: Fix some checktyle Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java 2009-02-17 13:29:30 UTC (rev 266) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRST.java 2009-02-17 13:34:45 UTC (rev 267) @@ -253,8 +253,9 @@ if (!fileRST.exists()) { System.out.println(_("dontExist")); cheminRST = ""; - } else + } else { done = true; + } } done = false; String type = ""; @@ -263,8 +264,9 @@ System.out.println(_("outputFormat?")); type = lire(); if (type.matches("xhtml|docbook|xml|html|xdoc|rst|pdf|odt|rtf") - || type.length() == 0) + || type.length() == 0) { done = true; + } } String cheminXSL = ""; if (type.length() == 0) { @@ -275,9 +277,10 @@ File fileRST = new File(cheminXSLtmp); if (cheminXSLtmp.equals("")) { - if (cheminXSL.length() != 0) + if (cheminXSL.length() != 0) { cheminXSL = cheminXSL.substring(0, cheminXSL.length() - 1); + } done = true; } else { if (!fileRST.exists()) { @@ -289,10 +292,12 @@ System.out.println(_("other?")); other = lire(); } while (!other.matches("y|n|o")); - if (other.equals("y") || other.equals("o")) + if (other.equals("y") || other.equals("o")) { cheminXSL += ","; - else if (other.equals("n")) + } + else if (other.equals("n")) { done = true; + } } } Modified: jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java =================================================================== --- jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-02-17 13:29:30 UTC (rev 266) +++ jrst/trunk/src/main/java/org/codelutin/jrst/JRSTLexer.java 2009-02-17 13:34:45 UTC (rev 267) @@ -54,17 +54,17 @@ public class JRSTLexer { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(JRSTLexer.class); + private static Log log = LogFactory.getLog(JRSTLexer.class); - static final public String BULLET_CHAR = "*" + "+" + "-"/* + public static final String BULLET_CHAR = "*" + "+" + "-"/* * + "\u2022" + * "\u2023" + * "\u2043" */; - static final public String TITLE_CHAR = "-=-~'`^+:!\"#$%&*,./;|?@\\_[\\]{}<>()"; + public static final String TITLE_CHAR = "-=-~'`^+:!\"#$%&*,./;|?@\\_[\\]{}<>()"; - static final public String DOCINFO_ITEM = "author|authors|organization|address|contact|version|revision|status|date|copyright"; + public static final String DOCINFO_ITEM = "author|authors|organization|address|contact|version|revision|status|date|copyright"; public static final String ADMONITION_PATTERN = "admonition|attention|caution|danger|error|hint|important|note|tip|warning"; @@ -72,13 +72,13 @@ // Title Elements // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - static final public String TITLE = "title"; + public static final String TITLE = "title"; // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Bibliographic Elements // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - static final public String DOCINFO = "docinfo"; + public static final String DOCINFO = "docinfo"; // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Decoration Elements @@ -94,7 +94,7 @@ // Structural Elements // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - static final public String TRANSITION = "transition"; + public static final String TRANSITION = "transition"; public static final String SIDEBAR = "sidebar";