diff --git a/.classpath b/.classpath index cec28bd..53d12c0 100644 --- a/.classpath +++ b/.classpath @@ -3,16 +3,14 @@ - - - - - - - - + + + + + + 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 66c5706..b84ac01 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -3,5 +3,5 @@ - + 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/devinsy-strings-0.4.1-sources.zip b/lib/devinsy-strings-0.4.1-sources.zip deleted file mode 100644 index 8480d88..0000000 Binary files a/lib/devinsy-strings-0.4.1-sources.zip and /dev/null differ diff --git a/lib/devinsy-strings-0.4.1.jar b/lib/devinsy-strings-0.4.1.jar deleted file mode 100644 index e6febe7..0000000 Binary files a/lib/devinsy-strings-0.4.1.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/devinsy-xml-0.4.1-sources.zip b/lib/devinsy-xml-0.4.1-sources.zip deleted file mode 100644 index 1d560da..0000000 Binary files a/lib/devinsy-xml-0.4.1-sources.zip and /dev/null differ diff --git a/lib/devinsy-xml-0.4.1.jar b/lib/devinsy-xml-0.4.1.jar deleted file mode 100644 index a0d6fdb..0000000 Binary files a/lib/devinsy-xml-0.4.1.jar and /dev/null differ diff --git a/lib/devinsy-xml-0.8.0-sources.zip b/lib/devinsy-xml-0.8.0-sources.zip new file mode 100644 index 0000000..b196cb0 Binary files /dev/null and b/lib/devinsy-xml-0.8.0-sources.zip differ diff --git a/lib/devinsy-xml-0.8.0.jar b/lib/devinsy-xml-0.8.0.jar new file mode 100644 index 0000000..70e1b1c Binary files /dev/null and b/lib/devinsy-xml-0.8.0.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/util/rss/RSSCache.java b/src/fr/devinsy/util/rss/RSSCache.java index e0be83b..d96f8ca 100644 --- a/src/fr/devinsy/util/rss/RSSCache.java +++ b/src/fr/devinsy/util/rss/RSSCache.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import fr.devinsy.util.strings.StringList; +import fr.devinsy.strings.StringList; /** * The Class RSSCache. diff --git a/src/fr/devinsy/util/rss/RSSElement.java b/src/fr/devinsy/util/rss/RSSElement.java index 0534fa7..e13e94a 100644 --- a/src/fr/devinsy/util/rss/RSSElement.java +++ b/src/fr/devinsy/util/rss/RSSElement.java @@ -18,7 +18,8 @@ */ package fr.devinsy.util.rss; -import org.joda.time.DateTime; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; /** * The Class RSSElement. @@ -41,7 +42,7 @@ public class RSSElement * @param value * the value */ - public RSSElement(final String name, final DateTime value) + public RSSElement(final String name, final LocalDateTime value) { setName(name); if (value == null) @@ -50,7 +51,8 @@ public class RSSElement } else { - this.value = value.toString(DATE_PATTERN); + + this.value = value.format(DateTimeFormatter.ofPattern(DATE_PATTERN)); } this.attributes = null; } diff --git a/src/fr/devinsy/util/rss/RSSWriter.java b/src/fr/devinsy/util/rss/RSSWriter.java index 3bcc56c..7f0802b 100644 --- a/src/fr/devinsy/util/rss/RSSWriter.java +++ b/src/fr/devinsy/util/rss/RSSWriter.java @@ -25,7 +25,7 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.io.Writer; -import fr.devinsy.util.xml.XMLWriter; +import fr.devinsy.xml.XMLWriter; /** * The Class RSSWriter. diff --git a/src/fr/devinsy/util/rss/demo/RSSDemo.java b/src/fr/devinsy/util/rss/demo/RSSDemo.java index 1cce745..caec3cc 100644 --- a/src/fr/devinsy/util/rss/demo/RSSDemo.java +++ b/src/fr/devinsy/util/rss/demo/RSSDemo.java @@ -19,6 +19,7 @@ package fr.devinsy.util.rss.demo; import java.io.IOException; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; @@ -27,13 +28,12 @@ import javax.xml.stream.XMLStreamException; import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.joda.time.DateTime; +import fr.devinsy.strings.StringListWriter; import fr.devinsy.util.rss.RSSElement; import fr.devinsy.util.rss.RSSWriter; -import fr.devinsy.util.strings.StringListWriter; -import fr.devinsy.util.xml.XMLBadFormatException; -import fr.devinsy.util.xml.XMLTools; +import fr.devinsy.xml.XMLBadFormatException; +import fr.devinsy.xml.XMLTools; /** * The Class RssDemo. @@ -64,9 +64,10 @@ public class RSSDemo // List elements = new ArrayList(); - elements.add(new RSSElement("pubDate", DateTime.now())); - elements.add(new RSSElement("lastBuildDate", DateTime.now())); - elements.add(new RSSElement("generator", "Generated by Kiwa")); + LocalDateTime now = LocalDateTime.now(); + elements.add(new RSSElement("pubDate", now)); + elements.add(new RSSElement("lastBuildDate", now)); + elements.add(new RSSElement("generator", "Generated by Foo")); // out.writeChannel("my FEED_TITLE", "https://www.devinsy.fr/rss/news-en.rss", "my FEED_DESCRIPTION", elements.toArray(new RSSElement[0])); @@ -74,7 +75,7 @@ public class RSSDemo // elements.clear(); elements.add(new RSSElement("guid", "devinsy-news-000001", "isPermaLink", "false")); - elements.add(new RSSElement("pubDate", DateTime.now())); + elements.add(new RSSElement("pubDate", now)); elements.add(new RSSElement("author", "Christian P. MOMON ")); elements.add(new RSSElement("category", "Announce"));