Migrated to Java 8. Upgraded library jar files.
This commit is contained in:
parent
fb8872fd37
commit
d0cfebfa3a
28 changed files with 28 additions and 33 deletions
31
.classpath
31
.classpath
|
@ -4,28 +4,21 @@
|
||||||
<classpathentry kind="src" path="test"/>
|
<classpathentry kind="src" path="test"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
|
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
|
||||||
<classpathentry kind="lib" path="lib/servlet-api.jar"/>
|
<classpathentry kind="lib" path="lib/servlet-api.jar"/>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
|
<classpathentry kind="lib" path="lib/Logs/log4j-1.2.17-source.zip"/>
|
||||||
|
<classpathentry kind="lib" path="lib/Logs/log4j-1.2.17.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/fest-assert-1.4.jar"/>
|
||||||
|
<classpathentry kind="lib" path="lib/UnitTesting/fest-util-1.1.6.jar"/>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="owner.project.facets" value="java"/>
|
<attribute name="owner.project.facets" value="java"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="lib" path="lib/devinsy-utils-0.3.1.jar"/>
|
<classpathentry kind="lib" path="lib/UnitTesting/junit-4.12.jar" sourcepath="lib/UnitTesting/junit-4.12-sources.jar"/>
|
||||||
<classpathentry kind="lib" path="lib/Logs/log4j-1.2.17-source.zip"/>
|
<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/log4j-1.2.17.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/Logs/slf4j-api-1.7.5-sources.jar"/>
|
<classpathentry kind="lib" path="lib/commons-lang3-3.7.jar" sourcepath="lib/commons-lang3-3.7-sources.jar"/>
|
||||||
<classpathentry kind="lib" path="lib/Logs/slf4j-api-1.7.5.jar"/>
|
<classpathentry kind="lib" path="lib/devinsy-strings-0.8.2.jar" sourcepath="lib/devinsy-strings-0.8.2-sources.zip"/>
|
||||||
<classpathentry kind="lib" path="lib/Logs/slf4j-log4j12-1.7.5-sources.jar"/>
|
<classpathentry kind="lib" path="lib/devinsy-utils-0.8.0.jar" sourcepath="lib/devinsy-utils-0.8.0-sources.zip"/>
|
||||||
<classpathentry kind="lib" path="lib/Logs/slf4j-log4j12-1.7.5.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/UnitTesting/hamcrest-core-1.3-sources.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/UnitTesting/hamcrest-core-1.3.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/UnitTesting/junit-4.11-sources.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/UnitTesting/junit-4.11.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/UnitTesting/fest-assert-1.4-sources.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/UnitTesting/fest-assert-1.4.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/UnitTesting/fest-util-1.1.6-sources.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/UnitTesting/fest-util-1.1.6.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-lang3-3.1-sources.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/commons-lang3-3.1.jar"/>
|
|
||||||
<classpathentry kind="lib" path="lib/devinsy-utils-0.3.1-sources.zip"/>
|
|
||||||
<classpathentry kind="output" path="build/classes"/>
|
<classpathentry kind="output" path="build/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -11,15 +11,15 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
|
||||||
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
|
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
|
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.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.lineNumber=generate
|
||||||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
||||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=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.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_allocation_expression=16
|
||||||
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
|
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
<faceted-project>
|
<faceted-project>
|
||||||
<fixed facet="jst.java"/>
|
<fixed facet="jst.java"/>
|
||||||
<fixed facet="jst.utility"/>
|
<fixed facet="jst.utility"/>
|
||||||
<installed facet="jst.java" version="6.0"/>
|
|
||||||
<installed facet="jst.utility" version="1.0"/>
|
<installed facet="jst.utility" version="1.0"/>
|
||||||
|
<installed facet="jst.java" version="1.8"/>
|
||||||
</faceted-project>
|
</faceted-project>
|
||||||
|
|
4
TODO
4
TODO
|
@ -14,4 +14,6 @@ add management of Presenter (String html) with Presenter (String fileName)
|
||||||
|
|
||||||
20070228, cpm:
|
20070228, cpm:
|
||||||
add merging strategy parameter in attribute Data define.
|
add merging strategy parameter in attribute Data define.
|
||||||
|
|
||||||
|
20170922, cpm:
|
||||||
|
Currently, foo presenter included outdated feature. Split it.
|
||||||
|
|
BIN
lib/Logs/slf4j-api-1.7.25-sources.jar
Normal file
BIN
lib/Logs/slf4j-api-1.7.25-sources.jar
Normal file
Binary file not shown.
BIN
lib/Logs/slf4j-api-1.7.25.jar
Normal file
BIN
lib/Logs/slf4j-api-1.7.25.jar
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
lib/Logs/slf4j-log4j12-1.7.25-sources.jar
Normal file
BIN
lib/Logs/slf4j-log4j12-1.7.25-sources.jar
Normal file
Binary file not shown.
BIN
lib/Logs/slf4j-log4j12-1.7.25.jar
Normal file
BIN
lib/Logs/slf4j-log4j12-1.7.25.jar
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
lib/UnitTesting/junit-4.12-sources.jar
Normal file
BIN
lib/UnitTesting/junit-4.12-sources.jar
Normal file
Binary file not shown.
BIN
lib/UnitTesting/junit-4.12.jar
Normal file
BIN
lib/UnitTesting/junit-4.12.jar
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
lib/commons-lang3-3.7-sources.jar
Normal file
BIN
lib/commons-lang3-3.7-sources.jar
Normal file
Binary file not shown.
BIN
lib/commons-lang3-3.7.jar
Normal file
BIN
lib/commons-lang3-3.7.jar
Normal file
Binary file not shown.
BIN
lib/devinsy-strings-0.8.2-sources.zip
Normal file
BIN
lib/devinsy-strings-0.8.2-sources.zip
Normal file
Binary file not shown.
BIN
lib/devinsy-strings-0.8.2.jar
Normal file
BIN
lib/devinsy-strings-0.8.2.jar
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
lib/devinsy-utils-0.8.0-sources.zip
Normal file
BIN
lib/devinsy-utils-0.8.0-sources.zip
Normal file
Binary file not shown.
BIN
lib/devinsy-utils-0.8.0.jar
Normal file
BIN
lib/devinsy-utils-0.8.0.jar
Normal file
Binary file not shown.
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2006-2017 Christian Pierre MOMON
|
* Copyright (C) 2006-2018 Christian Pierre MOMON
|
||||||
*
|
*
|
||||||
* This file is part of Xidyn.
|
* This file is part of Xidyn.
|
||||||
*
|
*
|
||||||
|
@ -22,7 +22,7 @@ import org.apache.log4j.Level;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
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.SimpleTagData;
|
||||||
import fr.devinsy.xidyn.data.TagDataManager;
|
import fr.devinsy.xidyn.data.TagDataManager;
|
||||||
import fr.devinsy.xidyn.presenters.PresenterUtils;
|
import fr.devinsy.xidyn.presenters.PresenterUtils;
|
||||||
|
@ -32,13 +32,13 @@ import fr.devinsy.xidyn.presenters.PresenterUtils;
|
||||||
*/
|
*/
|
||||||
class XidynDemo
|
class XidynDemo
|
||||||
{
|
{
|
||||||
private final Logger logger = LoggerFactory.getLogger(XidynDemo.class);
|
|
||||||
static
|
static
|
||||||
{
|
{
|
||||||
// Initialize logger.
|
// Initialize logger.
|
||||||
org.apache.log4j.BasicConfigurator.configure();
|
org.apache.log4j.BasicConfigurator.configure();
|
||||||
org.apache.log4j.Logger.getRootLogger().setLevel(Level.INFO);
|
org.apache.log4j.Logger.getRootLogger().setLevel(Level.INFO);
|
||||||
}
|
}
|
||||||
|
private final Logger logger = LoggerFactory.getLogger(XidynDemo.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The main method.
|
* The main method.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2016,2017 Christian Pierre MOMON
|
* Copyright (C) 2016-2018 Christian Pierre MOMON
|
||||||
*
|
*
|
||||||
* This file is part of Xidyn.
|
* This file is part of Xidyn.
|
||||||
*
|
*
|
||||||
|
@ -24,7 +24,7 @@ import java.util.Locale;
|
||||||
|
|
||||||
import org.w3c.dom.Document;
|
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.presenters.PresenterFactory;
|
||||||
import fr.devinsy.xidyn.utils.cache.Cache;
|
import fr.devinsy.xidyn.utils.cache.Cache;
|
||||||
|
|
||||||
|
@ -183,7 +183,7 @@ public class PageFactory
|
||||||
{
|
{
|
||||||
Page result;
|
Page result;
|
||||||
|
|
||||||
String key = StringListUtils.toStringSeparatedBy(keys, "-").toString();
|
String key = StringsUtils.toStringSeparatedBy(keys, "-").toString();
|
||||||
|
|
||||||
result = this.cache.get(key);
|
result = this.cache.get(key);
|
||||||
if (result == null)
|
if (result == null)
|
||||||
|
@ -209,7 +209,7 @@ public class PageFactory
|
||||||
{
|
{
|
||||||
Page result;
|
Page result;
|
||||||
|
|
||||||
String key = StringListUtils.toStringSeparatedBy(keys, "-").toString();
|
String key = StringsUtils.toStringSeparatedBy(keys, "-").toString();
|
||||||
|
|
||||||
result = this.cache.get(key);
|
result = this.cache.get(key);
|
||||||
if (result == null)
|
if (result == null)
|
||||||
|
@ -235,7 +235,7 @@ public class PageFactory
|
||||||
{
|
{
|
||||||
Page result;
|
Page result;
|
||||||
|
|
||||||
String key = StringListUtils.toStringSeparatedBy(keys, "-").toString();
|
String key = StringsUtils.toStringSeparatedBy(keys, "-").toString();
|
||||||
|
|
||||||
result = this.cache.get(key);
|
result = this.cache.get(key);
|
||||||
if (result == null)
|
if (result == null)
|
||||||
|
@ -261,7 +261,7 @@ public class PageFactory
|
||||||
{
|
{
|
||||||
Page result;
|
Page result;
|
||||||
|
|
||||||
String key = StringListUtils.toStringSeparatedBy(keys, "-").toString();
|
String key = StringsUtils.toStringSeparatedBy(keys, "-").toString();
|
||||||
|
|
||||||
result = this.cache.get(key);
|
result = this.cache.get(key);
|
||||||
if (result == null)
|
if (result == null)
|
||||||
|
|
Loading…
Reference in a new issue