diff --git a/.classpath b/.classpath index 9a8d1bf..869f707 100644 --- a/.classpath +++ b/.classpath @@ -3,18 +3,17 @@ - - - - - - - + + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 1004db9..e3c563a 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -10,15 +10,15 @@ 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=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.8 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.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index d0e0b2d..b84ac01 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,6 +2,6 @@ - + diff --git a/lib/Logs/slf4j-api-1.7.25-sources.jar b/lib/Logs/slf4j-api-1.7.25-sources.jar new file mode 100644 index 0000000..b2a3d83 Binary files /dev/null and b/lib/Logs/slf4j-api-1.7.25-sources.jar differ diff --git a/lib/Logs/slf4j-api-1.7.25.jar b/lib/Logs/slf4j-api-1.7.25.jar new file mode 100644 index 0000000..7e62f13 Binary files /dev/null and b/lib/Logs/slf4j-api-1.7.25.jar differ diff --git a/lib/Logs/slf4j-api-1.7.5-sources.jar b/lib/Logs/slf4j-api-1.7.5-sources.jar deleted file mode 100644 index 51abe2b..0000000 Binary files a/lib/Logs/slf4j-api-1.7.5-sources.jar and /dev/null differ diff --git a/lib/Logs/slf4j-api-1.7.5.jar b/lib/Logs/slf4j-api-1.7.5.jar deleted file mode 100644 index 8766455..0000000 Binary files a/lib/Logs/slf4j-api-1.7.5.jar and /dev/null differ diff --git a/lib/Logs/slf4j-log4j12-1.7.25-sources.jar b/lib/Logs/slf4j-log4j12-1.7.25-sources.jar new file mode 100644 index 0000000..0cd5be7 Binary files /dev/null and b/lib/Logs/slf4j-log4j12-1.7.25-sources.jar differ diff --git a/lib/Logs/slf4j-log4j12-1.7.25.jar b/lib/Logs/slf4j-log4j12-1.7.25.jar new file mode 100644 index 0000000..4a44e06 Binary files /dev/null and b/lib/Logs/slf4j-log4j12-1.7.25.jar differ diff --git a/lib/Logs/slf4j-log4j12-1.7.5-sources.jar b/lib/Logs/slf4j-log4j12-1.7.5-sources.jar deleted file mode 100644 index ea1b93b..0000000 Binary files a/lib/Logs/slf4j-log4j12-1.7.5-sources.jar and /dev/null differ diff --git a/lib/Logs/slf4j-log4j12-1.7.5.jar b/lib/Logs/slf4j-log4j12-1.7.5.jar deleted file mode 100644 index afce5c2..0000000 Binary files a/lib/Logs/slf4j-log4j12-1.7.5.jar and /dev/null differ diff --git a/lib/UnitTesting/junit-4.11-sources.jar b/lib/UnitTesting/junit-4.11-sources.jar deleted file mode 100644 index bab4cdd..0000000 Binary files a/lib/UnitTesting/junit-4.11-sources.jar and /dev/null differ diff --git a/lib/UnitTesting/junit-4.11.jar b/lib/UnitTesting/junit-4.11.jar deleted file mode 100644 index aaf7444..0000000 Binary files a/lib/UnitTesting/junit-4.11.jar and /dev/null differ diff --git a/lib/UnitTesting/junit-4.12-sources.jar b/lib/UnitTesting/junit-4.12-sources.jar new file mode 100644 index 0000000..884f92f Binary files /dev/null and b/lib/UnitTesting/junit-4.12-sources.jar differ diff --git a/lib/UnitTesting/junit-4.12.jar b/lib/UnitTesting/junit-4.12.jar new file mode 100644 index 0000000..3a7fc26 Binary files /dev/null and b/lib/UnitTesting/junit-4.12.jar differ diff --git a/lib/commons-lang3-3.1-sources.jar b/lib/commons-lang3-3.1-sources.jar deleted file mode 100644 index 02cd2f2..0000000 Binary files a/lib/commons-lang3-3.1-sources.jar and /dev/null differ diff --git a/lib/commons-lang3-3.1.jar b/lib/commons-lang3-3.1.jar deleted file mode 100644 index a85e539..0000000 Binary files a/lib/commons-lang3-3.1.jar and /dev/null differ diff --git a/lib/commons-lang3-3.7-sources.jar b/lib/commons-lang3-3.7-sources.jar new file mode 100644 index 0000000..a83c661 Binary files /dev/null and b/lib/commons-lang3-3.7-sources.jar differ diff --git a/lib/commons-lang3-3.7.jar b/lib/commons-lang3-3.7.jar new file mode 100644 index 0000000..f37ded6 Binary files /dev/null and b/lib/commons-lang3-3.7.jar differ diff --git a/lib/devinsy-strings-0.4.4-sources.zip b/lib/devinsy-strings-0.4.4-sources.zip deleted file mode 100644 index 8ccb845..0000000 Binary files a/lib/devinsy-strings-0.4.4-sources.zip and /dev/null differ diff --git a/lib/devinsy-strings-0.4.4.jar b/lib/devinsy-strings-0.4.4.jar deleted file mode 100644 index 01ced79..0000000 Binary files a/lib/devinsy-strings-0.4.4.jar and /dev/null differ diff --git a/lib/devinsy-strings-0.8.1-sources.zip b/lib/devinsy-strings-0.8.1-sources.zip new file mode 100644 index 0000000..556da2c Binary files /dev/null and b/lib/devinsy-strings-0.8.1-sources.zip differ diff --git a/lib/devinsy-strings-0.8.1.jar b/lib/devinsy-strings-0.8.1.jar new file mode 100644 index 0000000..b2983f8 Binary files /dev/null and b/lib/devinsy-strings-0.8.1.jar differ diff --git a/lib/joda-time-2.3-sources.jar b/lib/joda-time-2.3-sources.jar deleted file mode 100644 index a2dda2e..0000000 Binary files a/lib/joda-time-2.3-sources.jar and /dev/null differ diff --git a/lib/joda-time-2.3.jar b/lib/joda-time-2.3.jar deleted file mode 100644 index 9dce4f9..0000000 Binary files a/lib/joda-time-2.3.jar and /dev/null differ diff --git a/src/fr/devinsy/xml/XMLAttribute.java b/src/fr/devinsy/xml/XMLAttribute.java index 2518587..da8904c 100644 --- a/src/fr/devinsy/xml/XMLAttribute.java +++ b/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. * diff --git a/src/fr/devinsy/xml/XMLAttributes.java b/src/fr/devinsy/xml/XMLAttributes.java index 66f0752..f5b450a 100644 --- a/src/fr/devinsy/xml/XMLAttributes.java +++ b/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. * @@ -76,8 +76,8 @@ public class XMLAttributes extends HashMap implements Iter } /** - * Instantiates a new XML attributes from a string array. Strings are series - * of label and value. This constructor is a helper. + * Instantiates a new XML attributes from a string array. Strings are series of + * label and value. This constructor is a helper. * * @param source * the source diff --git a/src/fr/devinsy/xml/XMLBadFormatException.java b/src/fr/devinsy/xml/XMLBadFormatException.java index 32de940..cb63365 100644 --- a/src/fr/devinsy/xml/XMLBadFormatException.java +++ b/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. * diff --git a/src/fr/devinsy/xml/XMLReader.java b/src/fr/devinsy/xml/XMLReader.java index c5cf4a8..8353ef6 100644 --- a/src/fr/devinsy/xml/XMLReader.java +++ b/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. * @@ -35,7 +35,7 @@ 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.xml.XMLTag.TagType; /** @@ -422,8 +422,8 @@ public class XMLReader *
  • START_ELEMENT(X) + START_ELEMENT(Y) => => START TAG *
  • START_ELEMENT(X) + CHARACTERS(C) + START_ELEMENT(Y) => SPACES=> * START TAG - *
  • START_ELEMENT(X) + CHARACTERS(C) + END_ELEMENT(X) => C => - * CONTENT TAG + *
  • START_ELEMENT(X) + CHARACTERS(C) + END_ELEMENT(X) => C => CONTENT + * TAG *
  • START_ELEMENT(X) + END_ELEMENT(X) => => => EMPTY *
  • END_ELEMENT(X) => => END TAG *
  • END_DOCUMENT => FOOTER TAG diff --git a/src/fr/devinsy/xml/XMLTag.java b/src/fr/devinsy/xml/XMLTag.java index 9708bf0..8eaa863 100644 --- a/src/fr/devinsy/xml/XMLTag.java +++ b/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. * diff --git a/src/fr/devinsy/xml/XMLTools.java b/src/fr/devinsy/xml/XMLTools.java index 6f19bd3..ded4744 100644 --- a/src/fr/devinsy/xml/XMLTools.java +++ b/src/fr/devinsy/xml/XMLTools.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. * @@ -40,7 +40,7 @@ import org.apache.commons.lang3.StringUtils; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import fr.devinsy.util.strings.StringList; +import fr.devinsy.strings.StringList; /** * The Class XMLTools. diff --git a/src/fr/devinsy/xml/XMLWriter.java b/src/fr/devinsy/xml/XMLWriter.java index a9fe933..c7074e9 100644 --- a/src/fr/devinsy/xml/XMLWriter.java +++ b/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. * @@ -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.util.strings.StringListWriter; +import fr.devinsy.strings.StringList; +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 - * data are converted in XML format. + * This method write a XML tag with attributes and content data. Content data + * are converted in XML format. * * @param label * the label diff --git a/src/fr/devinsy/xml/XMLZipReader.java b/src/fr/devinsy/xml/XMLZipReader.java index 417dfb5..6ddaf7d 100644 --- a/src/fr/devinsy/xml/XMLZipReader.java +++ b/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. * diff --git a/src/fr/devinsy/xml/XMLZipWriter.java b/src/fr/devinsy/xml/XMLZipWriter.java index aa94734..8a9f0e7 100644 --- a/src/fr/devinsy/xml/XMLZipWriter.java +++ b/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. * diff --git a/src/fr/devinsy/xml/demo/XMLDemo.java b/src/fr/devinsy/xml/demo/XMLDemo.java index 8e6c079..39b0270 100644 --- a/src/fr/devinsy/xml/demo/XMLDemo.java +++ b/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. * diff --git a/test/foo/Foo.java b/test/foo/Foo.java index 11795b1..b67aa38 100644 --- a/test/foo/Foo.java +++ b/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,6 +16,8 @@ package foo; * You should have received a copy of the GNU Lesser General Public License * along with Devinsy-xml. If not, see */ +package foo; + import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.events.XMLEvent; diff --git a/test/fr/devinsy/xml/XMLReaderTest.java b/test/fr/devinsy/xml/XMLReaderTest.java index 7f02e59..b0a4a56 100644 --- a/test/fr/devinsy/xml/XMLReaderTest.java +++ b/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. * @@ -28,10 +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.xml.XMLBadFormatException; -import fr.devinsy.xml.XMLReader; -import fr.devinsy.xml.XMLTag; +import fr.devinsy.strings.StringList; /** * The Class XMLReaderTest. diff --git a/test/fr/devinsy/xml/XMLWriterTest.java b/test/fr/devinsy/xml/XMLWriterTest.java index 8967dc8..ebc1f72 100644 --- a/test/fr/devinsy/xml/XMLWriterTest.java +++ b/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. *