From 0e4c3e405226e21438712b486c934e8a0617ec70 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Tue, 6 Sep 2016 17:37:41 +0200
Subject: [PATCH] Made a code review.

---
 .../xidyn/presenters/DomPresenter.java        |  5 +--
 .../xidyn/presenters/DomPresenterCore.java    | 37 ++++++++++---------
 .../xidyn/presenters/FilePresenter.java       |  8 ++--
 .../xidyn/presenters/FilePresenters.java      |  4 +-
 .../xidyn/presenters/FilePresentersProxy.java |  4 +-
 .../xidyn/presenters/GenericPresenter.java    |  3 +-
 .../devinsy/xidyn/presenters/Presenter.java   |  3 +-
 .../xidyn/presenters/PresenterFactory.java    |  4 +-
 .../xidyn/presenters/StringPresenter.java     |  6 +--
 .../xidyn/presenters/URLPresenter.java        |  8 ++--
 10 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/fr/devinsy/xidyn/presenters/DomPresenter.java b/src/fr/devinsy/xidyn/presenters/DomPresenter.java
index dd62217..769d288 100644
--- a/src/fr/devinsy/xidyn/presenters/DomPresenter.java
+++ b/src/fr/devinsy/xidyn/presenters/DomPresenter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2006-2014 Christian Pierre MOMON
+ * Copyright (C) 2006-2016 Christian Pierre MOMON
  * 
  * This file is part of Xidyn.
  * 
@@ -33,7 +33,7 @@ import fr.devinsy.xidyn.utils.XidynUtils;
  */
 public class DomPresenter implements Presenter
 {
-	static private final Logger logger = LoggerFactory.getLogger(DomPresenter.class);
+	private static Logger logger = LoggerFactory.getLogger(DomPresenter.class);
 	private Document dom;
 	private boolean isOutdated;
 	private StringBuffer defaultHtmlTarget;
@@ -231,5 +231,4 @@ public class DomPresenter implements Presenter
 		//
 		return result;
 	}
-
 }
diff --git a/src/fr/devinsy/xidyn/presenters/DomPresenterCore.java b/src/fr/devinsy/xidyn/presenters/DomPresenterCore.java
index 10e101a..fbcdd89 100644
--- a/src/fr/devinsy/xidyn/presenters/DomPresenterCore.java
+++ b/src/fr/devinsy/xidyn/presenters/DomPresenterCore.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2006-2014 Christian Pierre MOMON
+ * Copyright (C) 2006-2016 Christian Pierre MOMON
  * 
  * This file is part of Xidyn.
  * 
@@ -46,13 +46,14 @@ import fr.devinsy.xidyn.utils.XidynUtils;
  */
 public class DomPresenterCore
 {
-	static final public char INDEX_SEPARATOR = '_';
-	static private Logger logger = LoggerFactory.getLogger(DomPresenterCore.class);
+	private static Logger logger = LoggerFactory.getLogger(DomPresenterCore.class);
+
+	public static final char INDEX_SEPARATOR = '_';
 
 	/**
 	 * Dynamize a doc with data.
 	 */
-	static public StringBuffer dynamize(final Document doc, final TagDataListById data) throws Exception
+	public static StringBuffer dynamize(final Document doc, final TagDataListById data) throws Exception
 	{
 		StringBuffer result;
 
@@ -67,7 +68,7 @@ public class DomPresenterCore
 	/**
 	 * Dynamize a doc with data.
 	 */
-	static public StringBuffer dynamize(final Document doc, final TagDataManager data) throws Exception
+	public static StringBuffer dynamize(final Document doc, final TagDataManager data) throws Exception
 	{
 		StringBuffer result;
 
@@ -80,7 +81,7 @@ public class DomPresenterCore
 	/**
 	 * Dynamize a doc with data.
 	 */
-	static public void dynamize(final Writer result, final Document doc, final TagDataListById data) throws Exception
+	public static void dynamize(final Writer result, final Document doc, final TagDataListById data) throws Exception
 	{
 		process(result, doc, data);
 	}
@@ -88,7 +89,7 @@ public class DomPresenterCore
 	/**
 	 * Dynamize a doc with data.
 	 */
-	static public void dynamize(final Writer result, final Document doc, final TagDataManager data) throws Exception
+	public static void dynamize(final Writer result, final Document doc, final TagDataManager data) throws Exception
 	{
 		dynamize(result, doc, data.getIdsDataById());
 	}
@@ -128,7 +129,7 @@ public class DomPresenterCore
 	 * 
 	 * @param node
 	 */
-	static private String getElementText(final Node node)
+	private static String getElementText(final Node node)
 	{
 		String result;
 
@@ -174,7 +175,7 @@ public class DomPresenterCore
 	/**
 	 *
 	 */
-	static private TagAttributes mergeAttributes(final TagAttributes target, final TagAttributes source)
+	private static TagAttributes mergeAttributes(final TagAttributes target, final TagAttributes source)
 	{
 		TagAttributes result;
 
@@ -226,7 +227,7 @@ public class DomPresenterCore
 	 *            String
 	 * @return String
 	 */
-	static private String newLinesToSpaces(final String text)
+	private static String newLinesToSpaces(final String text)
 	{
 		StringBuffer result = new StringBuffer(text);
 
@@ -254,7 +255,7 @@ public class DomPresenterCore
 	 * Recursive method that processes a node and any child nodes.
 	 * 
 	 */
-	static private void process(final Writer result, final Node node, final TagDataListById datas, final String suffix) throws Exception
+	private static void process(final Writer result, final Node node, final TagDataListById datas, final String suffix) throws Exception
 	{
 		logger.debug("process - started");
 		String TRANSITIONAL_DTD = "xhtml1-transitional.dtd";
@@ -375,7 +376,7 @@ public class DomPresenterCore
 	/**
 	 *
 	 */
-	static private StringBuffer processAttributes(final NamedNodeMap attrs)
+	private static StringBuffer processAttributes(final NamedNodeMap attrs)
 	{
 		StringBuffer result;
 
@@ -388,7 +389,7 @@ public class DomPresenterCore
 	/**
 	 *
 	 */
-	static private StringBuffer processAttributes(final NamedNodeMap attrs, final TagAttributes dataAttributes)
+	private static StringBuffer processAttributes(final NamedNodeMap attrs, final TagAttributes dataAttributes)
 	{
 		StringBuffer result;
 
@@ -401,7 +402,7 @@ public class DomPresenterCore
 	/**
 	 *
 	 */
-	static private StringBuffer processAttributes(final NamedNodeMap attrs, final TagAttributes dataAttributes, final String suffix)
+	private static StringBuffer processAttributes(final NamedNodeMap attrs, final TagAttributes dataAttributes, final String suffix)
 	{
 		StringBuffer result;
 
@@ -466,7 +467,7 @@ public class DomPresenterCore
 	/**
 	 *
 	 */
-	static private StringBuffer processAttributes(final NamedNodeMap attrs, final TagAttributes dataAttributes, final TagAttributes namedDataAttributes, final String suffix)
+	private static StringBuffer processAttributes(final NamedNodeMap attrs, final TagAttributes dataAttributes, final TagAttributes namedDataAttributes, final String suffix)
 	{
 		StringBuffer result;
 
@@ -479,7 +480,7 @@ public class DomPresenterCore
 	/**
 	 *
 	 */
-	static private void processChildren(final Writer result, final Node node, final TagDataListById datas) throws Exception
+	private static void processChildren(final Writer result, final Node node, final TagDataListById datas) throws Exception
 	{
 		processChildren(result, node, datas, "");
 	}
@@ -669,7 +670,7 @@ public class DomPresenterCore
 	 * @param idAttr
 	 *            The ID.
 	 */
-	static private void processElementWithId(final Writer result, final Node node, final NamedNodeMap attrs, final Node idAttr, final TagDataListById datas) throws Exception
+	private static void processElementWithId(final Writer result, final Node node, final NamedNodeMap attrs, final Node idAttr, final TagDataListById datas) throws Exception
 
 	{
 		processElementWithId(result, node, attrs, idAttr, datas, "");
@@ -686,7 +687,7 @@ public class DomPresenterCore
 	 * @param idAttr
 	 *            The ID.
 	 */
-	static private void processElementWithId(final Writer result, final Node node, final NamedNodeMap attrs, final Node idAttr, final TagDataListById datas, final String suffix) throws Exception
+	private static void processElementWithId(final Writer result, final Node node, final NamedNodeMap attrs, final Node idAttr, final TagDataListById datas, final String suffix) throws Exception
 	{
 		String tag = node.getNodeName();
 
diff --git a/src/fr/devinsy/xidyn/presenters/FilePresenter.java b/src/fr/devinsy/xidyn/presenters/FilePresenter.java
index 14eff4e..9300f8d 100644
--- a/src/fr/devinsy/xidyn/presenters/FilePresenter.java
+++ b/src/fr/devinsy/xidyn/presenters/FilePresenter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2006-2014 Christian Pierre MOMON
+ * Copyright (C) 2006-2016 Christian Pierre MOMON
  * 
  * This file is part of Xidyn.
  * 
@@ -33,7 +33,7 @@ import fr.devinsy.xidyn.utils.XidynUtils;
  */
 public class FilePresenter extends StringPresenter
 {
-	static Logger logger = LoggerFactory.getLogger(FilePresenter.class);
+	private static Logger logger = LoggerFactory.getLogger(FilePresenter.class);
 
 	private File source;
 	private String sourceFilePathname;
@@ -266,7 +266,7 @@ public class FilePresenter extends StringPresenter
 	/**
 	 * Dynamize a file without data.
 	 */
-	static public StringBuffer dynamize(final String filePathname) throws Exception
+	public static StringBuffer dynamize(final String filePathname) throws Exception
 	{
 		StringBuffer result;
 
@@ -281,7 +281,7 @@ public class FilePresenter extends StringPresenter
 	/**
 	 * Dynamize a file.
 	 */
-	static public StringBuffer dynamize(final String filePathname, final TagDataManager datas) throws Exception
+	public static StringBuffer dynamize(final String filePathname, final TagDataManager datas) throws Exception
 	{
 		StringBuffer result;
 
diff --git a/src/fr/devinsy/xidyn/presenters/FilePresenters.java b/src/fr/devinsy/xidyn/presenters/FilePresenters.java
index 6a47657..b9ae775 100644
--- a/src/fr/devinsy/xidyn/presenters/FilePresenters.java
+++ b/src/fr/devinsy/xidyn/presenters/FilePresenters.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2006-2014 Christian Pierre MOMON
+ * Copyright (C) 2006-2016 Christian Pierre MOMON
  * 
  * This file is part of Xidyn.
  * 
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
 public class FilePresenters extends Vector<FilePresenter>
 {
 	private static final long serialVersionUID = 7058868685681354293L;
-	static private Logger logger = LoggerFactory.getLogger(FilePresenters.class);
+	private static Logger logger = LoggerFactory.getLogger(FilePresenters.class);
 
 	/**
 	 *
diff --git a/src/fr/devinsy/xidyn/presenters/FilePresentersProxy.java b/src/fr/devinsy/xidyn/presenters/FilePresentersProxy.java
index 1c6feed..4cd7de6 100644
--- a/src/fr/devinsy/xidyn/presenters/FilePresentersProxy.java
+++ b/src/fr/devinsy/xidyn/presenters/FilePresentersProxy.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2006-2014 Christian Pierre MOMON
+ * Copyright (C) 2006-2016 Christian Pierre MOMON
  * 
  * This file is part of Xidyn.
  * 
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
  */
 public class FilePresentersProxy
 {
-	static private Logger logger = LoggerFactory.getLogger(FilePresentersProxy.class);
+	private static Logger logger = LoggerFactory.getLogger(FilePresentersProxy.class);
 
 	private static FilePresentersProxy instance = null;
 	private FilePresenters presenters = null;
diff --git a/src/fr/devinsy/xidyn/presenters/GenericPresenter.java b/src/fr/devinsy/xidyn/presenters/GenericPresenter.java
index 21061dc..0bb7eae 100644
--- a/src/fr/devinsy/xidyn/presenters/GenericPresenter.java
+++ b/src/fr/devinsy/xidyn/presenters/GenericPresenter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2006-2014 Christian Pierre MOMON
+ * Copyright (C) 2006-2016 Christian Pierre MOMON
  * 
  * This file is part of Xidyn.
  * 
@@ -29,6 +29,7 @@ import fr.devinsy.xidyn.data.TagDataManager;
 public class GenericPresenter implements Presenter
 {
 	private static org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(GenericPresenter.class);
+
 	private Presenter presenter;
 
 	/**
diff --git a/src/fr/devinsy/xidyn/presenters/Presenter.java b/src/fr/devinsy/xidyn/presenters/Presenter.java
index 2b2e072..1e94dbc 100644
--- a/src/fr/devinsy/xidyn/presenters/Presenter.java
+++ b/src/fr/devinsy/xidyn/presenters/Presenter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2006-2014 Christian Pierre MOMON
+ * Copyright (C) 2006-2016 Christian Pierre MOMON
  * 
  * This file is part of Xidyn.
  * 
@@ -30,7 +30,6 @@ import fr.devinsy.xidyn.data.TagDataManager;
  */
 public interface Presenter
 {
-
 	/**
 	 * 
 	 * @param datas
diff --git a/src/fr/devinsy/xidyn/presenters/PresenterFactory.java b/src/fr/devinsy/xidyn/presenters/PresenterFactory.java
index fdcecfb..f842f74 100644
--- a/src/fr/devinsy/xidyn/presenters/PresenterFactory.java
+++ b/src/fr/devinsy/xidyn/presenters/PresenterFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2006-2014 Christian Pierre MOMON
+ * Copyright (C) 2006-2016 Christian Pierre MOMON
  * 
  * This file is part of Xidyn.
  * 
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
  */
 public class PresenterFactory
 {
-	static private Logger logger = LoggerFactory.getLogger(PresenterFactory.class);
+	private static Logger logger = LoggerFactory.getLogger(PresenterFactory.class);
 
 	/**
 	 * 
diff --git a/src/fr/devinsy/xidyn/presenters/StringPresenter.java b/src/fr/devinsy/xidyn/presenters/StringPresenter.java
index f142649..56b741f 100644
--- a/src/fr/devinsy/xidyn/presenters/StringPresenter.java
+++ b/src/fr/devinsy/xidyn/presenters/StringPresenter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2006-2014 Christian Pierre MOMON
+ * Copyright (C) 2006-2016 Christian Pierre MOMON
  * 
  * This file is part of Xidyn.
  * 
@@ -32,7 +32,7 @@ import fr.devinsy.xidyn.utils.XidynUtils;
  */
 public class StringPresenter implements Presenter
 {
-	static private Logger logger = LoggerFactory.getLogger(StringPresenter.class);
+	private static Logger logger = LoggerFactory.getLogger(StringPresenter.class);
 
 	private String source;
 	private String doctype;
@@ -236,7 +236,7 @@ public class StringPresenter implements Presenter
 	/**
 	 * Dynamize a string with HTML in.
 	 */
-	static public StringBuffer dynamize(final String html, final TagDataManager datas) throws Exception
+	public static StringBuffer dynamize(final String html, final TagDataManager datas) throws Exception
 	{
 		StringBuffer result;
 
diff --git a/src/fr/devinsy/xidyn/presenters/URLPresenter.java b/src/fr/devinsy/xidyn/presenters/URLPresenter.java
index 5858ac3..8d87e07 100644
--- a/src/fr/devinsy/xidyn/presenters/URLPresenter.java
+++ b/src/fr/devinsy/xidyn/presenters/URLPresenter.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2006-2014 Christian Pierre MOMON
+ * Copyright (C) 2006-2016 Christian Pierre MOMON
  * 
  * This file is part of Xidyn.
  * 
@@ -33,7 +33,7 @@ import fr.devinsy.xidyn.utils.XidynUtils;
  */
 public class URLPresenter extends StringPresenter
 {
-	static private Logger logger = LoggerFactory.getLogger(URLPresenter.class);
+	private static Logger logger = LoggerFactory.getLogger(URLPresenter.class);
 
 	private String sourcePathname;
 	private URL source;
@@ -354,7 +354,7 @@ public class URLPresenter extends StringPresenter
 	/**
 	 * Dynamize a file without data.
 	 */
-	static public StringBuffer dynamize(final String filePathname) throws Exception
+	public static StringBuffer dynamize(final String filePathname) throws Exception
 	{
 		StringBuffer result;
 
@@ -369,7 +369,7 @@ public class URLPresenter extends StringPresenter
 	/**
 	 * Dynamize a file.
 	 */
-	static public StringBuffer dynamize(final String filePathname, final TagDataManager datas) throws Exception
+	public static StringBuffer dynamize(final String filePathname, final TagDataManager datas) throws Exception
 	{
 		StringBuffer result;