Upgraded commons-lang3 lib to 3.13.0.

.classpath

@@ -2,19 +2,20 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
-	<classpathentry kind="lib" path="lib/commons-lang3-3.1.jar" sourcepath="lib/commons-lang3-3.1-sources.jar"/>
-	<classpathentry kind="lib" path="lib/joda-time-2.3.jar" sourcepath="lib/joda-time-2.3-sources.jar"/>
-	<classpathentry kind="lib" path="lib/Logs/log4j-1.2.17.jar" sourcepath="lib/Logs/log4j-1.2.17-source.zip"/>
-	<classpathentry kind="lib" path="lib/Logs/slf4j-api-1.7.5.jar" sourcepath="lib/Logs/slf4j-api-1.7.5-sources.jar"/>
-	<classpathentry kind="lib" path="lib/Logs/slf4j-log4j12-1.7.5.jar" sourcepath="lib/Logs/slf4j-log4j12-1.7.5-sources.jar"/>
-	<classpathentry kind="lib" path="lib/UnitTesting/hamcrest-core-1.3.jar" sourcepath="lib/UnitTesting/hamcrest-core-1.3-sources.jar"/>
-	<classpathentry kind="lib" path="lib/UnitTesting/junit-4.11.jar" sourcepath="lib/UnitTesting/junit-4.11-sources.jar"/>
-	<classpathentry kind="lib" path="lib/devinsy-strings-0.4.4.jar" sourcepath="lib/devinsy-strings-0.4.4-sources.zip"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="lib" path="lib/Logs/log4j-1.2.17.jar" sourcepath="lib/Logs/log4j-1.2.17-source.zip"/>
+	<classpathentry kind="lib" path="lib/UnitTesting/hamcrest-core-1.3.jar" sourcepath="lib/UnitTesting/hamcrest-core-1.3-sources.jar"/>
+	<classpathentry kind="lib" path="lib/Logs/slf4j-api-1.7.25.jar" sourcepath="lib/Logs/slf4j-api-1.7.25-sources.jar"/>
+	<classpathentry kind="lib" path="lib/Logs/slf4j-log4j12-1.7.25.jar" sourcepath="lib/Logs/slf4j-log4j12-1.7.25-sources.jar"/>
+	<classpathentry kind="lib" path="lib/UnitTesting/junit-4.12.jar" sourcepath="lib/UnitTesting/junit-4.12-sources.jar"/>
+	<classpathentry kind="lib" path="lib/commons-text-1.9.jar" sourcepath="lib/commons-text-1.9-sources.jar"/>
+	<classpathentry kind="lib" path="lib/devinsy-strings-0.17.0.jar" sourcepath="lib/devinsy-strings-0.17.0-sources.zip"/>
+	<classpathentry kind="lib" path="lib/commons-lang3-3.13.0.jar" sourcepath="lib/commons-lang3-3.13.0-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.settings/org.eclipse.jdt.core.prefs

@@ -10,16 +10,20 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -27,17 +31,20 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
@@ -121,11 +128,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -155,6 +163,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -179,13 +189,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
 org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
 org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -232,6 +246,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -268,9 +284,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser
 org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
 org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
 org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
 org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -296,6 +315,10 @@ org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true

.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

@@ -0,0 +1,5 @@
+XDOCLETBUILDERACTIVE=true
+XDOCLETHOME=
+XDOCLETUSEGLOBAL=true
+XDOCLETVERSION=1.2.1
+eclipse.preferences.version=1

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -2,6 +2,6 @@
 <faceted-project>
   <fixed facet="jst.java"/>
   <fixed facet="jst.utility"/>
-  <installed facet="jst.java" version="6.0"/>
   <installed facet="jst.utility" version="1.0"/>
+  <installed facet="jst.java" version="17"/>
 </faceted-project>

README.md

@@ -11,8 +11,8 @@ This software is released under the GNU LGPL.
 
 ## Requirements
 
-- Java 1.6
+- Java 11
-- Eclipse Kepler 
+- Eclipse 4.16 (202006).
 
 ## Context
 Several useful Java classes.

TODO

@@ -1,3 +1,3 @@
 == TODO list ==
 
-- add test
+- add test.

build.num

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Thu Mar 01 00:19:52 CET 2018
+#Thu Oct 14 16:04:04 CEST 2021
-build.number=3
+build.number=1

build.properties

@@ -1,3 +1,3 @@
 product.name=devinsy-xml
 product.revision.major=0
-product.revision.minor=4
+product.revision.minor=17

lib/README

@@ -1,9 +1,14 @@
-Description of used libraries:
+Description of used libraries.
-- commons-lang: useful tools (StringUtils...)
+
-- hamcrest-core: required by junit
+Standards:
-- joda-time: useful DateTime library
+- commons-lang: useful tools (StringUtils…)
-- junit: unit tests API
+
+Logging
 - log4j: log API
 - slf4j-api: facade log API
 - slf4j-log4j12: adaptation layer between slf4j and log4j
+
+Testing:
+- hamcrest-core: required by JUnit
+- junit: unit tests API
  

src/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

src/fr/devinsy/xml/XMLAttribute.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014,2017 Christian Pierre MOMON
+ * Copyright (C) 2013-2014,2017-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.xml;
+package fr.devinsy.xml;
 
 import org.apache.commons.lang3.StringUtils;
 

src/fr/devinsy/xml/XMLAttributes.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014,2017 Christian Pierre MOMON
+ * Copyright (C) 2013-2014,2017-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.xml;
+package fr.devinsy.xml;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -76,11 +76,11 @@ public class XMLAttributes extends HashMap<String, XMLAttribute> implements Iter
 	}
 
 	/**
-	 * Instantiates a new XML attributes from a string array. Strings are series
+	 * Instantiates a new XML attributes from a string array. Strings are series of
-	 * of label and value. This constructor is a helper.
+	 * label and value. This constructor is a helper.
 	 * 
-	 * @param source
+	 * @param attributes
-	 *            the source
+	 *            the init attributes
 	 */
 	public XMLAttributes(final String... attributes)
 	{

src/fr/devinsy/xml/XMLBadFormatException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014,2017 Christian Pierre MOMON
+ * Copyright (C) 2013-2014,2017-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.xml;
+package fr.devinsy.xml;
 
 import org.slf4j.helpers.MessageFormatter;
 

src/fr/devinsy/xml/XMLReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014,2017 Christian Pierre MOMON
+ * Copyright (C) 2013-2014,2017-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.xml;
+package fr.devinsy.xml;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -35,8 +35,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fr.devinsy.util.strings.StringList;
+import fr.devinsy.strings.StringList;
-import fr.devinsy.util.xml.XMLTag.TagType;
+import fr.devinsy.xml.XMLTag.TagType;
 
 /**
  * The Class XMLReader.
@@ -128,8 +128,12 @@ public class XMLReader
 	}
 
 	/**
+	 * Instantiates a new XML reader.
+	 *
 	 * @param source
+	 *            the source
 	 * @throws XMLStreamException
+	 *             the XML stream exception
 	 */
 	public XMLReader(final String source) throws XMLStreamException
 	{
@@ -422,8 +426,8 @@ public class XMLReader
 	 * <li>START_ELEMENT(X) + START_ELEMENT(Y) => <X><Y> => START TAG
 	 * <li>START_ELEMENT(X) + CHARACTERS(C) + START_ELEMENT(Y) => <X>SPACES<Y>=>
 	 * START TAG
-	 * <li>START_ELEMENT(X) + CHARACTERS(C) + END_ELEMENT(X) => <X>C</X> =>
+	 * <li>START_ELEMENT(X) + CHARACTERS(C) + END_ELEMENT(X) => <X>C</X> => CONTENT
-	 * CONTENT TAG
+	 * TAG
 	 * <li>START_ELEMENT(X) + END_ELEMENT(X) => <X></X> => <X/> => EMPTY
 	 * <li>END_ELEMENT(X) => </X> => END TAG
 	 * <li>END_DOCUMENT => FOOTER TAG

src/fr/devinsy/xml/XMLTag.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014,2017 Christian Pierre MOMON
+ * Copyright (C) 2013-2014,2017-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.xml;
+package fr.devinsy.xml;
 
 import javax.xml.namespace.QName;
 

src/fr/devinsy/xml/XMLTools.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014,2017 Christian Pierre MOMON
+ * Copyright (C) 2013-2020 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.xml;
+package fr.devinsy.xml;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -35,12 +35,12 @@ import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import fr.devinsy.util.strings.StringList;
+import fr.devinsy.strings.StringList;
 
 /**
  * The Class XMLTools.
@@ -66,7 +66,7 @@ public class XMLTools
 		}
 		else
 		{
-			result = StringEscapeUtils.escapeXml(source);
+			result = StringEscapeUtils.escapeXml10(source);
 		}
 
 		//
@@ -75,13 +75,16 @@ public class XMLTools
 
 	/**
 	 * Indent.
-	 * 
+	 *
 	 * @param source
 	 *            the source
 	 * @return the string
 	 * @throws XMLStreamException
+	 *             the XML stream exception
 	 * @throws XMLBadFormatException
+	 *             the XML bad format exception
 	 * @throws IOException
+	 *             Signals that an I/O exception has occurred.
 	 */
 	public static String indent(final String source) throws XMLStreamException, XMLBadFormatException, IOException
 	{
@@ -323,10 +326,10 @@ public class XMLTools
 	 * @param in
 	 *            the in
 	 * @return the string
-	 * @throws Exception
+	 * @throws IOException
 	 *             the exception
 	 */
-	public static String readTag(final BufferedReader in) throws Exception
+	public static String readTag(final BufferedReader in) throws IOException
 	{
 		String result;
 

src/fr/devinsy/xml/XMLWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014,2017 Christian Pierre MOMON
+ * Copyright (C) 2013-2014,2017-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.xml;
+package fr.devinsy.xml;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -28,8 +28,8 @@ import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 
-import fr.devinsy.util.strings.StringList;
+import fr.devinsy.strings.StringList;
-import fr.devinsy.util.strings.StringListWriter;
+import fr.devinsy.strings.StringListWriter;
 
 /**
  * The Class XMLWriter.
@@ -324,8 +324,8 @@ public class XMLWriter
 	}
 
 	/**
-	 * This method write a XML tag with attributes and content data. Content
+	 * This method write a XML tag with attributes and content data. Content data
-	 * data are converted in XML format.
+	 * are converted in XML format.
 	 * 
 	 * @param label
 	 *            the label

src/fr/devinsy/xml/XMLZipReader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014,2017 Christian Pierre MOMON
+ * Copyright (C) 2013-2014,2017-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.xml;
+package fr.devinsy.xml;
 
 import java.io.File;
 import java.io.FileInputStream;

src/fr/devinsy/xml/XMLZipWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014,2017 Christian Pierre MOMON
+ * Copyright (C) 2013-2014,2017-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.xml;
+package fr.devinsy.xml;
 
 import java.io.File;
 import java.io.FileOutputStream;

src/fr/devinsy/xml/demo/XMLDemo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Christian Pierre MOMON
+ * Copyright (C) 2017-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.xml.demo;
+package fr.devinsy.xml.demo;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -27,11 +27,11 @@ import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
-import fr.devinsy.util.xml.XMLBadFormatException;
+import fr.devinsy.xml.XMLBadFormatException;
-import fr.devinsy.util.xml.XMLReader;
+import fr.devinsy.xml.XMLReader;
-import fr.devinsy.util.xml.XMLTag;
+import fr.devinsy.xml.XMLTag;
-import fr.devinsy.util.xml.XMLTools;
+import fr.devinsy.xml.XMLTools;
-import fr.devinsy.util.xml.XMLWriter;
+import fr.devinsy.xml.XMLWriter;
 
 /**
  * The Class XmlDemo.

test/foo/Foo.java

@@ -1,7 +1,5 @@
-package foo;
-
 /*
- * Copyright (C) 2013-2014,2017 Christian Pierre MOMON
+ * Copyright (C) 2013-2014,2017-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -18,11 +16,13 @@ package foo;
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
+package foo;
+
 import javax.xml.stream.XMLEventReader;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.events.XMLEvent;
 
-import fr.devinsy.util.xml.XMLTools;
+import fr.devinsy.xml.XMLTools;
 
 /**
  * The Class Foo contains study code.

test/fr/devinsy/xml/XMLReaderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014,2017 Christian Pierre MOMON
+ * Copyright (C) 2014,2017-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.xml;
+package fr.devinsy.xml;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -28,7 +28,7 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.junit.Before;
 
-import fr.devinsy.util.strings.StringList;
+import fr.devinsy.strings.StringList;
 
 /**
  * The Class XMLReaderTest.

test/fr/devinsy/xml/XMLWriterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014,2017 Christian Pierre MOMON
+ * Copyright (C) 2014,2017-2018 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Devinsy-xml.  If not, see <http://www.gnu.org/licenses/>
  */
-package fr.devinsy.util.xml;
+package fr.devinsy.xml;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -62,10 +62,10 @@ public class XMLWriterTest
 	@Test
 	public void testtFoo01() throws XMLStreamException, XMLBadFormatException, IOException
 	{
-		logger.debug(StreamUtils.getBytes(XMLWriter.class.getResourceAsStream("/fr/devinsy/util/xml/foo01.xml")).length);
+		logger.debug(StreamUtils.getBytes(XMLWriter.class.getResourceAsStream("/fr/devinsy/xml/foo01.xml")).length);
 
 		//
-		String source = new String(StreamUtils.getBytes(XMLWriter.class.getResourceAsStream("/fr/devinsy/util/xml/foo01.xml")));
+		String source = new String(StreamUtils.getBytes(XMLWriter.class.getResourceAsStream("/fr/devinsy/xml/foo01.xml")));
 
 		System.out.println("source=\n" + source);