diff --git a/.classpath b/.classpath index de8504b..b32b5b3 100644 --- a/.classpath +++ b/.classpath @@ -4,28 +4,21 @@ - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 60464eb..6a1863f 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -11,15 +11,15 @@ 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.methodParameters=do not generate -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/TODO b/TODO index 9a23683..72fc895 100644 --- a/TODO +++ b/TODO @@ -14,4 +14,6 @@ add management of Presenter (String html) with Presenter (String fileName) 20070228, cpm: add merging strategy parameter in attribute Data define. - \ No newline at end of file + +20170922, cpm: +Currently, foo presenter included outdated feature. Split it. 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.8.2-sources.zip b/lib/devinsy-strings-0.8.2-sources.zip new file mode 100644 index 0000000..815e0b8 Binary files /dev/null and b/lib/devinsy-strings-0.8.2-sources.zip differ diff --git a/lib/devinsy-strings-0.8.2.jar b/lib/devinsy-strings-0.8.2.jar new file mode 100644 index 0000000..1e95075 Binary files /dev/null and b/lib/devinsy-strings-0.8.2.jar differ diff --git a/lib/devinsy-utils-0.3.1-sources.zip b/lib/devinsy-utils-0.3.1-sources.zip deleted file mode 100644 index 45f92fe..0000000 Binary files a/lib/devinsy-utils-0.3.1-sources.zip and /dev/null differ diff --git a/lib/devinsy-utils-0.3.1.jar b/lib/devinsy-utils-0.3.1.jar deleted file mode 100644 index 13bb8cf..0000000 Binary files a/lib/devinsy-utils-0.3.1.jar and /dev/null differ diff --git a/lib/devinsy-utils-0.8.0-sources.zip b/lib/devinsy-utils-0.8.0-sources.zip new file mode 100644 index 0000000..5ccaa1c Binary files /dev/null and b/lib/devinsy-utils-0.8.0-sources.zip differ diff --git a/lib/devinsy-utils-0.8.0.jar b/lib/devinsy-utils-0.8.0.jar new file mode 100644 index 0000000..10fc71b Binary files /dev/null and b/lib/devinsy-utils-0.8.0.jar differ diff --git a/src/fr/devinsy/xidyn/demo/XidynDemo.java b/src/fr/devinsy/xidyn/demo/XidynDemo.java index 739df2f..7aef9d5 100644 --- a/src/fr/devinsy/xidyn/demo/XidynDemo.java +++ b/src/fr/devinsy/xidyn/demo/XidynDemo.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2017 Christian Pierre MOMON + * Copyright (C) 2006-2018 Christian Pierre MOMON * * This file is part of Xidyn. * @@ -22,7 +22,7 @@ import org.apache.log4j.Level; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import fr.devinsy.util.strings.StringList; +import fr.devinsy.strings.StringList; import fr.devinsy.xidyn.data.SimpleTagData; import fr.devinsy.xidyn.data.TagDataManager; import fr.devinsy.xidyn.presenters.PresenterUtils; @@ -32,13 +32,13 @@ import fr.devinsy.xidyn.presenters.PresenterUtils; */ class XidynDemo { - private final Logger logger = LoggerFactory.getLogger(XidynDemo.class); static { // Initialize logger. org.apache.log4j.BasicConfigurator.configure(); org.apache.log4j.Logger.getRootLogger().setLevel(Level.INFO); } + private final Logger logger = LoggerFactory.getLogger(XidynDemo.class); /** * The main method. diff --git a/src/fr/devinsy/xidyn/pages/PageFactory.java b/src/fr/devinsy/xidyn/pages/PageFactory.java index f6f1a59..ccf36a2 100644 --- a/src/fr/devinsy/xidyn/pages/PageFactory.java +++ b/src/fr/devinsy/xidyn/pages/PageFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016,2017 Christian Pierre MOMON + * Copyright (C) 2016-2018 Christian Pierre MOMON * * This file is part of Xidyn. * @@ -24,7 +24,7 @@ import java.util.Locale; import org.w3c.dom.Document; -import fr.devinsy.util.strings.StringListUtils; +import fr.devinsy.strings.StringsUtils; import fr.devinsy.xidyn.presenters.PresenterFactory; import fr.devinsy.xidyn.utils.cache.Cache; @@ -183,7 +183,7 @@ public class PageFactory { Page result; - String key = StringListUtils.toStringSeparatedBy(keys, "-").toString(); + String key = StringsUtils.toStringSeparatedBy(keys, "-").toString(); result = this.cache.get(key); if (result == null) @@ -209,7 +209,7 @@ public class PageFactory { Page result; - String key = StringListUtils.toStringSeparatedBy(keys, "-").toString(); + String key = StringsUtils.toStringSeparatedBy(keys, "-").toString(); result = this.cache.get(key); if (result == null) @@ -235,7 +235,7 @@ public class PageFactory { Page result; - String key = StringListUtils.toStringSeparatedBy(keys, "-").toString(); + String key = StringsUtils.toStringSeparatedBy(keys, "-").toString(); result = this.cache.get(key); if (result == null) @@ -261,7 +261,7 @@ public class PageFactory { Page result; - String key = StringListUtils.toStringSeparatedBy(keys, "-").toString(); + String key = StringsUtils.toStringSeparatedBy(keys, "-").toString(); result = this.cache.get(key); if (result == null)