branch develop updated (1848042 -> 9b5f3c2)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jrst. See http://git.nuiton.org/jrst.git from 1848042 Format file new 9b5f3c2 Fix java 8 compile The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9b5f3c2b64c775420ad081408e2c3f97a0dae4bf Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Apr 29 18:35:34 2015 +0200 Fix java 8 compile Summary of changes: .../main/java/org/nuiton/jrst/AbstractJrstParser.java | 4 ++-- .../src/main/java/org/nuiton/jrst/JrstSiteModule.java | 4 ++-- .../main/java/org/nuiton/jrst/JrstSiteRenderer.java | 6 +++--- .../src/main/java/org/nuiton/jrst/ReflectUtil.java | 4 ++-- jrst/src/main/java/org/nuiton/jrst/JRST.java | 18 +++++++++--------- jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java | 2 +- .../java/org/nuiton/jrst/JRSTResourceResolver.java | 4 ++-- .../main/java/org/nuiton/jrst/JRSTToXmlStrategy.java | 4 ++-- .../org/nuiton/jrst/JRSTToXmlStrategyDocutils.java | 4 ++-- .../org/nuiton/jrst/JRSTToXmlStrategyJRSTReader.java | 4 ++-- jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java | 4 ++-- .../main/java/org/nuiton/jrst/legacy/JRSTLexer.java | 12 +++++++----- .../main/java/org/nuiton/jrst/ui/BaseActionPanel.java | 6 +++--- .../java/org/nuiton/jrst/ui/FileEditorHandler.java | 4 ++-- .../main/java/org/nuiton/jrst/ui/JRSTCommandModel.java | 4 ++-- .../main/java/org/nuiton/jrst/ui/JRSTViewHandler.java | 4 ++-- 16 files changed, 45 insertions(+), 43 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jrst. See http://git.nuiton.org/jrst.git commit 9b5f3c2b64c775420ad081408e2c3f97a0dae4bf Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Apr 29 18:35:34 2015 +0200 Fix java 8 compile --- .../main/java/org/nuiton/jrst/AbstractJrstParser.java | 4 ++-- .../src/main/java/org/nuiton/jrst/JrstSiteModule.java | 4 ++-- .../main/java/org/nuiton/jrst/JrstSiteRenderer.java | 6 +++--- .../src/main/java/org/nuiton/jrst/ReflectUtil.java | 4 ++-- jrst/src/main/java/org/nuiton/jrst/JRST.java | 18 +++++++++--------- jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java | 2 +- .../java/org/nuiton/jrst/JRSTResourceResolver.java | 4 ++-- .../main/java/org/nuiton/jrst/JRSTToXmlStrategy.java | 4 ++-- .../org/nuiton/jrst/JRSTToXmlStrategyDocutils.java | 4 ++-- .../org/nuiton/jrst/JRSTToXmlStrategyJRSTReader.java | 4 ++-- jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java | 4 ++-- .../main/java/org/nuiton/jrst/legacy/JRSTLexer.java | 12 +++++++----- .../main/java/org/nuiton/jrst/ui/BaseActionPanel.java | 6 +++--- .../java/org/nuiton/jrst/ui/FileEditorHandler.java | 4 ++-- .../main/java/org/nuiton/jrst/ui/JRSTCommandModel.java | 4 ++-- .../main/java/org/nuiton/jrst/ui/JRSTViewHandler.java | 4 ++-- 16 files changed, 45 insertions(+), 43 deletions(-) diff --git a/jrst-site-util/src/main/java/org/nuiton/jrst/AbstractJrstParser.java b/jrst-site-util/src/main/java/org/nuiton/jrst/AbstractJrstParser.java index 157db0a..fa68a7e 100644 --- a/jrst-site-util/src/main/java/org/nuiton/jrst/AbstractJrstParser.java +++ b/jrst-site-util/src/main/java/org/nuiton/jrst/AbstractJrstParser.java @@ -2,7 +2,7 @@ * #%L * JRst :: Site util * %% - * Copyright (C) 2012 CodeLutin + * Copyright (C) 2012 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -40,7 +40,7 @@ import org.nuiton.util.FileUtil; /** * Abstract Jrst doxia parser. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit (chemit@codelutin.com) * @since 2.0.1 */ public abstract class AbstractJrstParser extends XdocParser { diff --git a/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteModule.java b/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteModule.java index 2e42d58..4270b77 100644 --- a/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteModule.java +++ b/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteModule.java @@ -2,7 +2,7 @@ * #%L * JRst :: Site util * %% - * Copyright (C) 2012 CodeLutin + * Copyright (C) 2012 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -28,7 +28,7 @@ import org.codehaus.plexus.component.annotations.Component; /** * The jrst site module. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit (chemit@codelutin.com) * @since 2.0.1 */ @Component(role = ParserModule.class, hint = AbstractJrstParser.JRST_PARSER_ID, diff --git a/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteRenderer.java b/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteRenderer.java index 0d0b1da..797dcec 100644 --- a/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteRenderer.java +++ b/jrst-site-util/src/main/java/org/nuiton/jrst/JrstSiteRenderer.java @@ -2,7 +2,7 @@ * #%L * JRst :: Site util * %% - * Copyright (C) 2012 CodeLutin + * Copyright (C) 2012 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -62,8 +62,8 @@ import com.google.common.collect.Maps; /** * Override of the DefaultSiteRenderer to add pdf generation of the site. * - * @author jpages <pages@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author jpages + * @author tchemit (chemit@codelutin.com) * @since 2.0 */ @Component(role = Renderer.class, hint = "default") diff --git a/jrst-site-util/src/main/java/org/nuiton/jrst/ReflectUtil.java b/jrst-site-util/src/main/java/org/nuiton/jrst/ReflectUtil.java index a644651..a59a2fe 100644 --- a/jrst-site-util/src/main/java/org/nuiton/jrst/ReflectUtil.java +++ b/jrst-site-util/src/main/java/org/nuiton/jrst/ReflectUtil.java @@ -2,7 +2,7 @@ * #%L * JRst :: Site util * %% - * Copyright (C) 2006 - 2011 CodeLutin + * Copyright (C) 2006 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -28,7 +28,7 @@ import java.lang.reflect.Method; * Some usefull methods to obtains none accessible fields and method from * some classes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit (chemit@codelutin.com) * @since 1.0.6 */ public class ReflectUtil { diff --git a/jrst/src/main/java/org/nuiton/jrst/JRST.java b/jrst/src/main/java/org/nuiton/jrst/JRST.java index bc4962f..3bb605d 100644 --- a/jrst/src/main/java/org/nuiton/jrst/JRST.java +++ b/jrst/src/main/java/org/nuiton/jrst/JRST.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2004 - 2014 CodeLutin, Chatellier Eric + * Copyright (C) 2004 - 2015 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -64,14 +64,14 @@ import org.xhtmlrenderer.pdf.ITextRenderer; /** * FIXME: 'JRST --help' doesn't work, but 'JRST --help toto' work :( FIXME: * 'JRST -c' doesn't work, but 'JRST -c toto' - * <p/> + * * Created: 3 nov. 06 20:56:00 * * @author poussin * @version $Revision$ - * <p/> - * Last update: $Date$ - * by : $Author$ + * + * Last update: $Date$ + * by : $Author$ */ public class JRST { @@ -457,7 +457,7 @@ public class JRST { } /** - * Writes the XML content generated in a file + * Writes the XML content generated in a file. * * @param doc Document which contains XML code * @param fileOut Output file @@ -486,7 +486,7 @@ public class JRST { } /** - * Generates PDF file with IText with an HTML document + * Generates PDF file with IText with an HTML document. * * @param result Document which contains HTML code * @param fileIn ReST file used to build resources path @@ -532,8 +532,8 @@ public class JRST { } /** - * Method used to generate rst document - * <br/> + * Method used to generate rst document. + * * <b>WARN : don't work !</b> * * @param doc docutils document to generate diff --git a/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java b/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java index ac556f7..320a2f8 100644 --- a/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java +++ b/jrst/src/main/java/org/nuiton/jrst/JRSTGenerator.java @@ -286,7 +286,7 @@ public class JRSTGenerator implements DocumentHandler { /** * Determine la longueur du text dans l'element - * <emphasis<>toto</emphasis<> qui donne *toto* retournera 6 + * <emphasis>toto</emphasis> qui donne *toto* retournera 6 * * @param e element * @return la longueur du text dans l'element. diff --git a/jrst/src/main/java/org/nuiton/jrst/JRSTResourceResolver.java b/jrst/src/main/java/org/nuiton/jrst/JRSTResourceResolver.java index bf2f83f..f782e4f 100644 --- a/jrst/src/main/java/org/nuiton/jrst/JRSTResourceResolver.java +++ b/jrst/src/main/java/org/nuiton/jrst/JRSTResourceResolver.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2004 - 2011 CodeLutin + * Copyright (C) 2004 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -41,7 +41,7 @@ import org.xml.sax.SAXException; import org.xml.sax.XMLReader; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier * @since 1.5 */ public class JRSTResourceResolver extends FasterCachedResourceResolver { diff --git a/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategy.java b/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategy.java index 3d904fa..34ca9cd 100644 --- a/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategy.java +++ b/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategy.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2004 - 2012 CodeLutin + * Copyright (C) 2004 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -28,7 +28,7 @@ import java.io.File; /** * To transform a jrst file to an xml format. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit (chemit@codelutin.com) * @since 2.0.1 */ public interface JRSTToXmlStrategy { diff --git a/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategyDocutils.java b/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategyDocutils.java index 9ad6793..44a8af9 100644 --- a/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategyDocutils.java +++ b/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategyDocutils.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2004 - 2012 CodeLutin + * Copyright (C) 2004 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -37,7 +37,7 @@ import java.net.URL; /** * Old mecanism to transform rst file to xml format using {@link JRSTReader}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit (chemit@codelutin.com) * @since 2.0.1 */ @Component(role = JRSTToXmlStrategy.class, hint = "docutils", diff --git a/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategyJRSTReader.java b/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategyJRSTReader.java index d8e4a6c..2ccf2ec 100644 --- a/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategyJRSTReader.java +++ b/jrst/src/main/java/org/nuiton/jrst/JRSTToXmlStrategyJRSTReader.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2004 - 2012 CodeLutin + * Copyright (C) 2004 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -33,7 +33,7 @@ import java.net.URL; /** * Old mecanism to transform rst file to xml format using {@link JRSTReader}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit (chemit@codelutin.com) * @since 2.0.1 */ @Component(role = JRSTToXmlStrategy.class, hint = "legacy", diff --git a/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java b/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java index 630a215..789e020 100644 --- a/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java +++ b/jrst/src/main/java/org/nuiton/jrst/JRSTUserAgent.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2004 - 2012 CodeLutin + * Copyright (C) 2004 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -41,7 +41,7 @@ import com.itextpdf.text.Image; /** * Class used to resolv images path for JRST documents for itext PDF generation * - * @author jerome pages <jpages@codelutin.com> + * @author jerome pages * @since 1.6 */ public class JRSTUserAgent implements UserAgentCallback { diff --git a/jrst/src/main/java/org/nuiton/jrst/legacy/JRSTLexer.java b/jrst/src/main/java/org/nuiton/jrst/legacy/JRSTLexer.java index b33dc21..0a13711 100644 --- a/jrst/src/main/java/org/nuiton/jrst/legacy/JRSTLexer.java +++ b/jrst/src/main/java/org/nuiton/jrst/legacy/JRSTLexer.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2004 - 2014 CodeLutin, Chatellier Eric + * Copyright (C) 2004 - 2015 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -1240,7 +1240,7 @@ public class JRSTLexer { * read paragraph with attribut level that represente the space numbers at * left side * - * @return <paragraph level="[int]">[text]</paragraph> + * @return <paragraph level="[int]">[text]</paragraph> * @throws IOException */ public Element peekPara() throws IOException { @@ -1960,8 +1960,10 @@ public class JRSTLexer { /** * read enumarted list * - * can be: <li>1, 2, 3, ... <li>a, b, c, ... <li>A, B, C, ... <li>i, ii, + * can be: <ul> + * <li>1, 2, 3, ... <li>a, b, c, ... <li>A, B, C, ... <li>i, ii, * iii, iv, ... <li>I, II, III, IV, ... + * </ul> * * or # for auto-numbered * @@ -1973,8 +1975,8 @@ public class JRSTLexer { * * @return <enumerated_list level="[int]" start="[number]" * prefix="[char]" suffix="[char]" - * enumtype="[(arabic|loweralpha|upperalpha|lowerroman|upperroman]"> - * ;[text]</enumerated_list> + * enumtype="[(arabic|loweralpha|upperalpha|lowerroman|upperroman]"> + * [text]</enumerated_list> * @throws IOException */ public Element peekEnumeratedList() throws IOException { diff --git a/jrst/src/main/java/org/nuiton/jrst/ui/BaseActionPanel.java b/jrst/src/main/java/org/nuiton/jrst/ui/BaseActionPanel.java index faa03a6..4a41530 100644 --- a/jrst/src/main/java/org/nuiton/jrst/ui/BaseActionPanel.java +++ b/jrst/src/main/java/org/nuiton/jrst/ui/BaseActionPanel.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2008 - 2012 CodeLutin + * Copyright (C) 2008 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -28,7 +28,7 @@ import java.awt.event.ActionListener; /** * TODO sletellier 15/06/2012 : find a better way to add onActionPerform on custom components * - * @author sletellier <letellier@codelutin.com> + * @author sletellier */ public abstract class BaseActionPanel extends JPanel { @@ -55,7 +55,7 @@ public abstract class BaseActionPanel /** * Adds an <code>ActionListener</code>. - * <p/> + * * The <code>ActionListener</code> will receive an <code>ActionEvent</code> * when a selection has been made. If the combo box is editable, then * an <code>ActionEvent</code> will be fired when editing has stopped. diff --git a/jrst/src/main/java/org/nuiton/jrst/ui/FileEditorHandler.java b/jrst/src/main/java/org/nuiton/jrst/ui/FileEditorHandler.java index da80c5e..451b5b1 100644 --- a/jrst/src/main/java/org/nuiton/jrst/ui/FileEditorHandler.java +++ b/jrst/src/main/java/org/nuiton/jrst/ui/FileEditorHandler.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2008 - 2012 CodeLutin + * Copyright (C) 2008 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -28,7 +28,7 @@ import javax.swing.filechooser.FileFilter; import java.io.File; /** - * @author sletellier <letellier@codelutin.com> + * @author sletellier */ public class FileEditorHandler { diff --git a/jrst/src/main/java/org/nuiton/jrst/ui/JRSTCommandModel.java b/jrst/src/main/java/org/nuiton/jrst/ui/JRSTCommandModel.java index db26ff7..eb698b2 100644 --- a/jrst/src/main/java/org/nuiton/jrst/ui/JRSTCommandModel.java +++ b/jrst/src/main/java/org/nuiton/jrst/ui/JRSTCommandModel.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2004 - 2012 CodeLutin + * Copyright (C) 2004 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -31,7 +31,7 @@ import org.python.google.common.collect.Lists; /** * Created: 08/06/12 * - * @author jpages <j.pages@codelutin.com> + * @author jpages */ public class JRSTCommandModel { protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); diff --git a/jrst/src/main/java/org/nuiton/jrst/ui/JRSTViewHandler.java b/jrst/src/main/java/org/nuiton/jrst/ui/JRSTViewHandler.java index 0a6d972..bbcf82d 100644 --- a/jrst/src/main/java/org/nuiton/jrst/ui/JRSTViewHandler.java +++ b/jrst/src/main/java/org/nuiton/jrst/ui/JRSTViewHandler.java @@ -2,7 +2,7 @@ * #%L * JRst :: Api * %% - * Copyright (C) 2004 - 2012 CodeLutin + * Copyright (C) 2004 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -37,7 +37,7 @@ import static org.nuiton.i18n.I18n.t; /** * Created: 03/05/12 * - * @author jpages <j.pages@codelutin.com> + * @author jpages */ public class JRSTViewHandler { /** to use log facility, just put in your code: log.info("..."); */ -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm