Index: TXM/trunk/org.txm.libs.batik/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.batik/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.batik/META-INF/MANIFEST.MF	(revision 3628)
@@ -1,21 +1,6 @@
 Manifest-Version: 1.0
 Bundle-SymbolicName: org.txm.libs.batik
-Export-Package: java_cup.runtime,
- javax.xml,
- javax.xml.datatype,
- javax.xml.namespace,
- javax.xml.parsers,
- javax.xml.stream,
- javax.xml.stream.events,
- javax.xml.stream.util,
- javax.xml.transform,
- javax.xml.transform.dom,
- javax.xml.transform.sax,
- javax.xml.transform.stax,
- javax.xml.transform.stream,
- javax.xml.validation,
- javax.xml.xpath,
- org.apache.batik,
+Export-Package: org.apache.batik,
  org.apache.batik.anim,
  org.apache.batik.anim.dom,
  org.apache.batik.anim.timing,
@@ -85,118 +70,9 @@
  org.apache.batik.w3c.dom,
  org.apache.batik.w3c.dom.events,
  org.apache.batik.xml,
- org.apache.bcel,
- org.apache.bcel.classfile,
- org.apache.bcel.generic,
- org.apache.bcel.util,
- org.apache.bcel.verifier,
- org.apache.bcel.verifier.exc,
- org.apache.bcel.verifier.statics,
- org.apache.bcel.verifier.structurals,
- org.apache.commons.io,
- org.apache.commons.io.filefilter,
- org.apache.commons.io.input,
- org.apache.commons.io.output,
- org.apache.commons.logging,
- org.apache.commons.logging.impl,
- org.apache.regexp,
- org.apache.xalan,
- org.apache.xalan.client,
- org.apache.xalan.extensions,
- org.apache.xalan.lib,
- org.apache.xalan.lib.sql,
- org.apache.xalan.processor,
- org.apache.xalan.res,
- org.apache.xalan.serialize,
- org.apache.xalan.templates,
- org.apache.xalan.trace,
- org.apache.xalan.transformer,
- org.apache.xalan.xslt,
- org.apache.xalan.xsltc,
- org.apache.xalan.xsltc.cmdline,
- org.apache.xalan.xsltc.cmdline.getopt,
- org.apache.xalan.xsltc.compiler,
- org.apache.xalan.xsltc.compiler.util,
- org.apache.xalan.xsltc.dom,
- org.apache.xalan.xsltc.runtime,
- org.apache.xalan.xsltc.runtime.output,
- org.apache.xalan.xsltc.trax,
- org.apache.xalan.xsltc.util,
- org.apache.xml.dtm,
- org.apache.xml.dtm.ref,
- org.apache.xml.dtm.ref.dom2dtm,
- org.apache.xml.dtm.ref.sax2dtm,
- org.apache.xml.res,
- org.apache.xml.serializer,
- org.apache.xml.serializer.dom3,
- org.apache.xml.serializer.utils,
- org.apache.xml.utils,
- org.apache.xml.utils.res,
- org.apache.xmlcommons,
- org.apache.xmlgraphics.fonts,
- org.apache.xmlgraphics.image,
- org.apache.xmlgraphics.image.codec.png,
- org.apache.xmlgraphics.image.codec.tiff,
- org.apache.xmlgraphics.image.codec.util,
- org.apache.xmlgraphics.image.loader,
- org.apache.xmlgraphics.image.loader.cache,
- org.apache.xmlgraphics.image.loader.impl,
- org.apache.xmlgraphics.image.loader.impl.imageio,
- org.apache.xmlgraphics.image.loader.pipeline,
- org.apache.xmlgraphics.image.loader.spi,
- org.apache.xmlgraphics.image.loader.util,
- org.apache.xmlgraphics.image.rendered,
- org.apache.xmlgraphics.image.writer,
- org.apache.xmlgraphics.image.writer.imageio,
- org.apache.xmlgraphics.image.writer.internal,
- org.apache.xmlgraphics.io,
- org.apache.xmlgraphics.java2d,
- org.apache.xmlgraphics.java2d.color,
- org.apache.xmlgraphics.java2d.color.profile,
- org.apache.xmlgraphics.java2d.ps,
- org.apache.xmlgraphics.ps,
- org.apache.xmlgraphics.ps.dsc,
- org.apache.xmlgraphics.ps.dsc.events,
- org.apache.xmlgraphics.ps.dsc.tools,
- org.apache.xmlgraphics.util,
- org.apache.xmlgraphics.util.dijkstra,
- org.apache.xmlgraphics.util.i18n,
- org.apache.xmlgraphics.util.io,
- org.apache.xmlgraphics.util.uri,
- org.apache.xmlgraphics.xmp,
- org.apache.xmlgraphics.xmp.merge,
- org.apache.xmlgraphics.xmp.schemas,
- org.apache.xmlgraphics.xmp.schemas.pdf,
- org.apache.xpath,
- org.apache.xpath.axes,
- org.apache.xpath.compiler,
- org.apache.xpath.domapi,
- org.apache.xpath.functions,
- org.apache.xpath.jaxp,
- org.apache.xpath.objects,
- org.apache.xpath.operations,
- org.apache.xpath.patterns,
- org.apache.xpath.res,
- org.w3c.css.sac,
- org.w3c.css.sac.helpers,
- org.w3c.dom,
- org.w3c.dom.bootstrap,
- org.w3c.dom.css,
- org.w3c.dom.events,
- org.w3c.dom.html,
- org.w3c.dom.ls,
- org.w3c.dom.ranges,
- org.w3c.dom.smil,
- org.w3c.dom.stylesheets,
- org.w3c.dom.svg,
- org.w3c.dom.traversal,
- org.w3c.dom.views,
- org.w3c.dom.xpath,
- org.xml.sax,
- org.xml.sax.ext,
- org.xml.sax.helpers
+ org.w3c.dom.svg
 Bundle-Name: Batik
-Bundle-Version: 1.14
+Bundle-Version: 1.14.0
 Bundle-ClassPath: .,
  batik-anim-1.14.jar,
  batik-awt-util-1.14.jar,
@@ -221,15 +97,14 @@
  commons-logging-1.0.4.jar,
  serializer-2.7.2.jar,
  xalan-2.7.2.jar,
- xml-apis-1.4.01.jar,
- xml-apis-ext-1.3.04.jar,
  xmlgraphics-commons-2.6.jar,
  batik-svggen-1.14.jar,
- batik-transcoder-1.14.jar
+ batik-transcoder-1.14.jar,
+ xml-apis-ext-1.3.04.jar
 Require-Bundle: org.apache.xerces;bundle-version="2.9.0";visibility:=r
  eexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: https://xmlgraphics.apache.org/batik/
 Automatic-Module-Name: org.txm.libs.batik
 
Index: TXM/trunk/org.txm.libs.batik/build.properties
===================================================================
--- TXM/trunk/org.txm.libs.batik/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.libs.batik/build.properties	(revision 3628)
@@ -25,8 +25,7 @@
                commons-logging-1.0.4.jar,\
                serializer-2.7.2.jar,\
                xalan-2.7.2.jar,\
-               xml-apis-1.4.01.jar,\
-               xml-apis-ext-1.3.04.jar,\
                xmlgraphics-commons-2.6.jar,\
                batik-svggen-1.14.jar,\
-               batik-transcoder-1.14.jar
+               batik-transcoder-1.14.jar,\
+               xml-apis-ext-1.3.04.jar
Index: TXM/trunk/org.txm.libs.batik/.classpath
===================================================================
--- TXM/trunk/org.txm.libs.batik/.classpath	(revision 3627)
+++ TXM/trunk/org.txm.libs.batik/.classpath	(revision 3628)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="xml-apis-ext-1.3.04.jar"/>
 	<classpathentry exported="true" kind="lib" path="batik-svggen-1.14.jar"/>
 	<classpathentry exported="true" kind="lib" path="batik-transcoder-1.14.jar"/>
 	<classpathentry exported="true" kind="lib" path="batik-anim-1.14.jar"/>
@@ -25,8 +26,6 @@
 	<classpathentry exported="true" kind="lib" path="commons-logging-1.0.4.jar"/>
 	<classpathentry exported="true" kind="lib" path="serializer-2.7.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="xalan-2.7.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="xml-apis-1.4.01.jar"/>
-	<classpathentry exported="true" kind="lib" path="xml-apis-ext-1.3.04.jar"/>
 	<classpathentry exported="true" kind="lib" path="xmlgraphics-commons-2.6.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

Property changes on: TXM/trunk/org.txm.libs.batik
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.office/lib/taglets-0.8.11-incubating.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/org.odftoolkit.odfdom.converter.core-1.0.6.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/slf4j-log4j12-1.7.6.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/xml-apis-1.3.04.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/xercesImpl-2.9.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/slf4j-api-1.7.25.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/commons-digester-1.8.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/jena-core-2.11.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/simple-odf-0.8.2-incubating.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/commons-collections-3.2.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/java-rdfa-0.4.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/jena-iri-1.0.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/odfdom-java-0.8.11-incubating.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/commons-validator-1.5.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/commons-logging-1.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/junit-3.8.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/odfdom-java-0.8.7.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/log4j-1.2.17.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/commons-beanutils-1.9.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.office/lib/odfdom-java-0.10.0-jar-with-dependencies.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.office/lib/odfdom-java-0.10.0-jar-with-dependencies.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.office/lib/simple-odf-0.9.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.office/lib/simple-odf-0.9.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.office/build.properties
===================================================================
--- TXM/trunk/org.txm.libs.office/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.libs.office/build.properties	(revision 3628)
@@ -1,25 +1,8 @@
-source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               lib/java-rdfa-0.4.2.jar,\
-               lib/log4j-1.2.17.jar,\
-               lib/odfdom-java-0.8.11-incubating.jar,\
-               lib/simple-odf-0.8.2-incubating.jar,\
-               lib/slf4j-api-1.7.25.jar,\
-               lib/commons-beanutils-1.9.2.jar,\
-               lib/commons-collections-3.2.2.jar,\
-               lib/commons-digester-1.8.1.jar,\
-               lib/commons-logging-1.2.jar,\
-               lib/commons-validator-1.5.0.jar,\
-               lib/jena-core-2.11.2.jar,\
-               lib/jena-iri-1.0.2.jar,\
-               lib/junit-3.8.1.jar,\
-               lib/odfdom-java-0.8.7.jar,\
-               lib/org.odftoolkit.odfdom.converter.core-1.0.6.jar,\
-               lib/slf4j-log4j12-1.7.6.jar,\
-               lib/taglets-0.8.11-incubating.jar,\
-               lib/xercesImpl-2.9.1.jar,\
-               lib/xml-apis-1.3.04.jar,\
-               OSGI-INF/
+               lib/odfdom-java-0.10.0-jar-with-dependencies.jar,\
+               lib/simple-odf-0.9.0.jar
 #qualifier=svn
+source.. = src/
Index: TXM/trunk/org.txm.libs.office/.classpath
===================================================================
--- TXM/trunk/org.txm.libs.office/.classpath	(revision 3627)
+++ TXM/trunk/org.txm.libs.office/.classpath	(revision 3628)
@@ -1,49 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con"
-		path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-	<classpathentry kind="con"
-		path="org.eclipse.pde.core.requiredPlugins" />
-	<classpathentry kind="src" path="src" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/commons-beanutils-1.9.2.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/commons-collections-3.2.2.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/commons-digester-1.8.1.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/commons-logging-1.2.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/commons-validator-1.5.0.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/java-rdfa-0.4.2.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/jena-core-2.11.2.jar"
-		sourcepath="/home/mdecorde/.m2/repository/org/apache/jena/jena-core/2.11.2/jena-core-2.11.2-sources.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/jena-iri-1.0.2.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/junit-3.8.1.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/log4j-1.2.17.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/odfdom-java-0.8.11-incubating.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/odfdom-java-0.8.7.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/org.odftoolkit.odfdom.converter.core-1.0.6.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/simple-odf-0.8.2-incubating.jar"
-		sourcepath="/home/mdecorde/.m2/repository/org/apache/odftoolkit/simple-odf/0.8.2-incubating/simple-odf-0.8.2-incubating-sources.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/slf4j-api-1.7.25.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/slf4j-log4j12-1.7.6.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/taglets-0.8.11-incubating.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/xercesImpl-2.9.1.jar" />
-	<classpathentry exported="true" kind="lib"
-		path="lib/xml-apis-1.3.04.jar" />
-	<classpathentry kind="output" path="bin" />
-</classpath>
\ No newline at end of file
+	<classpathentry exported="true" kind="lib" path="lib/simple-odf-0.9.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/odfdom-java-0.10.0-jar-with-dependencies.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: TXM/trunk/org.txm.libs.office/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.office/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.office/META-INF/MANIFEST.MF	(revision 3628)
@@ -1,100 +1,14 @@
 Manifest-Version: 1.0
 Automatic-Module-Name: org.txm.libs.office
 Bundle-SymbolicName: org.txm.libs.office
-Export-Package: com.hp.hpl.jena,
- com.hp.hpl.jena.assembler,
- com.hp.hpl.jena.assembler.assemblers,
- com.hp.hpl.jena.assembler.exceptions,
- com.hp.hpl.jena.datatypes,
- com.hp.hpl.jena.datatypes.xsd,
- com.hp.hpl.jena.datatypes.xsd.impl,
- com.hp.hpl.jena.enhanced,
- com.hp.hpl.jena.graph,
- com.hp.hpl.jena.graph.compose,
- com.hp.hpl.jena.graph.impl,
- com.hp.hpl.jena.mem,
- com.hp.hpl.jena.n3,
- com.hp.hpl.jena.n3.turtle,
- com.hp.hpl.jena.n3.turtle.parser,
- com.hp.hpl.jena.ontology,
- com.hp.hpl.jena.ontology.impl,
- com.hp.hpl.jena.rdf.arp,
- com.hp.hpl.jena.rdf.arp.impl,
- com.hp.hpl.jena.rdf.arp.lang,
- com.hp.hpl.jena.rdf.arp.states,
- com.hp.hpl.jena.rdf.listeners,
- com.hp.hpl.jena.rdf.model,
- com.hp.hpl.jena.rdf.model.impl,
- com.hp.hpl.jena.reasoner,
- com.hp.hpl.jena.reasoner.rulesys,
- com.hp.hpl.jena.reasoner.rulesys.builtins,
- com.hp.hpl.jena.reasoner.rulesys.impl,
- com.hp.hpl.jena.reasoner.transitiveReasoner,
- com.hp.hpl.jena.shared,
- com.hp.hpl.jena.shared.impl,
- com.hp.hpl.jena.shared.uuid,
- com.hp.hpl.jena.shared.wg,
- com.hp.hpl.jena.util,
- com.hp.hpl.jena.util.cache,
- com.hp.hpl.jena.util.iterator,
- com.hp.hpl.jena.vocabulary,
- com.hp.hpl.jena.xmloutput,
- com.hp.hpl.jena.xmloutput.impl,
- javax.xml,
- javax.xml.datatype,
- javax.xml.namespace,
- javax.xml.parsers,
- javax.xml.transform,
- javax.xml.transform.dom,
- javax.xml.transform.sax,
- javax.xml.transform.stream,
- javax.xml.validation,
- javax.xml.xpath,
- jena,
- jena.cmdline,
- junit.awtui,
- junit.extensions,
- junit.framework,
- junit.runner,
- junit.swingui,
- junit.textui,
- net.rootdev.javardfa,
- net.rootdev.javardfa.jena,
- net.rootdev.javardfa.literal,
- net.rootdev.javardfa.output,
- net.rootdev.javardfa.query,
- net.rootdev.javardfa.uri,
- org.apache.commons.beanutils,
- org.apache.commons.beanutils.converters,
- org.apache.commons.beanutils.expression,
- org.apache.commons.beanutils.locale,
- org.apache.commons.beanutils.locale.converters,
- org.apache.commons.collections,
- org.apache.commons.collections.bag,
- org.apache.commons.collections.bidimap,
- org.apache.commons.collections.buffer,
- org.apache.commons.collections.collection,
- org.apache.commons.collections.comparators,
- org.apache.commons.collections.functors,
- org.apache.commons.collections.iterators,
- org.apache.commons.collections.keyvalue,
- org.apache.commons.collections.list,
- org.apache.commons.collections.map,
- org.apache.commons.collections.set,
- org.txm.libs.office
+Export-Package: org.txm.libs.office
 Bundle-Name: org.txm.libs.office
 Bundle-Version: 0.8.2.qualifier
-Bundle-ClassPath: lib/commons-beanutils-1.9.2.jar,lib/commons-collecti
- ons-3.2.2.jar,lib/commons-digester-1.8.1.jar,lib/commons-logging-1.2.
- jar,lib/commons-validator-1.5.0.jar,lib/java-rdfa-0.4.2.jar,lib/jena-
- core-2.11.2.jar,lib/jena-iri-1.0.2.jar,lib/junit-3.8.1.jar,lib/log4j-
- 1.2.17.jar,lib/odfdom-java-0.8.11-incubating.jar,lib/odfdom-java-0.8.
- 7.jar,lib/org.odftoolkit.odfdom.converter.core-1.0.6.jar,lib/simple-o
- df-0.8.2-incubating.jar,lib/slf4j-api-1.7.25.jar,lib/slf4j-log4j12-1.
- 7.6.jar,lib/taglets-0.8.11-incubating.jar,lib/xercesImpl-2.9.1.jar,li
- b/xml-apis-1.3.04.jar,.
+Bundle-ClassPath: .,
+ lib/odfdom-java-0.10.0-jar-with-dependencies.jar,
+ lib/simple-odf-0.9.0.jar
 Require-Bundle: org.apache.xerces;bundle-version="2.9.0"
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Apache ODF Toolkit (incubating)
 

Property changes on: TXM/trunk/org.txm.libs.office
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.groovy-all/.classpath
===================================================================
--- TXM/trunk/org.txm.libs.groovy-all/.classpath	(revision 3627)
+++ TXM/trunk/org.txm.libs.groovy-all/.classpath	(revision 3628)
@@ -1,32 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-ant-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-astbuilder-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-bsf-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-cli-commons-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-cli-picocli-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-console-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-datetime-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-dateutil-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-docgenerator-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-groovydoc-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-groovysh-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-jaxb-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-jmx-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-json-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-jsr223-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-macro-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-nio-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-servlet-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-sql-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-swing-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-templates-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-test-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-test-junit5-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-testng-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-xml-3.0.9-indy.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/groovy-yaml-3.0.9-indy.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ant-1.10.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ant-antlr-1.10.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ant-junit-1.10.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ant-launcher-1.10.12.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-cli-1.5.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/gpars-1.2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-ant-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-astbuilder-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-cli-commons-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-cli-picocli-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-console-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-contracts-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-datetime-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-dateutil-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-docgenerator-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-ginq-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-groovydoc-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-groovysh-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-jmx-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-json-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-jsr223-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-macro-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-macro-library-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-nio-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-servlet-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-sql-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-swing-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-templates-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-test-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-test-junit5-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-testng-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-toml-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-typecheckers-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-xml-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/groovy-yaml-4.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ivy-2.5.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.13.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.13.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.13.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jackson-dataformat-toml-2.13.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jackson-dataformat-yaml-2.13.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jansi-2.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/javaparser-core-3.24.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jcommander-1.78.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jline-2.14.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jquery-3.5.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jsr166y-1.7.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit-4.13.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit-jupiter-api-5.8.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit-jupiter-engine-5.8.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit-platform-commons-1.8.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit-platform-engine-1.8.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit-platform-launcher-1.8.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/multiverse-core-0.7.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/mxparser-1.2.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/opentest4j-1.2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.abego.treelayout.core-1.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/qdox-1.12.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.32.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/snakeyaml-1.30.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/testng-7.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xstream-1.4.19.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
Index: TXM/trunk/org.txm.libs.groovy-all/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.groovy-all/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.groovy-all/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,9 +10,10 @@
  groovy.console.ui,
  groovy.console.ui.text,
  groovy.console.ui.view,
+ groovy.contracts,
+ groovy.ginq.transform,
  groovy.grape,
  groovy.inspect,
- groovy.inspect.swingui,
  groovy.io,
  groovy.jmx,
  groovy.jmx.builder,
@@ -21,7 +22,6 @@
  groovy.lang,
  groovy.lang.groovydoc,
  groovy.mock.interceptor,
- groovy.model,
  groovy.namespace,
  groovy.security,
  groovy.servlet,
@@ -36,34 +36,21 @@
  groovy.text,
  groovy.text.markup,
  groovy.time,
+ groovy.toml,
  groovy.transform,
  groovy.transform.builder,
  groovy.transform.options,
  groovy.transform.stc,
+ groovy.typecheckers,
  groovy.ui,
- groovy.ui.text,
- groovy.ui.view,
  groovy.util,
  groovy.util.logging,
- groovy.util.slurpersupport,
  groovy.xml,
  groovy.xml.dom,
  groovy.xml.markupsupport,
  groovy.xml.slurpersupport,
  groovy.xml.streamingmarkupsupport,
  groovy.yaml,
- groovyjarjarantlr,
- groovyjarjarantlr.ASdebug,
- groovyjarjarantlr.actions.cpp,
- groovyjarjarantlr.actions.csharp,
- groovyjarjarantlr.actions.java,
- groovyjarjarantlr.actions.python,
- groovyjarjarantlr.build,
- groovyjarjarantlr.collections,
- groovyjarjarantlr.collections.impl,
- groovyjarjarantlr.debug,
- groovyjarjarantlr.debug.misc,
- groovyjarjarantlr.preprocessor,
  groovyjarjarantlr4.runtime,
  groovyjarjarantlr4.runtime.debug,
  groovyjarjarantlr4.runtime.misc,
@@ -96,12 +83,56 @@
  groovyjarjarasm.asm.tree,
  groovyjarjarasm.asm.util,
  groovyjarjarpicocli,
+ groovyx.gpars,
+ groovyx.gpars.activeobject,
+ groovyx.gpars.actor,
+ groovyx.gpars.actor.impl,
+ groovyx.gpars.agent,
+ groovyx.gpars.csp,
+ groovyx.gpars.csp.plugAndPlay,
+ groovyx.gpars.csp.util,
+ groovyx.gpars.dataflow,
+ groovyx.gpars.dataflow.expression,
+ groovyx.gpars.dataflow.impl,
+ groovyx.gpars.dataflow.operator,
+ groovyx.gpars.dataflow.operator.component,
+ groovyx.gpars.dataflow.stream,
+ groovyx.gpars.extra166y,
+ groovyx.gpars.forkjoin,
+ groovyx.gpars.group,
+ groovyx.gpars.memoize,
+ groovyx.gpars.pa,
+ groovyx.gpars.remote,
+ groovyx.gpars.remote.message,
+ groovyx.gpars.remote.netty,
+ groovyx.gpars.scheduler,
+ groovyx.gpars.serial,
+ groovyx.gpars.stm,
+ groovyx.gpars.util,
  org.apache.groovy.antlr,
  org.apache.groovy.ast.builder,
  org.apache.groovy.ast.tools,
+ org.apache.groovy.contracts,
+ org.apache.groovy.contracts.annotations.meta,
+ org.apache.groovy.contracts.ast,
+ org.apache.groovy.contracts.ast.visitor,
+ org.apache.groovy.contracts.classgen.asm,
+ org.apache.groovy.contracts.common.base,
+ org.apache.groovy.contracts.common.impl,
+ org.apache.groovy.contracts.common.impl.lc,
+ org.apache.groovy.contracts.common.spi,
+ org.apache.groovy.contracts.domain,
+ org.apache.groovy.contracts.generation,
+ org.apache.groovy.contracts.util,
  org.apache.groovy.datetime.extensions,
  org.apache.groovy.dateutil.extensions,
  org.apache.groovy.docgenerator,
+ org.apache.groovy.ginq,
+ org.apache.groovy.ginq.dsl,
+ org.apache.groovy.ginq.dsl.expression,
+ org.apache.groovy.ginq.provider.collection,
+ org.apache.groovy.ginq.provider.collection.runtime,
+ org.apache.groovy.ginq.transform,
  org.apache.groovy.groovydoc.tools,
  org.apache.groovy.groovysh,
  org.apache.groovy.groovysh.antlr4,
@@ -113,10 +144,11 @@
  org.apache.groovy.internal.metaclass,
  org.apache.groovy.internal.util,
  org.apache.groovy.io,
- org.apache.groovy.jaxb.extensions,
  org.apache.groovy.json,
  org.apache.groovy.json.internal,
+ org.apache.groovy.lang,
  org.apache.groovy.lang.annotation,
+ org.apache.groovy.macrolib,
  org.apache.groovy.metaclass,
  org.apache.groovy.nio.extensions,
  org.apache.groovy.nio.runtime,
@@ -131,25 +163,23 @@
  org.apache.groovy.swing.extensions,
  org.apache.groovy.test,
  org.apache.groovy.test.transform,
+ org.apache.groovy.toml.util,
+ org.apache.groovy.typecheckers,
  org.apache.groovy.util,
  org.apache.groovy.util.concurrent,
  org.apache.groovy.util.concurrent.concurrentlinkedhashmap,
  org.apache.groovy.xml.extensions,
  org.apache.groovy.xml.tools,
  org.apache.groovy.yaml.util,
+ org.codehaus.groovy,
  org.codehaus.groovy.ant,
  org.codehaus.groovy.antlr,
- org.codehaus.groovy.antlr.java,
- org.codehaus.groovy.antlr.parser,
- org.codehaus.groovy.antlr.treewalker,
  org.codehaus.groovy.ast,
  org.codehaus.groovy.ast.builder,
  org.codehaus.groovy.ast.decompiled,
  org.codehaus.groovy.ast.expr,
  org.codehaus.groovy.ast.stmt,
  org.codehaus.groovy.ast.tools,
- org.codehaus.groovy.binding,
- org.codehaus.groovy.bsf,
  org.codehaus.groovy.classgen,
  org.codehaus.groovy.classgen.asm,
  org.codehaus.groovy.classgen.asm.indy,
@@ -168,7 +198,6 @@
  org.codehaus.groovy.macro.methods,
  org.codehaus.groovy.macro.runtime,
  org.codehaus.groovy.macro.transform,
- org.codehaus.groovy.plugin,
  org.codehaus.groovy.reflection,
  org.codehaus.groovy.reflection.android,
  org.codehaus.groovy.reflection.stdclasses,
@@ -184,7 +213,6 @@
  org.codehaus.groovy.runtime.typehandling,
  org.codehaus.groovy.runtime.wrappers,
  org.codehaus.groovy.syntax,
- org.codehaus.groovy.testng,
  org.codehaus.groovy.tools,
  org.codehaus.groovy.tools.ast,
  org.codehaus.groovy.tools.groovydoc,
@@ -193,10 +221,7 @@
  org.codehaus.groovy.tools.gse,
  org.codehaus.groovy.tools.javac,
  org.codehaus.groovy.tools.shell,
- org.codehaus.groovy.tools.shell.commands,
- org.codehaus.groovy.tools.shell.completion,
  org.codehaus.groovy.tools.shell.util,
- org.codehaus.groovy.tools.xml,
  org.codehaus.groovy.transform,
  org.codehaus.groovy.transform.sc,
  org.codehaus.groovy.transform.sc.transformers,
@@ -205,43 +230,80 @@
  org.codehaus.groovy.transform.trait,
  org.codehaus.groovy.util,
  org.codehaus.groovy.vmplugin,
- org.codehaus.groovy.vmplugin.v5,
- org.codehaus.groovy.vmplugin.v6,
+ org.codehaus.groovy.vmplugin.v10,
+ org.codehaus.groovy.vmplugin.v16,
  org.codehaus.groovy.vmplugin.v7,
  org.codehaus.groovy.vmplugin.v8,
  org.codehaus.groovy.vmplugin.v9
 Bundle-Name: Groovy-all
 Bundle-Version: 3.0.9
 Bundle-ClassPath: .,
- lib/groovy-3.0.9-indy.jar,
- lib/groovy-ant-3.0.9-indy.jar,
- lib/groovy-astbuilder-3.0.9-indy.jar,
- lib/groovy-bsf-3.0.9-indy.jar,
- lib/groovy-cli-commons-3.0.9-indy.jar,
- lib/groovy-cli-picocli-3.0.9-indy.jar,
- lib/groovy-console-3.0.9-indy.jar,
- lib/groovy-datetime-3.0.9-indy.jar,
- lib/groovy-dateutil-3.0.9-indy.jar,
- lib/groovy-docgenerator-3.0.9-indy.jar,
- lib/groovy-groovydoc-3.0.9-indy.jar,
- lib/groovy-groovysh-3.0.9-indy.jar,
- lib/groovy-jaxb-3.0.9-indy.jar,
- lib/groovy-jmx-3.0.9-indy.jar,
- lib/groovy-json-3.0.9-indy.jar,
- lib/groovy-jsr223-3.0.9-indy.jar,
- lib/groovy-macro-3.0.9-indy.jar,
- lib/groovy-nio-3.0.9-indy.jar,
- lib/groovy-servlet-3.0.9-indy.jar,
- lib/groovy-sql-3.0.9-indy.jar,
- lib/groovy-swing-3.0.9-indy.jar,
- lib/groovy-templates-3.0.9-indy.jar,
- lib/groovy-test-3.0.9-indy.jar,
- lib/groovy-test-junit5-3.0.9-indy.jar,
- lib/groovy-testng-3.0.9-indy.jar,
- lib/groovy-xml-3.0.9-indy.jar,
- lib/groovy-yaml-3.0.9-indy.jar
+ lib/ant-1.10.12.jar,
+ lib/ant-antlr-1.10.12.jar,
+ lib/ant-junit-1.10.12.jar,
+ lib/ant-launcher-1.10.12.jar,
+ lib/commons-cli-1.5.0.jar,
+ lib/gpars-1.2.1.jar,
+ lib/groovy-4.0.3.jar,
+ lib/groovy-ant-4.0.3.jar,
+ lib/groovy-astbuilder-4.0.3.jar,
+ lib/groovy-cli-commons-4.0.3.jar,
+ lib/groovy-cli-picocli-4.0.3.jar,
+ lib/groovy-console-4.0.3.jar,
+ lib/groovy-contracts-4.0.3.jar,
+ lib/groovy-datetime-4.0.3.jar,
+ lib/groovy-dateutil-4.0.3.jar,
+ lib/groovy-docgenerator-4.0.3.jar,
+ lib/groovy-ginq-4.0.3.jar,
+ lib/groovy-groovydoc-4.0.3.jar,
+ lib/groovy-groovysh-4.0.3.jar,
+ lib/groovy-jmx-4.0.3.jar,
+ lib/groovy-json-4.0.3.jar,
+ lib/groovy-jsr223-4.0.3.jar,
+ lib/groovy-macro-4.0.3.jar,
+ lib/groovy-macro-library-4.0.3.jar,
+ lib/groovy-nio-4.0.3.jar,
+ lib/groovy-servlet-4.0.3.jar,
+ lib/groovy-sql-4.0.3.jar,
+ lib/groovy-swing-4.0.3.jar,
+ lib/groovy-templates-4.0.3.jar,
+ lib/groovy-test-4.0.3.jar,
+ lib/groovy-test-junit5-4.0.3.jar,
+ lib/groovy-testng-4.0.3.jar,
+ lib/groovy-toml-4.0.3.jar,
+ lib/groovy-typecheckers-4.0.3.jar,
+ lib/groovy-xml-4.0.3.jar,
+ lib/groovy-yaml-4.0.3.jar,
+ lib/hamcrest-core-1.3.jar,
+ lib/ivy-2.5.0.jar,
+ lib/jackson-annotations-2.13.3.jar,
+ lib/jackson-core-2.13.3.jar,
+ lib/jackson-databind-2.13.3.jar,
+ lib/jackson-dataformat-toml-2.13.3.jar,
+ lib/jackson-dataformat-yaml-2.13.3.jar,
+ lib/jansi-2.4.0.jar,
+ lib/javaparser-core-3.24.2.jar,
+ lib/jcommander-1.78.jar,
+ lib/jline-2.14.6.jar,
+ lib/jquery-3.5.1.jar,
+ lib/jsr166y-1.7.0.jar,
+ lib/junit-4.13.2.jar,
+ lib/junit-jupiter-api-5.8.2.jar,
+ lib/junit-jupiter-engine-5.8.2.jar,
+ lib/junit-platform-commons-1.8.2.jar,
+ lib/junit-platform-engine-1.8.2.jar,
+ lib/junit-platform-launcher-1.8.2.jar,
+ lib/multiverse-core-0.7.0.jar,
+ lib/mxparser-1.2.2.jar,
+ lib/opentest4j-1.2.0.jar,
+ lib/org.abego.treelayout.core-1.0.3.jar,
+ lib/qdox-1.12.1.jar,
+ lib/slf4j-api-1.7.32.jar,
+ lib/snakeyaml-1.30.jar,
+ lib/testng-7.5.jar,
+ lib/xstream-1.4.19.jar
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.libs.groovy-all
 
Index: TXM/trunk/org.txm.libs.groovy-all/lib/junit-platform-engine-1.8.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/junit-platform-engine-1.8.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-macro-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-macro-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/multiverse-core-0.7.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/multiverse-core-0.7.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-yaml-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-yaml-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-testng-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-testng-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/opentest4j-1.2.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/opentest4j-1.2.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-groovydoc-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-groovydoc-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-ant-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-ant-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/ivy-2.5.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/ivy-2.5.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-servlet-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-servlet-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/gpars-1.2.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/gpars-1.2.1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/ant-launcher-1.10.12.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/ant-launcher-1.10.12.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/jquery-3.5.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/jquery-3.5.1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-astbuilder-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-astbuilder-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/jline-2.14.6.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/jline-2.14.6.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/jackson-core-2.13.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/jackson-core-2.13.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-test-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-test-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/ant-junit-1.10.12.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/ant-junit-1.10.12.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/testng-7.5.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/testng-7.5.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/junit-4.13.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/junit-4.13.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/junit-platform-launcher-1.8.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/junit-platform-launcher-1.8.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/slf4j-api-1.7.32.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/slf4j-api-1.7.32.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/ant-1.10.12.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/ant-1.10.12.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-jmx-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-jmx-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-templates-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-templates-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-sql-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-sql-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-xml-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-xml-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-console-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-console-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/junit-platform-commons-1.8.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/junit-platform-commons-1.8.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/qdox-1.12.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/qdox-1.12.1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/jackson-dataformat-yaml-2.13.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/jackson-dataformat-yaml-2.13.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/hamcrest-core-1.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/hamcrest-core-1.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/mxparser-1.2.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/mxparser-1.2.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/jansi-2.4.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/jansi-2.4.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/jackson-dataformat-toml-2.13.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/jackson-dataformat-toml-2.13.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/snakeyaml-1.30.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/snakeyaml-1.30.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-cli-commons-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-cli-commons-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy.icns
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy.icns
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/javaparser-core-3.24.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/javaparser-core-3.24.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-swing-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-swing-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/jackson-databind-2.13.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/jackson-databind-2.13.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-ginq-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-ginq-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-contracts-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-contracts-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/org.abego.treelayout.core-1.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/org.abego.treelayout.core-1.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/junit-jupiter-engine-5.8.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/junit-jupiter-engine-5.8.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/jsr166y-1.7.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/jsr166y-1.7.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-macro-library-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-macro-library-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/junit-jupiter-api-5.8.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/junit-jupiter-api-5.8.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-json-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-json-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-toml-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-toml-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/ant-antlr-1.10.12.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/ant-antlr-1.10.12.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-dateutil-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-dateutil-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-docgenerator-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-docgenerator-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-groovysh-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-groovysh-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/jackson-annotations-2.13.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/jackson-annotations-2.13.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-nio-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-nio-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-jsr223-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-jsr223-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-cli-picocli-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-cli-picocli-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/jcommander-1.78.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/jcommander-1.78.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/xstream-1.4.19.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/xstream-1.4.19.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-typecheckers-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-typecheckers-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-test-junit5-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-test-junit5-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-datetime-4.0.3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/groovy-datetime-4.0.3.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.groovy-all/lib/commons-cli-1.5.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib/commons-cli-1.5.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: TXM/trunk/org.txm.libs.groovy-all/lib
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.libs.groovy-all/build.properties
===================================================================
--- TXM/trunk/org.txm.libs.groovy-all/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.libs.groovy-all/build.properties	(revision 3628)
@@ -1,30 +1,67 @@
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/,\
-               lib/groovy-3.0.9-indy.jar,\
-               lib/groovy-ant-3.0.9-indy.jar,\
-               lib/groovy-astbuilder-3.0.9-indy.jar,\
-               lib/groovy-bsf-3.0.9-indy.jar,\
-               lib/groovy-cli-commons-3.0.9-indy.jar,\
-               lib/groovy-cli-picocli-3.0.9-indy.jar,\
-               lib/groovy-console-3.0.9-indy.jar,\
-               lib/groovy-datetime-3.0.9-indy.jar,\
-               lib/groovy-dateutil-3.0.9-indy.jar,\
-               lib/groovy-docgenerator-3.0.9-indy.jar,\
-               lib/groovy-groovydoc-3.0.9-indy.jar,\
-               lib/groovy-groovysh-3.0.9-indy.jar,\
-               lib/groovy-jaxb-3.0.9-indy.jar,\
-               lib/groovy-jmx-3.0.9-indy.jar,\
-               lib/groovy-json-3.0.9-indy.jar,\
-               lib/groovy-jsr223-3.0.9-indy.jar,\
-               lib/groovy-macro-3.0.9-indy.jar,\
-               lib/groovy-nio-3.0.9-indy.jar,\
-               lib/groovy-servlet-3.0.9-indy.jar,\
-               lib/groovy-sql-3.0.9-indy.jar,\
-               lib/groovy-swing-3.0.9-indy.jar,\
-               lib/groovy-templates-3.0.9-indy.jar,\
-               lib/groovy-test-3.0.9-indy.jar,\
-               lib/groovy-test-junit5-3.0.9-indy.jar,\
-               lib/groovy-testng-3.0.9-indy.jar,\
-               lib/groovy-xml-3.0.9-indy.jar,\
-               lib/groovy-yaml-3.0.9-indy.jar
+               lib/ant-1.10.12.jar,\
+               lib/ant-antlr-1.10.12.jar,\
+               lib/ant-junit-1.10.12.jar,\
+               lib/ant-launcher-1.10.12.jar,\
+               lib/commons-cli-1.5.0.jar,\
+               lib/gpars-1.2.1.jar,\
+               lib/groovy-4.0.3.jar,\
+               lib/groovy-ant-4.0.3.jar,\
+               lib/groovy-astbuilder-4.0.3.jar,\
+               lib/groovy-cli-commons-4.0.3.jar,\
+               lib/groovy-cli-picocli-4.0.3.jar,\
+               lib/groovy-console-4.0.3.jar,\
+               lib/groovy-contracts-4.0.3.jar,\
+               lib/groovy-datetime-4.0.3.jar,\
+               lib/groovy-dateutil-4.0.3.jar,\
+               lib/groovy-docgenerator-4.0.3.jar,\
+               lib/groovy-ginq-4.0.3.jar,\
+               lib/groovy-groovydoc-4.0.3.jar,\
+               lib/groovy-groovysh-4.0.3.jar,\
+               lib/groovy-jmx-4.0.3.jar,\
+               lib/groovy-json-4.0.3.jar,\
+               lib/groovy-jsr223-4.0.3.jar,\
+               lib/groovy-macro-4.0.3.jar,\
+               lib/groovy-macro-library-4.0.3.jar,\
+               lib/groovy-nio-4.0.3.jar,\
+               lib/groovy-servlet-4.0.3.jar,\
+               lib/groovy-sql-4.0.3.jar,\
+               lib/groovy-swing-4.0.3.jar,\
+               lib/groovy-templates-4.0.3.jar,\
+               lib/groovy-test-4.0.3.jar,\
+               lib/groovy-test-junit5-4.0.3.jar,\
+               lib/groovy-testng-4.0.3.jar,\
+               lib/groovy-toml-4.0.3.jar,\
+               lib/groovy-typecheckers-4.0.3.jar,\
+               lib/groovy-xml-4.0.3.jar,\
+               lib/groovy-yaml-4.0.3.jar,\
+               lib/hamcrest-core-1.3.jar,\
+               lib/ivy-2.5.0.jar,\
+               lib/jackson-annotations-2.13.3.jar,\
+               lib/jackson-core-2.13.3.jar,\
+               lib/jackson-databind-2.13.3.jar,\
+               lib/jackson-dataformat-toml-2.13.3.jar,\
+               lib/jackson-dataformat-yaml-2.13.3.jar,\
+               lib/jansi-2.4.0.jar,\
+               lib/javaparser-core-3.24.2.jar,\
+               lib/jcommander-1.78.jar,\
+               lib/jline-2.14.6.jar,\
+               lib/jquery-3.5.1.jar,\
+               lib/jsr166y-1.7.0.jar,\
+               lib/junit-4.13.2.jar,\
+               lib/junit-jupiter-api-5.8.2.jar,\
+               lib/junit-jupiter-engine-5.8.2.jar,\
+               lib/junit-platform-commons-1.8.2.jar,\
+               lib/junit-platform-engine-1.8.2.jar,\
+               lib/junit-platform-launcher-1.8.2.jar,\
+               lib/multiverse-core-0.7.0.jar,\
+               lib/mxparser-1.2.2.jar,\
+               lib/opentest4j-1.2.0.jar,\
+               lib/org.abego.treelayout.core-1.0.3.jar,\
+               lib/qdox-1.12.1.jar,\
+               lib/slf4j-api-1.7.32.jar,\
+               lib/snakeyaml-1.30.jar,\
+               lib/testng-7.5.jar,\
+               lib/xstream-1.4.19.jar

Property changes on: TXM/trunk/org.txm.libs.groovy-all
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.conllu.core/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- TXM/trunk/org.txm.conllu.core/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3627)
+++ TXM/trunk/org.txm.conllu.core/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3628)
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-groovy.compiler.level=30
+groovy.compiler.level=40
 groovy.script.filters=**/*.dsld,y,**/*.gradle,n
Index: TXM/trunk/org.txm.conllu.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.conllu.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.conllu.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -12,6 +12,6 @@
  org.txm.libs.deptreeviz;bundle-version="0.3.0";visibility:=reexport,
  org.txm.tigersearch.core;bundle-version="1.0.0"
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
-
+Eclipse-BundleShape: dir

Property changes on: TXM/trunk/org.txm.conllu.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.tigersearch.rcp/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- TXM/trunk/org.txm.tigersearch.rcp/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3627)
+++ TXM/trunk/org.txm.tigersearch.rcp/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3628)
@@ -1,3 +1,2 @@
 eclipse.preferences.version=1
-groovy.compiler.level=30
-groovy.script.filters=**/*.dsld,y,**/*.gradle,n
+groovy.compiler.level=40
Index: TXM/trunk/org.txm.tigersearch.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.tigersearch.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.tigersearch.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -9,7 +9,7 @@
  org.txm.treesearch.rcp;bundle-version="1.0.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: %Bundle-Vendor
 Import-Package: ims.tiger.gui.tigergraphviewer.forest
 Export-Package: ims.jmanual,ims.tiger.corpus,ims.tiger.export,ims.tige
@@ -47,4 +47,4 @@
  .
 Bundle-Activator: tigersearch4txm.Activator
 Automatic-Module-Name: org.txm.tigersearch.rcp
-
+Eclipse-BundleShape: dir
Index: TXM/trunk/org.txm.tigersearch.rcp/src/org/txm/export/ts/MatchInject.groovy
===================================================================
--- TXM/trunk/org.txm.tigersearch.rcp/src/org/txm/export/ts/MatchInject.groovy	(revision 3627)
+++ TXM/trunk/org.txm.tigersearch.rcp/src/org/txm/export/ts/MatchInject.groovy	(revision 3628)
@@ -1,9 +1,9 @@
 #! /usr/bin/groovy
 package org.txm.export.ts;
 
+import groovy.xml.XmlSlurper
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
-import groovy.util.*
 
 //import groovy.util.slurpersupport.NodeChild
 

Property changes on: TXM/trunk/org.txm.tigersearch.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.conllu.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.conllu.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.conllu.feature/build.properties	(revision 3628)
@@ -1 +1 @@
-bin.includes = feature.xml
+bin.includes = feature.xml, build.properties

Property changes on: TXM/trunk/org.txm.conllu.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.wordcloud.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.wordcloud.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.wordcloud.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
  ="1.0.0";visibility:=reexport,org.txm.index.core;bundle-version="1.0.
  0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.wordcloud.core
 

Property changes on: TXM/trunk/org.txm.wordcloud.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.dictionary.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.dictionary.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.dictionary.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:09 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.dictionary.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.dictionary.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.dictionary.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="Dictionary"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Dictionnary
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -37,7 +37,7 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.txm.libs.groovy-all" version="2.3.3" match="greaterOrEqual"/>
       <import plugin="org.txm.core" version="0.7.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui"/>

Property changes on: TXM/trunk/org.txm.dictionary.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.libs.javafx.macosx/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.javafx.macosx/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.javafx.macosx/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.txm.libs.javafx.macosx
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.txm.libs.javafx.macosx
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-ClassPath: jfxswt.jar,
  jfxrt.jar
 Export-Package: com.sun.deploy.uitoolkit.impl.fx,

Property changes on: TXM/trunk/org.txm.libs.javafx.macosx
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/preferences/CQPPreferencePage.java	(revision 3628)
@@ -52,6 +52,9 @@
  */
 public class CQPPreferencePage extends TXMPreferencePage {
 
+	/** CQL fix query strategy: tokenize string or not */
+	private BooleanFieldEditor cql_fix_query_tokenize;
+	
 	/** The cqi_server_is_remote. */
 	private BooleanFieldEditor cqi_use_network;
 
@@ -113,6 +116,8 @@
 		
 		cqi_server_path_to_init_file = new FileFieldEditor(CQPLibPreferences.CQI_SERVER_PATH_TO_INIT_FILE, CQPUIMessages.pathToCWBServerInitializationFile, getFieldEditorParent());
 		cqi_server_additional_options = new StringFieldEditor(CQPLibPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, CQPUIMessages.additionalAmpoptionsForTheCWBServerColon, getFieldEditorParent());
+		
+		cql_fix_query_tokenize = new BooleanFieldEditor(CQPLibPreferences.QUERY_FIX_TOKENIZE, "When fixing CQL, tokenize the value", BooleanFieldEditor.DEFAULT, getFieldEditorParent());
 
 		addField(cqi_use_network);
 		addField(cqi_server_path_to_cqplib);
@@ -125,6 +130,7 @@
 //		addField(cqi_server_path_to_registry);
 		addField(cqi_server_path_to_init_file);
 		addField(cqi_server_additional_options);
+		addField(cql_fix_query_tokenize);
 
 		Preferences preferences = org.eclipse.core.runtime.preferences.InstanceScope.INSTANCE.getNode(Application.PLUGIN_ID);
 		boolean useNetwork = preferences.getBoolean(CQPLibPreferences.CQI_NETWORK_MODE, false);
Index: TXM/trunk/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/adapters/CorpusAdapterFactory.java
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/adapters/CorpusAdapterFactory.java	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.rcp/src/org/txm/searchengine/cqp/rcp/adapters/CorpusAdapterFactory.java	(revision 3628)
@@ -15,7 +15,6 @@
 import org.txm.rcp.adapters.TXMResultAdapter;
 import org.txm.rcp.adapters.TXMResultAdapterFactory;
 import org.txm.searchengine.cqp.corpus.CQPCorpus;
-import org.txm.searchengine.cqp.corpus.MainCorpus;
 import org.txm.searchengine.cqp.corpus.Partition;
 
 
Index: TXM/trunk/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle.properties
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle.properties	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle.properties	(revision 3628)
@@ -1,18 +1,18 @@
 #TXM OSGI messages generated by the PluginMessagesManager class
 #Wed Jul 27 14:52:25 CEST 2022
 Bundle-Name=CQP RCP
-command.label=- Substract
-command.label.0=? Add
-command.label.1=? Intersect
+command.label=Substract
+command.label.0=Add
+command.label.1=Intersect
 command.label.148=Open biblio
-command.label.2=- Substract
-command.label.3=? Add
+command.label.2=Substract
+command.label.3=Add
 command.label.36=Add Project
-command.label.4=? Intersect
-command.label.5=-
-command.label.6=?
+command.label.4=Intersect
+command.label.5=
+command.label.6=
 command.label.65=Delete
-command.label.7=?
+command.label.7=
 command.label.8=Partition
 command.name=Subcorpus
 command.name.0=Substraction
Index: TXM/trunk/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle_fr.properties
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 3628)
@@ -1,18 +1,18 @@
 #TXM OSGI messages generated by the PluginMessagesManager class
 #Wed Jul 27 14:52:25 CEST 2022
 Bundle-Name=CQP RCP
-command.label=- Soustraire
-command.label.0=? Ajouter
-command.label.1=? Intersection
+command.label=Soustraire
+command.label.0=Ajouter
+command.label.1=Intersection
 command.label.148=Ouvrir la fiche bibliographique
-command.label.2=- Soustraire
-command.label.3=? Ajouter
+command.label.2=Soustraire
+command.label.3=Ajouter
 command.label.36=Ajouter un Projet
-command.label.4=? Intersection
-command.label.5=-
-command.label.6=?
+command.label.4=Intersection
+command.label.5=
+command.label.6=
 command.label.65=Supprimer
-command.label.7=?
+command.label.7=
 command.label.8=Partition
 command.name=Sous-corpus
 command.name.0=Soustraire
Index: TXM/trunk/org.txm.searchengine.cqp.rcp/icons/functions/minus.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.searchengine.cqp.rcp/icons/functions/minus.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.searchengine.cqp.rcp/icons/functions/inter.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.searchengine.cqp.rcp/icons/functions/inter.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.searchengine.cqp.rcp/icons/functions/union.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.searchengine.cqp.rcp/icons/functions/union.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.searchengine.cqp.rcp/plugin.xml
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.rcp/plugin.xml	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.rcp/plugin.xml	(revision 3628)
@@ -245,6 +245,7 @@
          </command>
          <command
                commandId="org.txm.searchengine.cqp.rcp.handlers.base.Substraction"
+               icon="icons/functions/minus.png"
                label="%command.label"
                style="push"
                tooltip="%command.tooltip">
@@ -257,6 +258,7 @@
          </command>
          <command
                commandId="org.txm.searchengine.cqp.rcp.handlers.base.Union"
+               icon="icons/functions/union.png"
                label="%command.label.0"
                style="push">
             <visibleWhen
@@ -268,6 +270,7 @@
          </command>
          <command
                commandId="org.txm.searchengine.cqp.rcp.handlers.base.Intersection"
+               icon="icons/functions/inter.png"
                label="%command.label.1"
                style="push">
             <visibleWhen
@@ -351,6 +354,7 @@
          </command>
          <command
                commandId="org.txm.searchengine.cqp.rcp.handlers.base.Substraction"
+               icon="icons/functions/minus.png"
                label="%command.label.2"
                style="push"
                tooltip="%command.tooltip.0">
@@ -363,6 +367,7 @@
          </command>
          <command
                commandId="org.txm.searchengine.cqp.rcp.handlers.base.Union"
+               icon="icons/functions/union.png"
                label="%command.label.3"
                style="push">
             <visibleWhen
@@ -374,6 +379,7 @@
          </command>
          <command
                commandId="org.txm.searchengine.cqp.rcp.handlers.base.Intersection"
+               icon="icons/functions/inter.png"
                label="%command.label.4"
                style="push">
             <visibleWhen
@@ -458,7 +464,7 @@
             </command>
                         <command
                               commandId="org.txm.searchengine.cqp.rcp.handlers.base.Substraction"
-                              label="%command.label.5"
+                              icon="icons/functions/minus.png"
                               style="push"
                               tooltip="%command.tooltip.1">
                            <visibleWhen
@@ -470,7 +476,7 @@
                         </command>
                         <command
                               commandId="org.txm.searchengine.cqp.rcp.handlers.base.Union"
-                              label="%command.label.6"
+                              icon="icons/functions/union.png"
                               style="push">
                            <visibleWhen
                                  checkEnabled="false">
@@ -481,7 +487,7 @@
                         </command>
                         <command
                               commandId="org.txm.searchengine.cqp.rcp.handlers.base.Intersection"
-                              label="%command.label.7"
+                              icon="icons/functions/inter.png"
                               style="push">
                            <visibleWhen
                                  checkEnabled="false">
Index: TXM/trunk/org.txm.searchengine.cqp.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -8,11 +8,11 @@
 Bundle-SymbolicName: org.txm.searchengine.cqp.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: %Bundle-Name
-Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexport,
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3";visibility:=reexport,
  org.txm.searchengine.cqp.core;bundle-version="1.1.0";visibility:=reexport,
  org.txm.searchengine.rcp;bundle-version="1.0.0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.searchengine.cqp.rcp
 

Property changes on: TXM/trunk/org.txm.searchengine.cqp.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.chartsengine.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.chartsengine.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,10 +5,10 @@
 Bundle-SymbolicName: org.txm.chartsengine.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: Charts Engine Core
-Require-Bundle: org.txm.core;bundle-version="0.8.0";visibility:=reexpo
+Require-Bundle: org.txm.core;bundle-version="0.8.3";visibility:=reexpo
  rt
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.chartsengine.core
 
Index: TXM/trunk/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java
===================================================================
--- TXM/trunk/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java	(revision 3628)
@@ -190,7 +190,7 @@
 		try {
 			Log.finest("*** ChartResult._compute(): " + this.getClass().getSimpleName() + ": starting computing process...");
 			
-			boolean computingParametersChanged = super.hasParameterChanged();
+			boolean computingParametersChanged = super.hasParametersChanged();
 			boolean renderingParametersChanged = this.hasRenderingParameterChanged();
 			
 			if (this.isDirty()) {
@@ -408,12 +408,14 @@
 	 * @throws Exception
 	 */
 	protected boolean hasRenderingParameterChanged() throws Exception {
-		return this.hasParameterChanged(this.getLastParametersFromHistory(), Parameter.RENDERING);
+		HashMap<String, Object> p = this.getLastParametersFromHistory();
+		if (p == null) return false;
+		return this.hasParametersChanged(p, Parameter.RENDERING);
 	}
 	
 	@Override
-	public boolean hasParameterChanged() throws Exception {
-		return super.hasParameterChanged() || this.hasRenderingParameterChanged();
+	public boolean hasParametersChanged() throws Exception {
+		return super.hasParametersChanged() || this.hasRenderingParameterChanged();
 	}
 	
 	// @Override

Property changes on: TXM/trunk/org.txm.chartsengine.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.annotation.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.annotation.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.annotation.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -1,11 +1,10 @@
 Manifest-Version: 1.0
 Automatic-Module-Name: org.txm.annotation.core
 Bundle-SymbolicName: org.txm.annotation.core;singleton:=true
-Require-Bundle: org.txm.core;bundle-version="0.7.0";visibility:=reexport,
- org.txm.tokenizer.core
+Require-Bundle: org.txm.core;bundle-version="0.7.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Export-Package: org.txm.annotation.core,org.txm.annotation.core.prefer
  ences

Property changes on: TXM/trunk/org.txm.annotation.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.internalview.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.internalview.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.internalview.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:11 CEST 2018
-bin.includes=feature.xml
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.internalview.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.internalview.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.internalview.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Browse through the CQP indexes
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.internalview.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.searchengine.cqp.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -14,12 +14,12 @@
 Bundle-SymbolicName: org.txm.searchengine.cqp.core;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Name: %Bundle-Name
-Bundle-ClassPath: res/,.
+Bundle-ClassPath: .
 Require-Bundle: org.txm.searchengine.core;bundle-version="1.0.0";visib
  ility:=reexport,org.txm.libs.cqp;bundle-version="1.0.0";visibility:=r
  eexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.txm.searchengine.cqp.core
 
Index: TXM/trunk/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgsFromCQP.java
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgsFromCQP.java	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.core/src/org/txm/importer/cwb/BuildCwbEncodeArgsFromCQP.java	(revision 3628)
@@ -40,13 +40,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+
 import javax.xml.stream.FactoryConfigurationError;
 import javax.xml.stream.XMLStreamException;
 
 import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.core.messages.CQPSearchEngineCoreMessages;
 
-// TODO: Auto-generated Javadoc
 /**
  * build the sAttributes and pAttributs List from an xmlfile pAttributes
  * (attributes of tei:w tags) and the sAttributes (attributes + max inclusion of
Index: TXM/trunk/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/CQLQuery.java
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/CQLQuery.java	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/query/CQLQuery.java	(revision 3628)
@@ -27,17 +27,17 @@
 //
 package org.txm.searchengine.cqp.corpus.query;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang.StringUtils;
-import org.txm.core.preferences.TXMPreferences;
+import org.txm.libs.cqp.CQPLibPreferences;
 import org.txm.searchengine.core.IQuery;
 import org.txm.searchengine.core.Query;
 import org.txm.searchengine.core.SearchEngine;
 import org.txm.searchengine.core.SearchEnginesManager;
+import org.txm.searchengine.cqp.CQPPreferences;
 import org.txm.searchengine.cqp.CQPSearchEngine;
 import org.txm.tokenizer.SimpleStringTokenizer;
 
@@ -261,16 +261,20 @@
 				return query; // probably [] or [...]
 			}
 			else {
-				
-				List<List<String>> sentences = new SimpleStringTokenizer(lang).processText(query);
-				StringBuilder buffer = new StringBuilder();
-				for (List<String> sent : sentences) {
-					for (String word : sent) {
-						buffer.append(" \""+addBackSlash(word)+"\"");
+				if (CQPLibPreferences.getInstance().getBoolean(CQPLibPreferences.QUERY_FIX_TOKENIZE)) {
+					List<List<String>> sentences = new SimpleStringTokenizer(lang).processText(query);
+					StringBuilder buffer = new StringBuilder();
+					for (List<String> sent : sentences) {
+						for (String word : sent) {
+							buffer.append(" \""+addBackSlash(word)+"\"");
+						}
 					}
+					return buffer.substring(1);
+				} else {
+					return '"' + query + '"'; // $NON-NLS-1$
 				}
-				return buffer.substring(1);
 				
+				
 //				query = normalizeWhiteChars(query);
 //				return '"' + StringUtils.join(query.split(" "), "\" \"") + '"'; // $NON-NLS-1$
 			}
Index: TXM/trunk/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiServer.java
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiServer.java	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiServer.java	(revision 3628)
@@ -44,6 +44,7 @@
 import org.txm.searchengine.cqp.serverException.CqiCqpErrorNoSuchCorpus;
 import org.txm.searchengine.cqp.serverException.CqiServerError;
 import org.txm.utils.ExecTimer;
+import org.txm.utils.OSDetector;
 import org.txm.utils.logger.Log;
 
 /**
@@ -163,8 +164,8 @@
 		
 		if (!isLoaded) {
 			
-			Field LIBRARIES = ClassLoader.class.getDeclaredField("loadedLibraryNames"); //$NON-NLS-1$
-			LIBRARIES.setAccessible(true);
+//			Field LIBRARIES = ClassLoader.class.getDeclaredField("loadedLibraryNames"); //$NON-NLS-1$
+//			LIBRARIES.setAccessible(true);
 			
 			// FIXME: Debug
 			// System.err.println(">>>>>>>>>>>>>>>>>>>> MemCqiServer.start() " + this.getClass().getClassLoader());
@@ -177,27 +178,35 @@
 					return false;
 				}
 				String path = System.getProperty("java.library.path"); //$NON-NLS-1$
-				String libpath = System.getProperty("path.separator") + cqplibpath; //$NON-NLS-1$
+//				String libpath = System.getProperty("path.separator") + cqplibpath; //$NON-NLS-1$
+//				
+//				if (!path.contains(libpath)) {
+//					path += libpath;
+//				}
+//				System.setProperty("java.library.path", path); //$NON-NLS-1$
+//				// System.out.println("Current java.library.path "+System.getProperty("java.library.path"));
+//				
+//				// this is a hack to force the JVM to reload java.library.path
+//				Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths"); //$NON-NLS-1$
+//				fieldSysPath.setAccessible(true);
+//				fieldSysPath.set(null, null);
 				
-				if (!path.contains(libpath)) {
-					path += libpath;
+				
+				//System.loadLibrary("cqpjni"); //$NON-NLS-1$
+				if (OSDetector.isFamilyWindows()) {
+					System.load(cqplibpath+"/cqpjni.dll");
+				} else if (OSDetector.isFamilyMac()) {
+					System.load(cqplibpath+"/libcqpjni.dylib");
+				} else {
+					System.load(cqplibpath+"/libcqpjni.so");
 				}
-				System.setProperty("java.library.path", path); //$NON-NLS-1$
-				// System.out.println("Current java.library.path "+System.getProperty("java.library.path"));
 				
-				// this is a hack to force the JVM to reload java.library.path
-				Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths"); //$NON-NLS-1$
-				fieldSysPath.setAccessible(true);
-				fieldSysPath.set(null, null);
-				
-				System.loadLibrary("cqpjni"); //$NON-NLS-1$
 				// FIXME: SJ: tests to use absolute path rather than lib name in Linux.
 				// It works and may avoid some problems about the JRE versions (e.g. Oracle or OpenJDK) and PATH configurations, but need to have the lib filename for each OS
 				// System.load(cqplibpath + "libcqpjni.so"); //$NON-NLS-1$
 				
 				Log.fine("cqpjni loaded from dirs: " + path + ".");
 				isLoaded = true;
-				
 			}
 			catch (Throwable e) {
 				Log.severe("MemCqiServer: Failed to load CQP lib with exception: " + e);
@@ -481,7 +490,7 @@
 	public static void main(String[] args) throws Exception {
 		String pathToCQPLibDirectory = "/home/mdecorde/workspace047/org.txm.libs.cqp.linux/res/linux64/";
 		String cqpserverPathToExecutable = pathToCQPLibDirectory + "cqpserver";
-		String pathToRegistry = System.getProperty("user.home") + "TXM-0.8.2/corpora/DEMOCRATLYON5/registry";
+		String pathToRegistry = System.getProperty("user.home") + "TXM-0.8.3/corpora/DEMOCRATLYON5/registry";
 		String pathToInitFile = System.getProperty("user.home") + "workspace047/org.txm.libs.cqp.linux/res/cqpserver.init";
 		
 		String corpus = "DEMOCRATLYON5";
Index: TXM/trunk/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPPreferences.java
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPPreferences.java	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPPreferences.java	(revision 3628)
@@ -17,7 +17,6 @@
 	 */
 	public static final String PART_NAMES = "part_names"; //$NON-NLS-1$
 	
-	
 	/**
 	 * Gets the instance.
 	 * @return the instance

Property changes on: TXM/trunk/org.txm.searchengine.cqp.core
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.referencer.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.referencer.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.referencer.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -9,7 +9,7 @@
  org.txm.searchengine.cqp.core;bundle-version="1.1.0";visibility:=reexport,
  org.eclipse.jface
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.referencer.core
 

Property changes on: TXM/trunk/org.txm.referencer.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.para.core/build.properties
===================================================================
--- TXM/trunk/org.txm.para.core/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.para.core/build.properties	(revision 3628)
@@ -2,7 +2,6 @@
 output..=bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
                OSGI-INF/
 source..=src/
 #qualifier=svn
Index: TXM/trunk/org.txm.para.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.para.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.para.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -7,7 +7,7 @@
  isibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.para.core
 

Property changes on: TXM/trunk/org.txm.para.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitiesSelection.java
===================================================================
--- TXM/trunk/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitiesSelection.java	(revision 3627)
+++ TXM/trunk/org.txm.specificities.core/src/org/txm/specificities/core/functions/SpecificitiesSelection.java	(revision 3628)
@@ -66,8 +66,6 @@
 	@Parameter(key = SpecificitiesPreferences.VALUES, type = Parameter.RENDERING)
 	protected List<String> selectedTypeNames;
 	
-	
-	
 	/**
 	 * Creates an not computed specificities selection chart.
 	 * 
Index: TXM/trunk/org.txm.specificities.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.specificities.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.specificities.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -11,7 +11,7 @@
  ility:=reexport,org.txm.progression.core;bundle-version="1.0.0";visib
  ility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.specificities.core
 

Property changes on: TXM/trunk/org.txm.specificities.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.statsengine.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.statsengine.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.statsengine.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -7,7 +7,7 @@
 Require-Bundle: org.txm.core;bundle-version="0.7.0";visibility:=reexpo
  rt
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.statsengine.core
 

Property changes on: TXM/trunk/org.txm.statsengine.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.groovy.core/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- TXM/trunk/org.txm.groovy.core/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3627)
+++ TXM/trunk/org.txm.groovy.core/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3628)
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-groovy.compiler.level=30
+groovy.compiler.level=40
 groovy.script.filters=**/*.dsld,y,**/*.gradle,n
Index: TXM/trunk/org.txm.groovy.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.groovy.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.groovy.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,14 +4,14 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: Macro
 Bundle-ClassPath: .,bin/
-Require-Bundle: org.txm.core;bundle-version="0.8.0";visibility:=reexport,
+Require-Bundle: org.txm.core;bundle-version="0.8.3";visibility:=reexport,
  org.txm.annotation.core;visibility:=reexport,
  org.txm.searchengine.cqp.core;visibility:=reexport,
  org.txm.tokenizer.core;visibility:=reexport,
  org.eclipse.osgi;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.groovy.core
-
+Eclipse-BundleShape: dir
Index: TXM/trunk/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyScriptedImportEngine.java
===================================================================
--- TXM/trunk/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyScriptedImportEngine.java	(revision 3627)
+++ TXM/trunk/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyScriptedImportEngine.java	(revision 3628)
@@ -142,12 +142,12 @@
 					
 					// Log.info(GroovyMessages.restartingToolboxSearchengines);
 					// Toolbox.getEngineManager(EngineType.SEARCH).restartEngines();
-					if (project.getDoUpdate()) {
-						System.out.println(NLS.bind(TXMCoreMessages.corpusUpdateDoneInP0, ExecTimer.stop()));
-					}
-					else {
-						System.out.println(NLS.bind(TXMCoreMessages.corpusImportDoneInP0, ExecTimer.stop()));
-					}
+//					if (project.getDoUpdate()) {
+//						System.out.println(NLS.bind(TXMCoreMessages.corpusUpdateDoneInP0, ExecTimer.stop()));
+//					}
+//					else {
+//						System.out.println(NLS.bind(TXMCoreMessages.corpusImportDoneInP0, ExecTimer.stop()));
+//					}
 					
 				}
 				else {
Index: TXM/trunk/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyImportEngine.java
===================================================================
--- TXM/trunk/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyImportEngine.java	(revision 3627)
+++ TXM/trunk/org.txm.groovy.core/src/java/org/txm/groovy/core/GroovyImportEngine.java	(revision 3628)
@@ -11,6 +11,7 @@
 import org.txm.core.engines.ScriptedImportEngine;
 import org.txm.objects.Project;
 import org.txm.utils.io.IOUtils;
+import org.txm.utils.logger.Log;
 
 public class GroovyImportEngine extends ImportEngine {
 	
@@ -26,6 +27,7 @@
 		File importsPackageDirectory = new File(Toolbox.getTxmHomePath(), "scripts/groovy/user/org/txm/scripts/importer"); //$NON-NLS-1$
 		
 		if (!importsPackageDirectory.exists()) {
+			Log.warning("No script directory found: "+importsPackageDirectory);
 			return false;
 		}
 		for (File dir : importsPackageDirectory.listFiles(IOUtils.HIDDENFILE_FILTER)) {
Index: TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/edition/ImportAlignedEditionMacro.groovy
===================================================================
--- TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/edition/ImportAlignedEditionMacro.groovy	(revision 3627)
+++ TXM/trunk/org.txm.groovy.core/src/groovy/org/txm/macro/edition/ImportAlignedEditionMacro.groovy	(revision 3628)
@@ -116,7 +116,7 @@
 	dest_edition = new Edition(dest_text)
 	dest_edition.setName(destination_edition_name)
 	dest_edition.saveParameter("corpus", destination_corpus.getID())
-	dest_edition.pPageNames = src_edition.pPageNames // replace with getter&setter when published in TXM 0.8.2
+	dest_edition.pPageNames = src_edition.pPageNames // replace with getter&setter when published in TXM 0.8.3+
 	dest_edition.pPageFirstWordIds = src_edition.pPageFirstWordIds
 	dest_edition.compute(false)
 	
Index: TXM/trunk/org.txm.groovy.core/build.properties
===================================================================
--- TXM/trunk/org.txm.groovy.core/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.groovy.core/build.properties	(revision 3628)
@@ -3,11 +3,8 @@
                .,\
                bin/,\
                plugin.xml,\
-               src/groovy/org/,\
-               src/groovy/tests/,\
-               src/groovy/filters/,\
-               groovy/,\
-               OSGI-INF/
+               OSGI-INF/,\
+               src/
 output..=bin/
 jars.compile.order=.
 source..=src/java/
@@ -15,3 +12,4 @@
 sourceFileExtensions=*.java, *.groovy
 compilerAdapter=org.codehaus.groovy.eclipse.ant.GroovyCompilerAdapter
 compilerAdapter.useLog=true  # this ensures that exceptions are logged to the proper log file.
+bin.excludes = src/java/

Property changes on: TXM/trunk/org.txm.groovy.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.lexicaltable.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.lexicaltable.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.lexicaltable.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -9,7 +9,7 @@
  .lexicaltable.core;bundle-version="1.0.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.lexicaltable.rcp
 
Index: TXM/trunk/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java
===================================================================
--- TXM/trunk/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java	(revision 3627)
+++ TXM/trunk/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java	(revision 3628)
@@ -743,8 +743,6 @@
 			int i = (int) o;
 			selectedEntries.add(rowNames[i]);
 		}
-		System.out.println("selection before sort: "+currentSelection);
-		System.out.println("selection entries before sort: "+selectedEntries);
 
 		if (index == previousSortedCol) {
 			reverse = !reverse;
@@ -773,10 +771,11 @@
 		List<Integer> newSelection = new ArrayList<Integer>();
 		if (selectedEntries.size() > 0) {
 			for (int i = 0 ; i < rowNames.length ; i++) {
-				if (selectedEntries.contains(rowNames[i])) {
+				if (selectedEntries.remove(rowNames[i])) {
 					newSelection.add(i);
-					System.out.println("found: "+rowNames[i]);
+					
 				}
+				if (selectedEntries.size() == 0) break;
 			}
 		}
 

Property changes on: TXM/trunk/org.txm.lexicaltable.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.statsengine.r.core.win32/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.statsengine.r.core.win32/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.statsengine.r.core.win32/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,7 +4,8 @@
 Bundle-SymbolicName: org.txm.statsengine.r.core.win32
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.txm.statsengine.r.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Eclipse-PlatformFilter: (osgi.os=win32)
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.statsengine.r.core.win32
+Eclipse-BundleShape: dir

Property changes on: TXM/trunk/org.txm.statsengine.r.core.win32
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.edition.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.edition.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.edition.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -9,7 +9,7 @@
  export
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.edition.rcp
 
Index: TXM/trunk/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditionEditor.java
===================================================================
--- TXM/trunk/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditionEditor.java	(revision 3627)
+++ TXM/trunk/org.txm.edition.rcp/src/org/txm/edition/rcp/editors/SynopticEditionEditor.java	(revision 3628)
@@ -513,12 +513,13 @@
 				// @Override
 				// public void widgetDefaultSelected(SelectionEvent e) { }
 				// });
+				Cursor cursor = new Cursor(text_text.getDisplay(), SWT.CURSOR_SIZENS);
+				text_text.setCursor(cursor);
 			}
 			catch (Exception e2) {
 				e2.printStackTrace();
 			}
-			Cursor cursor = new Cursor(text_text.getDisplay(), SWT.CURSOR_SIZENS);
-			text_text.setCursor(cursor);
+			
 			// text_label = new Label(textNavigationComposite, SWT.NONE);
 			Button nextText = new Button(textNavigationComposite, SWT.FLAT | SWT.PUSH);
 			Button lastText = new Button(textNavigationComposite, SWT.FLAT | SWT.PUSH);

Property changes on: TXM/trunk/org.txm.edition.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.conllu.rcp/.classpath
===================================================================
--- TXM/trunk/org.txm.conllu.rcp/.classpath	(revision 3627)
+++ TXM/trunk/org.txm.conllu.rcp/.classpath	(revision 3628)
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+		<accessrules>
+			<accessrule kind="accessible" pattern="**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="**"/>
Index: TXM/trunk/org.txm.conllu.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.conllu.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.conllu.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,7 +5,9 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: textometrie.org
 Automatic-Module-Name: org.txm.ud.rcp
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Require-Bundle: org.txm.treesearch.rcp;bundle-version="1.0.0";visibility:=reexport,
  org.txm.conllu.core;visibility:=reexport
-Export-Package: org.txm.conllu.rcp.commands
+Export-Package: org.txm.conllu.rcp.commands,
+ org.txm.conllu.rcp.importsection,
+ org.txm.conllu.rcp.preferences

Property changes on: TXM/trunk/org.txm.conllu.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.treetagger.core.win32/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.treetagger.core.win32/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.treetagger.core.win32/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,6 +4,6 @@
 Bundle-SymbolicName: org.txm.treetagger.core.win32
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.txm.treetagger.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.treetagger.core.win32

Property changes on: TXM/trunk/org.txm.treetagger.core.win32
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.args4j/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.args4j/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.args4j/META-INF/MANIFEST.MF	(revision 3628)
@@ -6,6 +6,6 @@
 Bundle-Version: 1.0.0.qualifier
 Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0"
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 

Property changes on: TXM/trunk/org.txm.libs.args4j
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.ahc.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.ahc.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.ahc.feature/build.properties	(revision 3628)
@@ -1 +1 @@
-bin.includes = feature.xml
+bin.includes = feature.xml, build.properties
Index: TXM/trunk/org.txm.ahc.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.ahc.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.ahc.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       AHC command plugins
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -38,11 +38,11 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.ca.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.chartsengine.rcp" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.lexicaltable.rcp" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.ahc.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.ca.rcp"/>
+      <import plugin="org.txm.ca.core" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin

Property changes on: TXM/trunk/org.txm.ahc.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.core.tests/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- TXM/trunk/org.txm.core.tests/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3627)
+++ TXM/trunk/org.txm.core.tests/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3628)
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-groovy.compiler.level=30
+groovy.compiler.level=40
 groovy.script.filters=**/*.dsld,y,**/*.gradle,n
Index: TXM/trunk/org.txm.core.tests/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.core.tests/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.core.tests/META-INF/MANIFEST.MF	(revision 3628)
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-SymbolicName: org.txm.tests.core;singleton:=true
-Export-Package: org.txm.core.tests.junit,org.txm.core.tests.manual,org
- .txm.rcp.commands.tests
+Export-Package: org.txm.core.tests.junit,
+ org.txm.core.tests.manual
 Bundle-Name: Core Toolbox Tests
 Bundle-Version: 1.0.0.qualifier
 Require-Bundle: org.txm.statsengine.r.core;visibility:=reexport,
@@ -22,16 +22,12 @@
  org.txm.progression.core;bundle-version="1.0.0";visibility:=reexport,
  org.txm.specificities.core;bundle-version="1.0.0";visibility:=reexport,
  org.txm.referencer.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.rcp;bundle-version="0.8.0";visibility:=reexport,
- org.polarion.eclipse.team.svn.connector.svnkit18;bundle-version="6.0.4";visibility:=reexport,
  org.eclipse.jdt.core;bundle-version="3.13.102";visibility:=reexport,
  org.txm.annotation.kr.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.chartsengine.svgbatik.rcp;bundle-version="1.0.0";visibility:=reexport,
  org.txm.internalview.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.properties.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.searchengine.cqp.rcp;bundle-version="1.0.0";visibility:=reexport
+ org.txm.properties.core;bundle-version="1.0.0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.tests.core
 
Index: TXM/trunk/org.txm.core.tests/src/org/txm/rcp/commands/tests/TestImports.java
===================================================================
--- TXM/trunk/org.txm.core.tests/src/org/txm/rcp/commands/tests/TestImports.java	(revision 3627)
+++ TXM/trunk/org.txm.core.tests/src/org/txm/rcp/commands/tests/TestImports.java	(revision 3628)
@@ -1,222 +0,0 @@
-// Copyright © 2010-2020 ENS de Lyon., University of Franche-Comté
-// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
-// Lyon 2, University of Franche-Comté, University of Nice
-// Sophia Antipolis, University of Paris 3.
-// 
-// The TXM platform is free software: you can redistribute it
-// and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation,
-// either version 2 of the License, or (at your option) any
-// later version.
-// 
-// The TXM platform is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE. See the GNU General Public License for more
-// details.
-// 
-// You should have received a copy of the GNU General
-// Public License along with the TXM platform. If not, see
-// http://www.gnu.org/licenses.
-// 
-// 
-// 
-// $LastChangedDate:$
-// $LastChangedRevision:$
-// $LastChangedBy:$ 
-//
-package org.txm.rcp.commands.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.Toolbox;
-import org.txm.objects.Project;
-import org.txm.rcp.JobsTimer;
-import org.txm.rcp.handlers.scripts.ExecuteImportScript;
-import org.txm.rcp.swt.dialog.LastOpened;
-import org.txm.rcp.utils.JobHandler;
-import org.txm.utils.zip.Zip;
-
-public class TestImports extends AbstractHandler {
-
-	public static String ID = "org.txm.rcp.commands.tests.TestImports";
-
-	static HashMap<String, String> scripts = new HashMap<String, String>();
-	static {
-		scripts.clear();
-		scripts.put("cnr", "discoursLoader.groovy"); // cnr +csv
-		scripts.put("hyperbase", "hyperbaseLoader.groovy"); // old hyperbase
-		scripts.put("alceste", "alcesteLoader.groovy"); // alceste
-		scripts.put("alceste2", "alcesteLoader.groovy"); // alceste
-		scripts.put("bfm", "bfmLoader.groovy"); // xml-tei-bfm
-		scripts.put("frantext", "frantextLoader.groovy"); // xml-tei-bfm
-		scripts.put("xml", "xmlLoader.groovy"); // xml
-		scripts.put("factiva", "factivaLoader.groovy"); // factiva
-		scripts.put("xml", "xmlLoader.groovy"); // <w attr="" atrt2="">
-		scripts.put("xmlws", "xmlLoader.groovy"); // <w attr="" atrt2="">
-		scripts.put("txt", "txtLoader.groovy"); // txt + csv
-		scripts.put("transcriber", "transcriberLoader.groovy"); // echant EVS +
-																// csv
-		scripts.put("xmltxm", "xmltxmLoader.groovy"); // domi
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands
-	 * .ExecutionEvent)
-	 */
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		String txmhome = Toolbox.getTxmHomePath();
-		final File scriptsdir = new File(txmhome, "scripts/import");
-		// final File sourcesdir = new
-		// File(System.getProperty("user.home"),"xml/TESTS");
-		final int delta = 100 / scripts.size();
-
-		System.out
-				.println("Please select the directory containing source directories for the following import modules :");
-		System.out.println(scripts.toString());
-
-		Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event)
-				.getShell();
-		DirectoryDialog dialog = new DirectoryDialog(shell, SWT.OPEN);
-
-		if (LastOpened.getFile(ID) != null) {
-			dialog.setFilterPath(LastOpened.getFolder(ID));
-		} else {
-			dialog.setFilterPath(System.getProperty("user.home"));
-		}
-		String path = dialog.open();
-
-		if (path == null)
-			return null;
-
-		final File sourcesdir = new File(path);
-
-		if (!scriptsdir.exists()) {
-			System.out.println("Error: TXM is not well installed.");
-			System.out.println("Cannot find TXM import scripts directory: "
-					+ scriptsdir);
-			return null;
-		}
-
-		if (!sourcesdir.exists()) {
-			System.out.println("Cannot find test sources directory: "
-					+ sourcesdir);
-			return null;
-		}
-
-		System.out
-				.println("Select the directory containing the source directories : "
-						+ scripts.keySet());
-		JobHandler jobhandler = new JobHandler(
-				"Testing TXM - select the directory containing the source dierctories") {
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				this.runInit(monitor);
-				try {
-					String txmhome = Toolbox.getTxmHomePath();
-					File outDir = new File(txmhome, "results/TESTS-imports");
-					outDir.mkdirs();
-					ArrayList<File> missings = new ArrayList<File>();
-					try {
-						monitor.beginTask("Testing imports", 100);
-						JobsTimer.start();
-
-						for (String filename : scripts.keySet()) {
-							final File source = new File(sourcesdir, filename);
-							final File script = new File(scriptsdir,
-									scripts.get(filename));
-
-							if (source.exists()) {
-								
-								Project project = new Project(Toolbox.workspace, "TEST-"+source.getName().substring(0, 3).toUpperCase());
-								project.setSourceDirectory(source.getAbsolutePath());
-								project.setImportModuleName(filename);//$NON-NLS-1$
-								System.out.println("USING ROOT DIR : "
-										+ project.getSrcdir());
-								this.syncExec(new Runnable() {
-									public void run() {
-										
-										try {
-											project.compute();
-											
-											new ExecuteImportScript()
-											.executeScript(project);
-										} catch (Exception e) {
-											// TODO Auto-generated catch block
-											e.printStackTrace();
-										}
-									}
-								});
-							} else {
-								System.out
-										.println("Warning: Missing source directory: "
-												+ source);
-								missings.add(source);
-							}
-							monitor.worked(delta);
-							if (monitor.isCanceled())
-								return Status.CANCEL_STATUS;
-						}
-					} catch (Exception e) {
-						org.txm.utils.logger.Log.printStackTrace(e);
-						return Status.CANCEL_STATUS;
-					}
-
-					String date = Toolbox.dateformat.format(new java.util.Date());
-					File zipFile = new File(outDir.getParentFile(),
-							"TESTS_imports_" + date + ".zip");
-					File zipFile2 = new File(outDir.getParentFile(),
-							"TESTS_imports_.odt");
-					this.acquireSemaphore();
-					zipFile.delete();
-					zipFile2.delete();
-					this.releaseSemaphore();
-					if (missings.size() > 0)
-						System.out.println("Missing sources directories: "
-								+ missings);
-					monitor.beginTask(
-							"Testing imports: results will be compressed in "
-									+ zipFile.getAbsolutePath(), 100);
-					System.out
-							.println("Testing imports: results will be compressed in "
-									+ zipFile.getAbsolutePath());
-					try {
-						this.acquireSemaphore();
-						Zip.compress(outDir, zipFile2);
-						zipFile2.renameTo(zipFile);
-						this.releaseSemaphore();
-					} catch (IOException e) {
-						org.txm.utils.logger.Log.printStackTrace(e);
-						return Status.CANCEL_STATUS;
-					}
-				} catch (ThreadDeath td) {
-					return Status.CANCEL_STATUS;
-				} finally {
-					monitor.done();
-					JobsTimer.stopAndPrint();
-				}
-				return Status.OK_STATUS;
-			}
-		};
-
-		jobhandler.startJob();
-		return null;
-	}
-}
Index: TXM/trunk/org.txm.core.tests/src/org/txm/rcp/commands/tests/Test.java
===================================================================
--- TXM/trunk/org.txm.core.tests/src/org/txm/rcp/commands/tests/Test.java	(revision 3627)
+++ TXM/trunk/org.txm.core.tests/src/org/txm/rcp/commands/tests/Test.java	(revision 3628)
@@ -1,177 +0,0 @@
-package org.txm.rcp.commands.tests;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.txm.groovy.core.GSERunner;
-
-import groovy.lang.Binding;
-
-public class Test {
-
-	String name;
-	File directory;
-	File create, export, test;
-	File create_ok, export_ok, test_ok;
-	File create_error, export_error, test_error;
-	File[] all = {create_ok, export_ok, test_ok, create_error, export_error, test_error};
-	
-	private Binding binding;
-
-	public Test(File scriptDir, String name) {
-		this.name = name;
-		//File scriptDir = new File(Toolbox.getTxmHomePath(), "scripts/groovy/user/org/txm/tests");
-		scriptDir.mkdirs();
-
-		this.directory = new File(scriptDir, name);
-		this.directory.mkdirs();
-		
-		create = new File(directory, "create.groovy");
-		export = new File(directory, "export.groovy");
-		test = new File(directory, "test.groovy");
-
-		create_ok = new File(directory, "create.ok");
-		export_ok = new File(directory, "export.ok");
-		test_ok = new File(directory, "test.ok");
-
-		create_error = new File(directory, "create.error");
-		export_error = new File(directory, "export.error");
-		test_error = new File(directory, "test.error");
-	}
-	
-	public void reset() {
-		create_ok.delete();
-		export_ok.delete();
-		test_ok.delete();
-
-		create_error.delete();
-		export_error.delete();
-		test_error.delete();
-	}
-	
-	public List<File> getLogs() {
-		ArrayList<File> logs = new ArrayList<File>();
-		for (File f : all) {
-			if (f.exists()) {
-				logs.add(f);
-			}
-		}
-	
-		return logs;
-	}
-
-	/**
-	 * 
-	 * @param start_step 0 starting step : all=create&export&test export=export&test test=step
-	 * @return
-	 */
-	public boolean run(int start_step) {
-		GSERunner gse = GSERunner.buildDefaultGSE();
-		System.out.println("Run "+name+" from "+start_step);
-		this.binding = new Binding();
-		try {
-			if (start_step <= 0) {
-				create_ok.delete();
-				create_error.delete();
-				Object ret_create = gse.run(create, binding);
-
-				if (ret_create != null && Boolean.FALSE != ret_create) {
-					binding.setProperty("results", ret_create);
-					create_ok.createNewFile();
-				} else {
-					create_error.createNewFile();
-					return false;
-				}
-			}
-
-			if (export.exists() && start_step <= 1) {
-				export_ok.delete();
-				export_error.delete();
-				Object ret_export = gse.run(export, binding);
-				if (ret_export != null && Boolean.FALSE != ret_export) {
-					export_ok.createNewFile();
-				} else {
-					create_error.createNewFile();
-					return false;
-				}
-
-				if (test.exists() && start_step <= 2) {
-					test_ok.delete();
-					test_error.delete();
-					Object ret_test = gse.run(test, binding);
-					if (ret_test != null && Boolean.FALSE != ret_test) {
-						test_ok.createNewFile();
-					} else {
-						test_error.createNewFile();
-						return false;
-					}
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			return false;
-		}
-		
-		return true;
-	}
-
-	public boolean hasCreateStep() {
-		return create.exists();
-	}
-
-	public boolean hasExportStep() {
-		return export.exists();
-	}
-
-	public boolean hasTestStep() {
-		return test.exists();
-	}
-
-	public boolean isCreateStepOK() {
-		return create_ok.exists();
-	}
-
-	public boolean isExportStepOK() {
-		return export_ok.exists();
-	}
-
-	public boolean isTestStepOK() {
-		return test_ok.exists();
-	}
-
-	public File getCreateStepScript() {
-		return create;
-	}
-
-	public File getCreateStepLog() {
-		if (isCreateStepOK()) return create_ok;
-		return create_error;
-	}
-
-	public File getExportStepScript() {
-		return export;
-	}
-
-	public File getExportStepLog() {
-		if (isExportStepOK()) return export_ok;
-		return export_error;
-	}
-	
-	public File getTestStepScript() {
-		return test;
-	}
-
-	public File getTestStepLog() {
-		if (isTestStepOK()) return test_ok;
-		return test_error;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public File getDirectory() {
-		return directory;
-	}
-}
Index: TXM/trunk/org.txm.core.tests/src/org/txm/rcp/commands/tests/TestBench.java
===================================================================
--- TXM/trunk/org.txm.core.tests/src/org/txm/rcp/commands/tests/TestBench.java	(revision 3627)
+++ TXM/trunk/org.txm.core.tests/src/org/txm/rcp/commands/tests/TestBench.java	(revision 3628)
@@ -1,57 +0,0 @@
-package org.txm.rcp.commands.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-
-import org.txm.utils.DeleteDir;
-
-public class TestBench {
-	HashMap<String, Test> tests = new HashMap<String, Test>();
-	
-	private File dir;
-	
-	public TestBench(File dir) {
-		this.dir = dir;
-		if (dir.exists()) {
-			for (File testDir : dir.listFiles()) {
-				if (new File(testDir, "create.groovy").exists()) {
-					String name = testDir.getName();
-					tests.put(name, new Test(dir, name));
-				}
-			}
-		}
-	}
-	
-	public HashMap<String, Test> getTests() {
-		return tests;
-	}
-	
-	public Test getTest(String name) {
-		return tests.get(name);
-	}
-	
-	public Test newTest(String name) {
-		
-		File testDir = new File(dir, name);
-		testDir.mkdir();
-		File create = new File(testDir, "create.groovy");
-		try {
-			create.createNewFile();
-		} catch (IOException e) {
-			e.printStackTrace();
-			return null;
-		}
-		
-		tests.put(name, new Test(dir, name));
-		return tests.get(name);
-	}
-	
-	public Test deleteTest(String name) {
-		
-		File testDir = new File(dir, name);
-		DeleteDir.deleteDirectory(testDir);
-		
-		return tests.remove(name);
-	}
-}
Index: TXM/trunk/org.txm.core.tests/src/org/txm/rcp/commands/tests/TestImportLangs.java
===================================================================
--- TXM/trunk/org.txm.core.tests/src/org/txm/rcp/commands/tests/TestImportLangs.java	(revision 3627)
+++ TXM/trunk/org.txm.core.tests/src/org/txm/rcp/commands/tests/TestImportLangs.java	(revision 3628)
@@ -1,168 +0,0 @@
-// Copyright © 2010-2020 ENS de Lyon., University of Franche-Comté
-package org.txm.rcp.commands.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.Toolbox;
-import org.txm.core.preferences.TBXPreferences;
-import org.txm.objects.Project;
-import org.txm.rcp.JobsTimer;
-import org.txm.rcp.handlers.scripts.ExecuteImportScript;
-import org.txm.rcp.utils.JobHandler;
-import org.txm.utils.io.IOUtils;
-import org.xml.sax.SAXException;
-
-public class TestImportLangs extends AbstractHandler {
-
-	public static String ID = "org.txm.rcp.commands.tests.TestImports";
-
-	static HashMap<String, String> scripts = new HashMap<String, String>();
-	static {
-		scripts.clear();
-		scripts.put("xml", "xmlLoader.groovy"); // xml	
-		scripts.put("txt", "txtLoader.groovy"); // txt + csv
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands
-	 * .ExecutionEvent)
-	 */
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		String txmhome = Toolbox.getTxmHomePath();
-		final File scriptsdir = new File(txmhome, "scripts/import");
-
-		System.out.println("Select the directory containing the source directories : "
-				+ scripts.keySet());
-		JobHandler jobhandler = new JobHandler(
-				"Testing TXM - langs") {
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				this.runInit(monitor);
-				try {
-					try {
-						final File sourcesdir = new File("/tmp/test-langs");
-						sourcesdir.mkdirs();
-
-						if (!scriptsdir.exists()) {
-							System.out.println("Error: TXM is not well installed.");
-							System.out.println("Cannot find TXM import scripts directory: "
-									+ scriptsdir);
-							return null;
-						}
-
-						if (!sourcesdir.exists()) {
-							System.out.println("Cannot find test sources directory: "
-									+ sourcesdir);
-							return null;
-						}
-
-						monitor.beginTask("Testing imports", 100);
-						JobsTimer.start();
-
-						importXMLCorpus(this, sourcesdir, scriptsdir);
-						importTXTCorpus(this, sourcesdir, scriptsdir);
-
-					} catch (Exception e) {
-						org.txm.utils.logger.Log.printStackTrace(e);
-						return Status.CANCEL_STATUS;
-					}
-
-				} catch (ThreadDeath td) {
-					return Status.CANCEL_STATUS;
-				} finally {
-					monitor.done();
-					JobsTimer.stopAndPrint();
-				}
-				return Status.OK_STATUS;
-			}
-
-
-		};
-
-		jobhandler.startJob();
-		return null;
-	}
-
-	protected boolean importXMLCorpus(JobHandler jobhandler, File sourcesdir, File scriptsdir) throws Exception {
-		final File source = new File(sourcesdir, "XMLLANGTEST");
-		source.mkdirs();
-		File oneTextFile = new File(source, "file.xml");
-		IOUtils.write(oneTextFile, "<text>This corpus works fine. That's all.</text>");
-		final File script = new File(scriptsdir, scripts.get("xml"));
-
-		final Project project = new Project(Toolbox.workspace, "TESTXML");
-		project.setSourceDirectory(source.getAbsolutePath());
-		project.setLang("en");
-		project.setAnnotate(true); //$NON-NLS-1$
-		project.setImportModuleName("xml");//$NON-NLS-1$
-		project.compute();
-
-		System.out.println("USING ROOT DIR : "+ project.getSrcdir());
-		jobhandler.syncExec(new Runnable() {
-			public void run() {
-				new ExecuteImportScript();
-				JobHandler job = ExecuteImportScript
-						.executeScript(project);
-				try {
-					job.join();
-				} catch (InterruptedException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-		});
-		return true;	}
-
-	protected boolean importTXTCorpus(JobHandler jobhandler, File sourcesdir, File scriptsdir) throws Exception {
-		final File source = new File(sourcesdir, "TXTLANGTEST");
-		source.mkdirs();
-		File oneTextFile = new File(source, "file.txt");
-		IOUtils.write(oneTextFile, "<text>C'est !C'est encore une phrase qui ne s'tokenize pas bien. Mais c'est pas drave.");
-		
-		final File script = new File(scriptsdir, scripts.get("txt"));
-
-		final Project project = new Project(Toolbox.workspace, "TESTTXT");
-		project.setSourceDirectory(source.getAbsolutePath());
-		project.setLang("fr");
-		project.setAnnotate(true); //$NON-NLS-1$
-		project.setImportModuleName("txt");//$NON-NLS-1$
-		project.compute();
-		
-		System.out.println("USING ROOT DIR : "+ project.getSrcdir());
-		jobhandler.syncExec(new Runnable() {
-			public void run() {
-				new ExecuteImportScript();
-				JobHandler job = ExecuteImportScript
-						.executeScript(project);
-				try {
-					job.join();
-				} catch (InterruptedException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-		});
-		return true;
-	}
-}
Index: TXM/trunk/org.txm.core.tests/src/org/txm/core/tests/manual/WriteQualifierInBuildPropertiesFromSVN.java
===================================================================
--- TXM/trunk/org.txm.core.tests/src/org/txm/core/tests/manual/WriteQualifierInBuildPropertiesFromSVN.java	(revision 3627)
+++ TXM/trunk/org.txm.core.tests/src/org/txm/core/tests/manual/WriteQualifierInBuildPropertiesFromSVN.java	(revision 3628)
@@ -1,140 +0,0 @@
-package org.txm.core.tests.manual;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileOutputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Properties;
-
-import org.tmatesoft.svn.core.SVNDirEntry;
-import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.io.SVNRepository;
-import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
-import org.tmatesoft.svn.core.wc.SVNInfo;
-import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.wc.SVNWCClient;
-import org.txm.utils.io.IOUtils;
-
-/**
- * Write the qualifier in build.properties of all plugins from the SVN revision.
- * @author sjacquot
- *
- */
-public class WriteQualifierInBuildPropertiesFromSVN {
-
-	public static File workspace = new File("../"); // SJ
-
-	public static int updatedFilesCount = 0;
-	
-	/**
-	 * fetch  the org.txm projects that ends with core or rcp
-	 * @return
-	 */
-	protected static ArrayList<File> getProjects() {
-		ArrayList<File> ret = new ArrayList<File>();
-		if (!workspace.exists()) {
-			System.err.println("ERROR: "+workspace+" does not exists. Set it in TXMPluginTest.java.");
-			return ret;
-		} 
-
-		ret.addAll(Arrays.asList(workspace.listFiles(new FileFilter() {
-			@Override
-			public boolean accept(File pathName) {
-				return pathName.isDirectory() &&
-						(pathName.getName().endsWith(".rcp")
-								|| pathName.getName().endsWith(".core")
-								|| pathName.getName().endsWith(".feature")
-								);
-			}
-		})));
-
-		Collections.sort(ret);
-		return ret;
-	}
-	
-	public static void main(String[] args) {
-		ArrayList<File> projectsList = getProjects();
-		for (int i = 0; i < projectsList.size(); i++) {
-			writeQualifierInBuildProperties(projectsList.get(i));
-		}
-		
-		System.out.println("Done. " + updatedFilesCount + " build.properties files have been updated.");
-	}
-
-	
-	
-	public static void writeQualifierInBuildProperties(File projectDirectory) {
-
-		try {
-
-			
-			SVNWCClient client = SVNClientManager.newInstance().getWCClient();
-			SVNInfo info = client.doInfo(projectDirectory, SVNRevision.WORKING);
-			SVNURL location = info.getURL();
-			SVNRepository repository = SVNRepositoryFactory.create(location);
-			
-//			long latestRevision = repository.getLatestRevision();
-//			System.out.println("[" + location.toString() + "] latest revision: " + latestRevision); 
-
-
-			SVNDirEntry entry = repository.info(".", -1);
-//			System.out.println("[" + location.toString() + "] latest revision: " + entry.getRevision());
-//			System.out.println("[" + location.toString() + "] latest date: " + entry.getDate());
-			
-			SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd-HHmm");
-			//SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmm");
-			String date = formatter.format(entry.getDate());
-			System.out.println("[" + location.toString() + " / " + projectDirectory + "] latest date: " + date);
-//			System.err.println("formatted date: " + format);
-			
-//			SvnOperationFactory operationFactory = new SvnOperationFactory();
-//			SvnLog logOperation = operationFactory.createLog();
-//			logOperation.setSingleTarget(SvnTarget.fromFile( projectDirectory )			);
-//			logOperation.setRevisionRanges( Collections.singleton(
-//			        SvnRevisionRange.create(
-//			                SVNRevision.create( 1 ),
-//			                SVNRevision.HEAD
-//			        )
-//			) );
-//			Collection<SVNLogEntry> logEntries = logOperation.run( null );
-//			System.out.println( "logEntries = " + logEntries );
-			
-			
-			File buildFile = new File(projectDirectory, "build.properties");
-			
-			if (!buildFile.exists()) {
-				System.err.println("No build.properties file in: " + projectDirectory);
-				return;
-			}
-			
-			Properties props = new Properties();
-			props.load(IOUtils.getReader(buildFile));
-
-			// Debug: deleting all qualifiers
-//			props.remove("qualifier");
-//			props.store(new FileOutputStream(buildFile), null);
-			
-			// Write qualifier
-			String oldDate = props.getProperty("qualifier");
-			if(oldDate == null || !oldDate.equals(date))	{
-				
-				if(oldDate == null)	{
-					oldDate = "none";
-				}
-				
-				updatedFilesCount++;
-				System.out.println("Setting qualifier from " + oldDate + " to " + date);
-				props.setProperty("qualifier", date);
-				props.store(new FileOutputStream(buildFile), null);
-			}
-		}
-		catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-}
\ No newline at end of file
Index: TXM/trunk/org.txm.core.tests/plugin.xml
===================================================================
--- TXM/trunk/org.txm.core.tests/plugin.xml	(revision 3627)
+++ TXM/trunk/org.txm.core.tests/plugin.xml	(revision 3628)
@@ -1,21 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>  
-   <extension
-         id="id1"
-         name="ToolboxTester"
-         point="org.eclipse.core.runtime.applications">
-      <application
-            cardinality="singleton-global"
-            thread="main"
-            visible="true">
-         <run
-               class="org.txm.core.tests.manual.ToolBoxTesterRCPApplication">
-         </run>
-      </application>
-      
-      
-      
-   </extension>
 
 </plugin>

Property changes on: TXM/trunk/org.txm.core.tests
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.xmleditor.rcp/build.properties
===================================================================
--- TXM/trunk/org.txm.xmleditor.rcp/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.xmleditor.rcp/build.properties	(revision 3628)
@@ -3,7 +3,6 @@
 bin.includes = plugin.xml,\
                META-INF/,\
                .,\
-               OSGI-INF/,\
-               OSGI-INF/l10n/bundle.properties
+               OSGI-INF/
 source..=src/
 #qualifier=svn
Index: TXM/trunk/org.txm.xmleditor.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.xmleditor.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.xmleditor.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -12,14 +12,13 @@
  org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)";visibility:=reexport,
- org.eclipse.wst.common.uriresolver;bundle-version="[1.2.200,2.0.0)";visibility:=reexport,
+ org.eclipse.wst.common.uriresolver;bundle-version="1.3.0";visibility:=reexport,
  org.eclipse.wst.xml.core;bundle-version="1.1.1100";visibility:=reexport,
- org.eclipse.wst.common.ui;bundle-version="[1.1.500,1.2.0)";visibility:=reexport,
+ org.eclipse.wst.common.ui;bundle-version="1.2.100";visibility:=reexport,
  org.eclipse.wst.validation;bundle-version="[1.2.700,1.3.0)";visibility:=reexport,
  org.eclipse.wst.validation.ui;visibility:=reexport,
  org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.core.filesystem;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,
- org.txm.core;bundle-version="0.7.0";visibility:=reexport,
  org.txm.rcp;bundle-version="0.7.8";visibility:=reexport,
  org.eclipse.wst.xml.ui;bundle-version="1.1.800";visibility:=reexport,
  org.txm.concordance.rcp;bundle-version="1.0.0";visibility:=reexport,
@@ -27,7 +26,7 @@
  org.eclipse.search;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.xmleditor.rcp
 

Property changes on: TXM/trunk/org.txm.xmleditor.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.chartsengine.r.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.chartsengine.r.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.r.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:07 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.chartsengine.r.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.chartsengine.r.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.r.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="R Charts Engine"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       R chart engine for TXM
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -41,7 +41,7 @@
       <import plugin="org.txm.chartsengine.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.chartsengine.rcp" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.chartsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
    </requires>
 
    <plugin

Property changes on: TXM/trunk/org.txm.chartsengine.r.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.progression.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.progression.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.progression.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:14 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.progression.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.progression.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.progression.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="Progression"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Progression
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.progression.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.statsengine.r.core.macosx/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.statsengine.r.core.macosx/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.statsengine.r.core.macosx/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,7 +4,8 @@
 Bundle-SymbolicName: org.txm.statsengine.r.core.macosx
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.txm.statsengine.r.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Eclipse-PlatformFilter: (osgi.os=macosx)
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.statsengine.r.core.macosx
+Eclipse-BundleShape: dir

Property changes on: TXM/trunk/org.txm.statsengine.r.core.macosx
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.ruby.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.ruby.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.ruby.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,7 +5,7 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: textometrie.org
 Automatic-Module-Name: org.txm.ruby.rcp
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.txm.rcp;bundle-version="0.8.2",
+Bundle-RequiredExecutionEnvironment: JavaSE-16
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3",
  org.txm.ruby.core;bundle-version="1.0.0";visibility:=reexport
 Export-Package: org.txm.ruby.rcp

Property changes on: TXM/trunk/org.txm.ruby.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.libs.hsqldb/.classpath
===================================================================
--- TXM/trunk/org.txm.libs.hsqldb/.classpath	(revision 3627)
+++ TXM/trunk/org.txm.libs.hsqldb/.classpath	(revision 3628)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	  <classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
-	  <classpathentry exported="true" kind="lib" path="lib/sqltool.jar"/>
-	  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	  <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	  <classpathentry kind="src" path="src"/>
-	  <classpathentry kind="output" path="bin"/>
-</classpath>
\ No newline at end of file
+	<classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/sqltool.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: TXM/trunk/org.txm.libs.hsqldb/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.hsqldb/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.hsqldb/META-INF/MANIFEST.MF	(revision 3628)
@@ -1,16 +1,39 @@
 Manifest-Version: 1.0
 Automatic-Module-Name: org.txm.libs.hsqldb
 Bundle-SymbolicName: org.txm.libs.hsqldb
-Export-Package: org.hsqldb,org.hsqldb.auth,org.hsqldb.cmdline,org.hsql
- db.cmdline.sqltool,org.hsqldb.dbinfo,org.hsqldb.error,org.hsqldb.inde
- x,org.hsqldb.jdbc,org.hsqldb.jdbc.pool,org.hsqldb.lib,org.hsqldb.lib.
- java,org.hsqldb.lib.tar,org.hsqldb.map,org.hsqldb.navigator,org.hsqld
- b.persist,org.hsqldb.result,org.hsqldb.rights,org.hsqldb.rowio,org.hs
- qldb.scriptio,org.hsqldb.server,org.hsqldb.types,org.hsqldb.util
-Bundle-Name: Hsqldb
-Bundle-Version: 2.4.1
-Bundle-ClassPath: lib/hsqldb.jar,lib/sqltool.jar,.
+Export-Package: org.hsqldb,
+ org.hsqldb.auth,
+ org.hsqldb.cmdline,
+ org.hsqldb.cmdline.libclone,
+ org.hsqldb.cmdline.sqltool,
+ org.hsqldb.cmdline.utilclone,
+ org.hsqldb.dbinfo,
+ org.hsqldb.error,
+ org.hsqldb.index,
+ org.hsqldb.jdbc,
+ org.hsqldb.jdbc.pool,
+ org.hsqldb.lib,
+ org.hsqldb.lib.java,
+ org.hsqldb.lib.tar,
+ org.hsqldb.map,
+ org.hsqldb.navigator,
+ org.hsqldb.persist,
+ org.hsqldb.resources,
+ org.hsqldb.result,
+ org.hsqldb.rights,
+ org.hsqldb.rowio,
+ org.hsqldb.scriptio,
+ org.hsqldb.server,
+ org.hsqldb.trigger,
+ org.hsqldb.types,
+ org.hsqldb.util
+Bundle-Name: org.txm.libs.hsqldb
+Bundle-Version: 2.7.0
+Bundle-ClassPath: .,
+ lib/hsqldb.jar,
+ lib/javax.servlet-api-3.1.0.jar,
+ lib/sqltool.jar
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: hsqldb.org
 
Index: TXM/trunk/org.txm.libs.hsqldb/lib/javax.servlet-api-3.1.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.hsqldb/lib/javax.servlet-api-3.1.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.libs.hsqldb/lib/hsqldb.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.hsqldb/lib/sqltool.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.libs.hsqldb/lib
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.libs.hsqldb/build.properties
===================================================================
--- TXM/trunk/org.txm.libs.hsqldb/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.libs.hsqldb/build.properties	(revision 3628)
@@ -3,4 +3,5 @@
 bin.includes = META-INF/,\
                .,\
                lib/hsqldb.jar,\
+               lib/javax.servlet-api-3.1.0.jar,\
                lib/sqltool.jar

Property changes on: TXM/trunk/org.txm.libs.hsqldb
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.querycooccurrences.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.querycooccurrences.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.querycooccurrences.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -6,7 +6,7 @@
 Bundle-Name: %Bundle-Name.0
 Require-Bundle: org.eclipse.ui;visibility:=reexport,org.eclipse.core.r
  untime;visibility:=reexport,org.eclipse.core.expressions;bundle-versi
- on="3.4.500";visibility:=reexport,org.txm.rcp;bundle-version="0.8.0";
+ on="3.4.500";visibility:=reexport,org.txm.rcp;bundle-version="0.8.3";
  visibility:=reexport,org.txm.core;bundle-version="0.7.0";visibility:=
  reexport,org.txm.queryindex.rcp;bundle-version="1.0.0";visibility:=re
  export,org.txm.ca.core;visibility:=reexport,org.txm.statsengine.r.cor
@@ -16,7 +16,7 @@
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-Activator: listcooccurrences.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.querycooccurrences.rcp
 

Property changes on: TXM/trunk/org.txm.querycooccurrences.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.concordance.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.concordance.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.concordance.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:08 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.concordance.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.concordance.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.concordance.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Concordances
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -40,7 +40,7 @@
    <requires>
       <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
       <import plugin="org.txm.statsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.txm.concordance.core" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 

Property changes on: TXM/trunk/org.txm.concordance.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.treetagger.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.treetagger.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.treetagger.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,11 +5,11 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Require-Bundle: org.txm.treetagger.core;bundle-version="1.0.0";visibil
- ity:=reexport,org.txm.rcp;bundle-version="0.8.0";visibility:=reexport
+ ity:=reexport,org.txm.rcp;bundle-version="0.8.3";visibility:=reexport
  ,org.txm.index.rcp;bundle-version="1.0.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.treetagger.rcp
 

Property changes on: TXM/trunk/org.txm.treetagger.rcp
___________________________________________________________________
Added: svn:ignore
   + target



Property changes on: TXM/trunk/org.txm.libs.udpipe
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.udpipe.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.udpipe.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.udpipe.feature/build.properties	(revision 3628)
@@ -1 +1 @@
-bin.includes = feature.xml
+bin.includes = feature.xml, build.properties

Property changes on: TXM/trunk/org.txm.udpipe.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.oriflamms.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.oriflamms.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.oriflamms.feature/build.properties	(revision 3628)
@@ -1 +1 @@
-bin.includes = feature.xml
+bin.includes = feature.xml, build.properties

Property changes on: TXM/trunk/org.txm.oriflamms.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.libs.msoffice/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.msoffice/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.msoffice/META-INF/MANIFEST.MF	(revision 3628)
@@ -135,7 +135,7 @@
  lib/curvesapi-1.06.jar,
  lib/xmlbeans-4.0.0.jar
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Import-Package: net.sf.saxon.functions
 

Property changes on: TXM/trunk/org.txm.libs.msoffice
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.wordcloud.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.wordcloud.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.wordcloud.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:20 CEST 2018
-bin.includes=feature.xml
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.wordcloud.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.wordcloud.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.wordcloud.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Additional WordCloud command to build a visual representation of a hierarchical index or lexicon as a cloud of words.
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.wordcloud.feature
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.chartsengine.r.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.chartsengine.r.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.r.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -7,7 +7,7 @@
  lity:=reexport,org.txm.chartsengine.r.core;bundle-version="1.0.0";vis
  ibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.chartsengine.r.rcp
 

Property changes on: TXM/trunk/org.txm.chartsengine.r.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.backtomedia.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.backtomedia.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.backtomedia.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:04 CEST 2018
-bin.includes=feature.xml
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.backtomedia.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.backtomedia.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.backtomedia.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="https://groupes.renater.fr/wiki/txm-users/public/extensions#backtomedia">
       Video and audio player and BackToMedia command for record transcription based corpora with timing information (synchronized).
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -39,7 +39,7 @@
 
    <requires>
       <import plugin="org.txm.core" version="0.7.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.500" match="greaterOrEqual"/>

Property changes on: TXM/trunk/org.txm.backtomedia.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.progression.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.progression.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.progression.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -12,7 +12,7 @@
  ity:=reexport,org.txm.edition.rcp;bundle-version="1.0.0";visibility:=
  reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.progression.rcp
 

Property changes on: TXM/trunk/org.txm.progression.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java
===================================================================
--- TXM/trunk/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java	(revision 3627)
+++ TXM/trunk/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java	(revision 3628)
@@ -27,6 +27,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 
@@ -44,6 +45,7 @@
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.util.Util;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
@@ -863,6 +865,13 @@
 				if (currentComparator instanceof CompositeComparator) {
 					Log.fine(((CompositeComparator) currentComparator).getComparators().toString());
 				}
+				
+				List<Line> sel = ConcordanceEditor.this.viewerRight.getStructuredSelection().toList();
+				final HashSet<Integer> selectedPositions = new HashSet<Integer>();
+				for (Line line : sel) {
+					selectedPositions.add(line.matchGetStart());
+				}
+
 				JobHandler jobhandler = new JobHandler("Sorting...") { //$NON-NLS-1$
 					
 					@Override
@@ -875,6 +884,7 @@
 						
 						JobsTimer.start();
 						try {
+							
 							concordance.sort(currentComparator, new TXMProgressMonitor(monitor));
 							concordance.setTopIndex(0);
 							
@@ -886,6 +896,18 @@
 									StatusLine.setMessage(TXMUIMessages.sortDone);
 									try {
 										refresh(false);
+										
+										if (selectedPositions.size() > 0) {
+											List<Line> newLines = (List<Line>) ConcordanceEditor.this.viewerRight.getInput();
+											List<Line> newSelection = new ArrayList<Line>();
+											
+											for (Line l : newLines) {
+												if (selectedPositions.remove(l.matchGetStart())) newSelection.add(l);
+												if (selectedPositions.size() == 0) break;
+											}
+											ConcordanceEditor.this.viewerRight.setSelection(new StructuredSelection(newSelection));
+											ConcordanceEditor.this.viewerLeft.setSelection(new StructuredSelection(newSelection));
+										}
 									}
 									catch (Exception e1) {
 										// TODO Auto-generated catch block
Index: TXM/trunk/org.txm.concordance.rcp/src/org/txm/concordance/rcp/adapters/ConcordanceAdapterFactory.java
===================================================================
--- TXM/trunk/org.txm.concordance.rcp/src/org/txm/concordance/rcp/adapters/ConcordanceAdapterFactory.java	(revision 3627)
+++ TXM/trunk/org.txm.concordance.rcp/src/org/txm/concordance/rcp/adapters/ConcordanceAdapterFactory.java	(revision 3628)
@@ -2,14 +2,12 @@
 package org.txm.concordance.rcp.adapters;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.FrameworkUtil;
 import org.txm.concordance.core.functions.Concordance;
 import org.txm.rcp.adapters.TXMResultAdapter;
 import org.txm.rcp.adapters.TXMResultAdapterFactory;
 
-
 /**
  * A factory for creating Adapter objects.
  * 
Index: TXM/trunk/org.txm.concordance.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.concordance.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.concordance.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -6,11 +6,11 @@
 Bundle-SymbolicName: org.txm.concordance.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: %Bundle-Name
-Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexport,
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3";visibility:=reexport,
  org.txm.concordance.core;bundle-version="1.0.0";visibility:=reexport,
  org.txm.links.rcp;bundle-version="1.0.0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.txm.concordance.rcp
 

Property changes on: TXM/trunk/org.txm.concordance.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.javafx.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.libs.javafx.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.libs.javafx.feature/build.properties	(revision 3628)
@@ -1 +1 @@
-bin.includes = feature.xml
+bin.includes = feature.xml, build.properties
Index: TXM/trunk/org.txm.libs.javafx.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.libs.javafx.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.libs.javafx.feature/feature.xml	(revision 3628)
@@ -4,14 +4,32 @@
       label="org.txm.libs.javafx.feature"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
+Copyright © 2010-2013 ENS de Lyon.
+Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
+Lyon 2, University of Franche-Comté, University of Nice
+Sophia Antipolis, University of Paris 3.
+The TXM platform is free software: you can redistribute it and/or
+modify it under the terms of the GNU General Public
+License as published by the Free Software Foundation, either
+version 2 of the License, or (at your option) any
+later version.
+The TXM platform is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more
+details.
+You should have received a copy of the GNU General Public License
+along with the TXM platform. If not, see
+http://www.gnu.org/licenses
    </copyright>
 
    <license url="http://www.example.com/license">
Index: TXM/trunk/org.txm.annotation.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.annotation.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.annotation.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:02 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.annotation.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.annotation.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.annotation.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Abstract annotation features
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -39,6 +39,7 @@
 
    <requires>
       <import plugin="org.txm.core" version="0.7.0" match="greaterOrEqual"/>
+      <import plugin="org.txm.tokenizer.core"/>
       <import plugin="org.txm.annotation.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.concordance.rcp" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.edition.rcp" version="1.0.0" match="greaterOrEqual"/>
@@ -50,7 +51,7 @@
       <import plugin="org.txm.annotation.kr.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.annotation.rcp" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi"/>
-      <import plugin="org.eclipse.persistence.core" version="2.7.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.persistence.core" version="2.7.3" match="greaterOrEqual"/>
    </requires>
 
    <plugin

Property changes on: TXM/trunk/org.txm.annotation.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.libs.graphstream/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.graphstream/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.graphstream/META-INF/MANIFEST.MF	(revision 3628)
@@ -46,11 +46,11 @@
  ala.xml.include.sax,scala.xml.parsing,scala.xml.persistent,scala.xml.
  pull,scala.xml.transform
 Bundle-Name: GraphStream
-Bundle-Version: 1.3
+Bundle-Version: 1.3.0
 Bundle-ClassPath: .,lib/gs-algo-1.3/gs-algo-1.3.jar,lib/gs-core-1.3/gs
  -core-1.3.jar,lib/gs-ui-1.3/gs-ui-1.3.jar
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: http://graphstream-project.org
 Automatic-Module-Name: org.txm.libs.graphstream
 

Property changes on: TXM/trunk/org.txm.libs.graphstream
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.para.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.para.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.para.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -8,7 +8,7 @@
  ara.core;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.para.rcp
 

Property changes on: TXM/trunk/org.txm.para.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesLinesViewerComparator.java
===================================================================
--- TXM/trunk/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesLinesViewerComparator.java	(revision 3627)
+++ TXM/trunk/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesLinesViewerComparator.java	(revision 3628)
@@ -4,12 +4,18 @@
 package org.txm.specificities.rcp.editors;
 
 import java.text.Collator;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
+import org.apache.poi.util.SystemOutLogger;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
 import org.txm.rcp.editors.TXMEditor;
 import org.txm.rcp.editors.TableLinesViewerComparator;
 
@@ -78,6 +84,13 @@
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				
+				
+				HashSet<SpecifLine> oldSelection = new HashSet(viewer.getStructuredSelection().toList());
+				HashSet<String> oldSelectionNames = new HashSet<String>();
+				for (SpecifLine i : oldSelection) {
+					oldSelectionNames.add(i.name);
+				}
+								
 				// System.out.println("select column="+column.getText());
 				boolean partScoreFirstSort = (index != 0 && (index % 2) == 0 && lastColumnIndex != index);
 				
@@ -93,6 +106,21 @@
 				// long t = System.currentTimeMillis();
 				TXMEditor.refreshColumns(viewer);
 				// System.out.println("T="+(System.currentTimeMillis()-t));
+				
+				viewer.getTable().deselectAll();
+				if (oldSelectionNames.size() > 0) {
+					SpecifLine[] newLines = (SpecifLine[]) viewer.getInput();
+					for (int i = 0 ; i < newLines.length ; i++) {
+						
+						if (oldSelectionNames.remove(newLines[i].name)) {
+							viewer.getTable().select(i);
+						}
+					}
+					// FIXME setSelection dont work, is it because the table is virtual ?
+					//viewer.setSelection(new StructuredSelection(new ArrayList()));
+					
+				}
+				
 			}
 		});
 	}
Index: TXM/trunk/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesSelectionEditor.java
===================================================================
--- TXM/trunk/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesSelectionEditor.java	(revision 3627)
+++ TXM/trunk/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesSelectionEditor.java	(revision 3628)
@@ -7,6 +7,7 @@
 import org.txm.chartsengine.rcp.editors.ChartEditor;
 import org.txm.core.results.Parameter;
 import org.txm.rcp.IImageKeys;
+import org.txm.rcp.editors.listeners.ComputeListener;
 import org.txm.rcp.editors.listeners.ComputeSelectionListener;
 import org.txm.rcp.swt.widget.FloatSpinner;
 import org.txm.rcp.swt.widget.LabeledSpinner;
@@ -49,7 +50,6 @@
 		this.groupBarsByLines = new ToolItem(this.getToolBar(), SWT.CHECK);
 		this.groupBarsByLines.setToolTipText(SpecificitiesUIMessages.groupBarsByLines);
 		this.groupBarsByLines.setImage(IImageKeys.getImage(ComputeSpecifities.class, "icons/silk_group_bars_by_lines.png")); //$NON-NLS-1$
-		this.groupBarsByLines.addSelectionListener(computeSelectionListener);
 		
 		// Banality
 		Composite extendedParametersArea = this.getExtendedParametersGroup();
@@ -57,6 +57,8 @@
 		LabeledSpinner banality = new LabeledSpinner(extendedParametersArea, this, new Label(extendedParametersArea, SWT.NONE), new FloatSpinner(extendedParametersArea, SWT.BORDER), SpecificitiesUIMessages.banality, SpecificitiesUIMessages.banalityThreshold, true);
 		this.banalitySpinner = (FloatSpinner) banality.getSpinner();
 		this.banalitySpinner.setMaximumAsFloat(200);
+		
+		this.groupBarsByLines.addSelectionListener(computeSelectionListener);
 		this.banalitySpinner.addSelectionListener(computeSelectionListener);
 	}
 
Index: TXM/trunk/org.txm.specificities.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.specificities.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.specificities.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -9,7 +9,7 @@
  lexicaltable.rcp;visibility:=reexport,org.txm.specificities.core;bund
  le-version="1.0.0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.specificities.rcp
 

Property changes on: TXM/trunk/org.txm.specificities.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.textsbalance.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.textsbalance.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.textsbalance.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:18 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.textsbalance.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.textsbalance.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.textsbalance.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="TXM"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Additional TextBalance command to build a radar representation of text metadata values.
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.textsbalance.feature
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target



Property changes on: TXM/trunk/org.txm.udpipe.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.statsengine.r.core.linux/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.statsengine.r.core.linux/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.statsengine.r.core.linux/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,7 +4,8 @@
 Bundle-SymbolicName: org.txm.statsengine.r.core.linux
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.txm.statsengine.r.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Eclipse-PlatformFilter: (osgi.os=linux)
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.statsengine.r.core.linux
+Eclipse-BundleShape: dir

Property changes on: TXM/trunk/org.txm.statsengine.r.core.linux
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.ca.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.ca.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.ca.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -13,7 +13,7 @@
  ="1.0.0";visibility:=reexport,org.txm.lexicaltable.core;visibility:=r
  eexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.ca.core
 

Property changes on: TXM/trunk/org.txm.ca.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.analec.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.analec.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.analec.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:02 CEST 2018
-bin.includes=feature.xml
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.analec.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.analec.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.analec.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Annotate through TXM editions using URS Annotation structures (Unit-Relation-Schema).
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -43,8 +43,8 @@
       <import plugin="org.eclipse.jface"/>
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
-      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.core" version="0.8.3" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.txm.utils.core"/>
       <import feature="org.txm.edition.feature" version="1.0.0.qualifier"/>
       <import feature="org.txm.lexicaltable.feature" version="1.0.0.qualifier"/>

Property changes on: TXM/trunk/org.txm.analec.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.treetagger.core.linux/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.treetagger.core.linux/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.treetagger.core.linux/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,5 +4,5 @@
 Bundle-SymbolicName: org.txm.treetagger.core.linux
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.txm.treetagger.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Automatic-Module-Name: org.txm.treetagger.core.linux

Property changes on: TXM/trunk/org.txm.treetagger.core.linux
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.saxon/saxon9he.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.saxon/.classpath
===================================================================
--- TXM/trunk/org.txm.libs.saxon/.classpath	(revision 3627)
+++ TXM/trunk/org.txm.libs.saxon/.classpath	(revision 3628)
@@ -3,8 +3,8 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/jline-2.14.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/saxon-he-11.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xmlresolver-4.2.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmlresolver-4.2.0-data.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xmlresolver-4.2.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
Index: TXM/trunk/org.txm.libs.saxon/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.saxon/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.saxon/META-INF/MANIFEST.MF	(revision 3628)
@@ -1,8 +1,6 @@
 Manifest-Version: 1.0
 Bundle-SymbolicName: org.txm.libs.saxon
 Export-Package: net.sf.saxon,
- net.sf.saxon.data,
- net.sf.saxon.data.sef,
  net.sf.saxon.dom,
  net.sf.saxon.event,
  net.sf.saxon.expr,
@@ -62,14 +60,14 @@
  net.sf.saxon.xpath,
  net.sf.saxon.z
 Bundle-Name: Saxon
-Bundle-Version: 11
+Bundle-Version: 9.0.0
 Bundle-ClassPath: .,
  lib/jline-2.14.6.jar,
  lib/saxon-he-11.3.jar,
- lib/xmlresolver-4.2.0-data.jar,
- lib/xmlresolver-4.2.0.jar
+ lib/xmlresolver-4.2.0.jar,
+ lib/xmlresolver-4.2.0-data.jar
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Vendor: http://saxon.sourceforge.net/
+Bundle-RequiredExecutionEnvironment: JavaSE-16
+Bundle-Vendor: https://saxon.sourceforge.net/
 Automatic-Module-Name: org.txm.libs.saxon
 

Property changes on: TXM/trunk/org.txm.libs.saxon/lib
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.libs.saxon/build.properties
===================================================================
--- TXM/trunk/org.txm.libs.saxon/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.libs.saxon/build.properties	(revision 3628)
@@ -5,5 +5,5 @@
                OSGI-INF/,\
                lib/jline-2.14.6.jar,\
                lib/saxon-he-11.3.jar,\
-               lib/xmlresolver-4.2.0-data.jar,\
-               lib/xmlresolver-4.2.0.jar
+               lib/xmlresolver-4.2.0.jar,\
+               lib/xmlresolver-4.2.0-data.jar

Property changes on: TXM/trunk/org.txm.libs.saxon
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.translate.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.translate.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.translate.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -3,9 +3,9 @@
 Bundle-SymbolicName: org.txm.translate.rcp;singleton:=true
 Bundle-Name: %Bundle-Name.0
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexpor
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3";visibility:=reexpor
  t,org.eclipse.search;bundle-version="3.11.100";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 
Index: TXM/trunk/org.txm.translate.rcp/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- TXM/trunk/org.txm.translate.rcp/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3627)
+++ TXM/trunk/org.txm.translate.rcp/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3628)
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-groovy.compiler.level=30
+groovy.compiler.level=40
 groovy.script.filters=**/*.dsld,y,**/*.gradle,n

Property changes on: TXM/trunk/org.txm.translate.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

.~lock*

   + bin

.~lock*

target


Index: TXM/trunk/org.txm.ocaml.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.ocaml.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.ocaml.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -18,11 +18,11 @@
  e.support.toplevel,org.ocamljava.runtime.util,org.ocamljava.runtime.v
  alues,org.ocamljava.runtime.wrappers,org.txm.ocaml.core
 Bundle-Name: Ocaml
-Bundle-Version: 2.0
+Bundle-Version: 2.0.0
 Bundle-ClassPath: .,lib/ocamlrun-scripting.jar,lib/ocaml-lib-files.jar
 Require-Bundle: org.txm.core;visibility:=reexport,
  org.eclipse.core.runtime;visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 

Property changes on: TXM/trunk/org.txm.ocaml.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.core.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.core.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.core.feature/build.properties	(revision 3628)
@@ -1 +1 @@
-bin.includes = feature.xml
+bin.includes = feature.xml, build.properties
Index: TXM/trunk/org.txm.core.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.core.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.core.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="TXM Core"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description>
       TXM Core (no UI)
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -37,30 +37,26 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.utils.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.libs.groovy-all" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime" version="3.10.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi.util" version="3.2.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.net"/>
       <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipse.ui.workbench"/>
       <import plugin="org.eclipse.core.commands"/>
       <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.osgi.util" version="3.3.0" match="greaterOrEqual"/>
+      <import plugin="org.txm.utils.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.libs.hsqldb" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.apache.xerces" version="2.9.0" match="greaterOrEqual"/>
       <import plugin="org.txm.libs.saxon" version="9.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi.util" version="3.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.net" version="1.2.200" match="greaterOrEqual"/>
       <import plugin="org.txm.libs.colt" version="1.2.0" match="greaterOrEqual"/>
       <import plugin="org.txm.libs.itext" version="2.1.5" match="greaterOrEqual"/>
-      <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.core" version="0.7.0" match="greaterOrEqual"/>
       <import plugin="org.txm.libs.groovy-all" version="2.3.7" match="greaterOrEqual"/>
       <import plugin="org.txm.libs.msoffice" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.libs.office" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
       <import plugin="com.ibm.icu"/>
-      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.core" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="javax.xml" version="1.3.4" match="compatible"/>
+      <import plugin="org.apache.xerces" version="2.9.0" match="greaterOrEqual"/>
       <import plugin="org.apache.xml.resolver" version="1.2.0" match="compatible"/>
       <import plugin="org.apache.xml.serializer" version="2.7.1" match="compatible"/>
    </requires>
@@ -75,7 +71,8 @@
          id="org.txm.libs.batik"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.txm.libs.colt"
@@ -135,7 +132,8 @@
          id="org.txm.libs.args4j"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.txm.libs.cqp"

Property changes on: TXM/trunk/org.txm.core.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.cooccurrence.chartsengine/.project
===================================================================
--- TXM/trunk/org.txm.cooccurrence.chartsengine/.project	(revision 3627)
+++ TXM/trunk/org.txm.cooccurrence.chartsengine/.project	(revision 3628)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.txm.dev.cooccurrence.chartsengine</name>
+	<name>org.txm.cooccurrence.chartsengine.rcp</name>
 	<comment></comment>
 	<projects>
 	</projects>
Index: TXM/trunk/org.txm.cooccurrence.chartsengine/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.cooccurrence.chartsengine/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.cooccurrence.chartsengine/META-INF/MANIFEST.MF	(revision 3628)
@@ -1,12 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Cooccurrence Graphs
-Bundle-SymbolicName: org.txm.dev.cooccurrence.chartsengine;singleton:=true
+Bundle-SymbolicName: org.txm.cooccurrence.chartsengine.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Textometrie.org
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Require-Bundle: org.txm.chartsengine.graphstream.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.cooccurrence.core;bundle-version="1.0.0";visibility:=reexport,
  org.txm.cooccurrence.rcp;bundle-version="1.0.0";visibility:=reexport,
  org.txm.chartsengine.rcp;bundle-version="1.0.0";visibility:=reexport
 Export-Package: org.txm.cooccurrence.chartsengine,

Property changes on: TXM/trunk/org.txm.cooccurrence.chartsengine
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.rcp/rcpapplication.product
===================================================================
--- TXM/trunk/org.txm.rcp/rcpapplication.product	(revision 3627)
+++ TXM/trunk/org.txm.rcp/rcpapplication.product	(revision 3628)
@@ -1,495 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="TXM 0.8.2" uid="org.txm.rcp.app" id="org.txm.rcp.product" application="org.txm.rcp.Application" version="0.8.2.qualifier" useFeatures="true" includeLaunchers="true">
-
-   <aboutInfo>
-      <image path="/org.txm.rcp/icons/logo/about TXM.png"/>
-      <text>
-         [Contrat d&apos;utilisation du logiciel TXM]
-
-TXM 0.8.2 Copyright © 2010-2021 ENS de Lyon, University of Franche-Comté, CNRS
-
-&lt;English version below&gt;
-
-EN ACCEPTANT CETTE INSTALLATION OU MISE À JOUR ET EN UTILISANT TXM, VOUS VOUS ENGAGEZ À CITER L&apos;ARTICLE DE RÉFÉRENCE DE LA PLATEFORME* DANS VOS PUBLICATIONS DE RÉSULTATS OBTENUS À PARTIR D&apos;ELLE. CELA EST ESSENTIEL POUR NOUS PERMETTRE DE JUSTIFIER LE BESOIN DE PÉRENNISATION DE CET INSTRUMENT DE TRAVAIL POUR LA COMMUNAUTÉ SCIENTIFIQUE.
-
-Le logiciel TXM est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier suivant les termes de la Licence publique générale GNU telle que publiée par la Free Software Foundation, soit la version 2 de cette License, soit une version ultérieure.
-
-Le logiciel TXM est distribué dans l&apos;espoir qu&apos;il sera utile, mais sans aucune garantie, y compris mais non de façon limitative les garanties implicites de qualité marchande et de convenance à un usage particulier. Consultez la version 2 et la version 3 de la Licence publique générale GNU pour plus de détails.
-
-Vous devriez avoir reçu une copie de la Licence publique générale GNU en accompagnement du logiciel TXM ; si ce n&apos;est pas le cas, veuillez consulter la page http://www.gnu.org/licenses/gpl-2.0.html
-_______________
-* Serge Heiden, Jean-Philippe Magué, Bénédicte Pincemin.
-TXM : Une plateforme logicielle open-source pour la textométrie - conception et développement. Sergio Bolasco, Isabella Chiari, Luca Giuliano. 10th International Conference on the Statistical Analysis of Textual Data - JADT 2010, Jun 2010, Rome, Italie.
-Edizioni Universitarie di Lettere Economia Diritto, 2 (3), pp.1021-1032, 2010. &lt;halshs-00549779&gt;
-
-
-ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH
-
-[TXM Software User Agreement]
-
-By accepting this update and by using TXM, you agree to cite the TXM platform reference article** in your publications of results obtained from it. That is essential for us to justify the need for sustainability of this instrument for the scientific community.
-
-The TXM platform is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.
-
-The TXM platform is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with the TXM platform. If not, see http://www.gnu.org/licenses/gpl-2.0.html
-_______________
-** Serge Heiden. The TXM Platform: Building Open-Source Textual
-Analysis Software Compatible with the TEI Encoding Scheme. Ryo Otoguro, Kiyoshi Ishikawa, Hiroshi Umemoto, Kei Yoshimoto and Yasunari Harada. 24th Pacific Asia Conference on Language, Information and Computation, Nov 2010, Sendai, Japan. Institute for Digital Enhancement of Cognitive Development, Waseda University, pp.389-398, 2010. &lt;halshs-00549764&gt;
-      </text>
-   </aboutInfo>
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <vmArgs>-Xms512m -Xmx2048m
--Dfile.encoding=UTF-8
--Dorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient4
--Dorg.eclipse.ecf.provider.filetransfer.retrieve.connectTimeout=6000
--Dorg.eclipse.ecf.provider.filetransfer.retrieve.retryAttempts=5
-      </vmArgs>
-      <vmArgsLin>-Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel
-      </vmArgsLin>
-      <vmArgsMac>-XstartOnFirstThread 
--Dorg.eclipse.swt.internal.carbon.smallFonts
-      </vmArgsMac>
-      <vmArgsWin>-XX:MaxPermSize=256m
-      </vmArgsWin>
-   </launcherArgs>
-
-   <windowImages i16="/org.txm.rcp/icons/logo/TXM logo 16x16.png" i32="/org.txm.rcp/icons/logo/TXM_logo.png" i48="/org.txm.rcp/icons/logo/TXM logo 48x48.png" i64="/org.txm.rcp/icons/logo/TXM_logo_64x64.png" i128="/org.txm.rcp/icons/logo/TXM logo 128x128.png" i256="/org.txm.rcp/icons/logo/TXM logo 256x256.png"/>
-
-   <splash
-      location="org.txm.rcp"
-      startupProgressRect="13,332,290,15"
-      startupMessageRect="13,312,290,20"
-      startupForegroundColor="000000" />
-   <launcher name="launcher">
-      <linux icon="/org.txm.rcp/icons/logo/TXM logo.xpm"/>
-      <macosx icon="/org.txm.rcp/icons/logo/TXM logo.icns"/>
-      <win useIco="false">
-         <bmp
-            winSmallHigh="/org.txm.rcp/icons/logo/TXM logo 16x16 32-bit.bmp"
-            winMediumHigh="/org.txm.rcp/icons/logo/TXM logo 32x32 32-bit.bmp"
-            winLargeHigh="/org.txm.rcp/icons/logo/TXM logo 48x48 32-bit.bmp"/>
-      </win>
-   </launcher>
-
-   <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
-      <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</solaris>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
-   </vm>
-
-   <license>
-        <text>
-   TXM Licence Utilisateur &lt;English version below&gt;
-
-1. En utilisant TXM, vous vous engagez à citer l&apos;article
-   de référence de la plateforme dans vos publications :
-
-   Serge Heiden. The TXM Platform: Building Open-Source
-   Textual Analysis Software Compatible with the TEI
-   Encoding Scheme. Ryo Otoguro, Kiyoshi Ishikawa,
-   Hiroshi Umemoto, Kei Yoshimoto and Yasunari Harada.
-   24th Pacific Asia Conference on Language, Information
-   and Computation, Nov 2010, Sendai, Japan. Institute
-   for Digital Enhancement of Cognitive Development,
-   Waseda University, pp.389-398, 2010.
-   &lt;https://halshs.archives-ouvertes.fr/halshs-00549764/fr&gt;
-
-2. Le logiciel TXM est un logiciel libre ; vous pouvez
-   le redistribuer et/ou le modifier suivant les termes
-   de la Licence publique générale GNU telle que publiée
-   par la Free Software Foundation, soit la version 2 de
-   cette License, soit une version ultérieure.
-
-3. Le logiciel TXM est distribué dans l&apos;espoir qu&apos;il sera
-   utile, mais sans aucune garantie, y compris mais non
-   de façon limitative les garanties implicites de
-   qualité marchande et de convenance à un usage
-   particulier. Consultez la version 2 et la version 3 de
-   la Licence publique générale GNU pour plus de détails.
-
-4. Vous devriez avoir reçu une copie de la Licence
-   publique générale GNU en accompagnement du logiciel
-   TXM ; si ce n&apos;est pas le cas, veuillez consulter la
-   page http://www.gnu.org/licenses/gpl-2.0.html.
-
-Fin de la licence utilisateur TXM
-
-----------------------------------------------------------------------------------------------------------------
-TXM User Agreement &lt;version française ci-dessus&gt;
-
-1. By using TXM, you agree to cite the TXM platform
-   reference article in your publications:
-
-   Serge Heiden. The TXM Platform: Building Open-Source
-   Textual Analysis Software Compatible with the TEI
-   Encoding Scheme. Ryo Otoguro, Kiyoshi Ishikawa,
-   Hiroshi Umemoto, Kei Yoshimoto and Yasunari Harada.
-   24th Pacific Asia Conference on Language, Information
-   and Computation, Nov 2010, Sendai, Japan. Institute
-   for Digital Enhancement of Cognitive Development,
-   Waseda University, pp.389-398, 2010.
-   &lt;https://halshs.archives-ouvertes.fr/halshs-00549764/fr&gt;
-
-2. The TXM platform is free software: you can
-   redistribute it and/or modify it under the terms of
-   the GNU General Public License as published by the
-   Free Software Foundation, either version 2 of the
-   License, or (at your option) any later version.
-
-3. The TXM platform is distributed in the hope that it
-   will be useful, but WITHOUT ANY WARRANTY; without
-   even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-   Public License for more details.
-
-4. You should have received a copy of the GNU General
-   Public License along with the TXM platform. If not,
-   see http://www.gnu.org/licenses/gpl-2.0.html.
-
-End of TXM User Agreement
-         </text>
-   </license>
-
-   <plugins>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="javax.annotation"/>
-      <plugin id="javax.inject"/>
-      <plugin id="javax.xml"/>
-      <plugin id="org.apache.batik.css"/>
-      <plugin id="org.apache.batik.util"/>
-      <plugin id="org.apache.commons.jxpath"/>
-      <plugin id="org.apache.felix.gogo.command"/>
-      <plugin id="org.apache.felix.gogo.runtime"/>
-      <plugin id="org.apache.felix.gogo.shell"/>
-      <plugin id="org.apache.felix.scr"/>
-      <plugin id="org.apache.xerces"/>
-      <plugin id="org.apache.xml.resolver"/>
-      <plugin id="org.apache.xml.serializer"/>
-      <plugin id="org.eclipse.compare.core"/>
-      <plugin id="org.eclipse.compare.core.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.commands.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.contenttype.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.databinding.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.databinding.observable"/>
-      <plugin id="org.eclipse.core.databinding.observable.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.databinding.property"/>
-      <plugin id="org.eclipse.core.databinding.property.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.expressions.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.filebuffers"/>
-      <plugin id="org.eclipse.core.filebuffers.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.aix.ppc.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.linux.x86.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.linux.x86_64.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.macosx.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.solaris.sparc.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.win32.x86.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.win32.x86_64.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.jobs.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.net"/>
-      <plugin id="org.eclipse.core.net.linux.x86.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.net.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.core.net.linux.x86_64.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.net.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.net.win32.x86.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.net.win32.x86_64.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.resources"/>
-      <plugin id="org.eclipse.core.resources.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.core.variables"/>
-      <plugin id="org.eclipse.core.variables.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.core.commands"/>
-      <plugin id="org.eclipse.e4.core.commands.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.core.contexts"/>
-      <plugin id="org.eclipse.e4.core.contexts.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.core.di"/>
-      <plugin id="org.eclipse.e4.core.di.annotations"/>
-      <plugin id="org.eclipse.e4.core.di.annotations.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.core.di.extensions"/>
-      <plugin id="org.eclipse.e4.core.di.extensions.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.core.di.extensions.supplier"/>
-      <plugin id="org.eclipse.e4.core.di.extensions.supplier.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.core.di.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.core.services"/>
-      <plugin id="org.eclipse.e4.core.services.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.emf.xpath"/>
-      <plugin id="org.eclipse.e4.emf.xpath.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.bindings"/>
-      <plugin id="org.eclipse.e4.ui.bindings.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.css.core"/>
-      <plugin id="org.eclipse.e4.ui.css.core.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.css.swt"/>
-      <plugin id="org.eclipse.e4.ui.css.swt.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
-      <plugin id="org.eclipse.e4.ui.css.swt.theme.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.di"/>
-      <plugin id="org.eclipse.e4.ui.di.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.model.workbench"/>
-      <plugin id="org.eclipse.e4.ui.model.workbench.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.services"/>
-      <plugin id="org.eclipse.e4.ui.services.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.swt.gtk" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.swt.gtk.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.widgets"/>
-      <plugin id="org.eclipse.e4.ui.widgets.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.workbench"/>
-      <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.addons.swt.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.workbench.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.workbench.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.swt.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.workbench3"/>
-      <plugin id="org.eclipse.e4.ui.workbench3.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ecf"/>
-      <plugin id="org.eclipse.ecf.filetransfer"/>
-      <plugin id="org.eclipse.ecf.identity"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer"/>
-      <plugin id="org.eclipse.ecf.provider.filetransfer.ssl" fragment="true"/>
-      <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
-      <plugin id="org.eclipse.emf.common"/>
-      <plugin id="org.eclipse.emf.ecore"/>
-      <plugin id="org.eclipse.emf.ecore.change"/>
-      <plugin id="org.eclipse.emf.ecore.xmi"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.bidi"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.console"/>
-      <plugin id="org.eclipse.equinox.ds"/>
-      <plugin id="org.eclipse.equinox.event"/>
-      <plugin id="org.eclipse.equinox.frameworkadmin"/>
-      <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
-      <plugin id="org.eclipse.equinox.frameworkadmin.equinox.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.frameworkadmin.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.artifact.repository"/>
-      <plugin id="org.eclipse.equinox.p2.artifact.repository.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.core"/>
-      <plugin id="org.eclipse.equinox.p2.core.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.director"/>
-      <plugin id="org.eclipse.equinox.p2.director.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.discovery"/>
-      <plugin id="org.eclipse.equinox.p2.discovery.compatibility"/>
-      <plugin id="org.eclipse.equinox.p2.discovery.compatibility.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.discovery.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.engine"/>
-      <plugin id="org.eclipse.equinox.p2.engine.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.garbagecollector"/>
-      <plugin id="org.eclipse.equinox.p2.garbagecollector.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.jarprocessor"/>
-      <plugin id="org.eclipse.equinox.p2.jarprocessor.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.metadata"/>
-      <plugin id="org.eclipse.equinox.p2.metadata.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.metadata.repository"/>
-      <plugin id="org.eclipse.equinox.p2.metadata.repository.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.operations"/>
-      <plugin id="org.eclipse.equinox.p2.operations.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.repository"/>
-      <plugin id="org.eclipse.equinox.p2.repository.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>
-      <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.transport.ecf"/>
-      <plugin id="org.eclipse.equinox.p2.transport.ecf.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.ui"/>
-      <plugin id="org.eclipse.equinox.p2.ui.discovery"/>
-      <plugin id="org.eclipse.equinox.p2.ui.discovery.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.ui.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.ui.sdk"/>
-      <plugin id="org.eclipse.equinox.p2.ui.sdk.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler"/>
-      <plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.p2.updatechecker"/>
-      <plugin id="org.eclipse.equinox.p2.updatechecker.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.region" fragment="true"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.equinox.security"/>
-      <plugin id="org.eclipse.equinox.security.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.security.macosx" fragment="true"/>
-      <plugin id="org.eclipse.equinox.security.ui"/>
-      <plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.equinox.security.win32.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.equinox.simpleconfigurator"/>
-      <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/>
-      <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.simpleconfigurator.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.equinox.supplement"/>
-      <plugin id="org.eclipse.equinox.transforms.hook" fragment="true"/>
-      <plugin id="org.eclipse.equinox.util"/>
-      <plugin id="org.eclipse.equinox.weaving.hook" fragment="true"/>
-      <plugin id="org.eclipse.help"/>
-      <plugin id="org.eclipse.help.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.jface.databinding.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.jface.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.jface.text"/>
-      <plugin id="org.eclipse.jface.text.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
-      <plugin id="org.eclipse.osgi.compatibility.state.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.osgi.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.osgi.services.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.osgi.util"/>
-      <plugin id="org.eclipse.osgi.util.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.pde.ds.lib"/>
-      <plugin id="org.eclipse.pde.ds.lib.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.platform"/>
-      <plugin id="org.eclipse.platform.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.ppc64" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.ppc64le" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.text"/>
-      <plugin id="org.eclipse.text.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui"/>
-      <plugin id="org.eclipse.ui.browser"/>
-      <plugin id="org.eclipse.ui.browser.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui.cocoa" fragment="true"/>
-      <plugin id="org.eclipse.ui.cocoa.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui.console"/>
-      <plugin id="org.eclipse.ui.console.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui.editors"/>
-      <plugin id="org.eclipse.ui.editors.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui.forms"/>
-      <plugin id="org.eclipse.ui.forms.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui.ide"/>
-      <plugin id="org.eclipse.ui.ide.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui.intro"/>
-      <plugin id="org.eclipse.ui.intro.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui.themes"/>
-      <plugin id="org.eclipse.ui.themes.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui.views"/>
-      <plugin id="org.eclipse.ui.views.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui.win32.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui.workbench"/>
-      <plugin id="org.eclipse.ui.workbench.nl_fr" fragment="true"/>
-      <plugin id="org.eclipse.ui.workbench.texteditor"/>
-      <plugin id="org.eclipse.ui.workbench.texteditor.nl_fr" fragment="true"/>
-      <plugin id="org.sat4j.core"/>
-      <plugin id="org.sat4j.pb"/>
-      <plugin id="org.tukaani.xz"/>
-      <plugin id="org.txm.annotation.core"/>
-      <plugin id="org.txm.core"/>
-      <plugin id="org.txm.groovy.core"/>
-      <plugin id="org.txm.libs.args4j"/>
-      <plugin id="org.txm.libs.batik"/>
-      <plugin id="org.txm.libs.colt"/>
-      <plugin id="org.txm.libs.cqp"/>
-      <plugin id="org.txm.libs.cqp.linux" fragment="true"/>
-      <plugin id="org.txm.libs.cqp.macosx" fragment="true"/>
-      <plugin id="org.txm.libs.cqp.win32" fragment="true"/>
-      <plugin id="org.txm.libs.groovy-all"/>
-      <plugin id="org.txm.libs.hsqldb"/>
-      <plugin id="org.txm.libs.itext"/>
-      <plugin id="org.txm.libs.msoffice"/>
-      <plugin id="org.txm.libs.office"/>
-      <plugin id="org.txm.libs.rserve"/>
-      <plugin id="org.txm.libs.saxon"/>
-      <plugin id="org.txm.rcp"/>
-      <plugin id="org.txm.rcp.about.fragment" fragment="true"/>
-      <plugin id="org.txm.rcp.p2.ui" fragment="true"/>
-      <plugin id="org.txm.searchengine.core"/>
-      <plugin id="org.txm.searchengine.cqp.core"/>
-      <plugin id="org.txm.statsengine.core"/>
-      <plugin id="org.txm.statsengine.r.core"/>
-      <plugin id="org.txm.statsengine.r.core.linux" fragment="true"/>
-      <plugin id="org.txm.statsengine.r.core.macosx" fragment="true"/>
-      <plugin id="org.txm.statsengine.r.core.win32" fragment="true"/>
-      <plugin id="org.txm.tokenizer.core"/>
-      <plugin id="org.txm.treetagger.core"/>
-      <plugin id="org.txm.treetagger.core.linux" fragment="true"/>
-      <plugin id="org.txm.treetagger.core.macosx" fragment="true"/>
-      <plugin id="org.txm.treetagger.core.models" fragment="true"/>
-      <plugin id="org.txm.treetagger.core.win32" fragment="true"/>
-      <plugin id="org.txm.utils"/>
-      <plugin id="org.txm.utils.core"/>
-      <plugin id="org.w3c.css.sac"/>
-   </plugins>
-
-   <features>
-      <feature id="org.txm.rcp.feature"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
-      <feature id="org.eclipse.emf.common"/>
-      <feature id="org.eclipse.equinox.p2.core.feature"/>
-      <feature id="org.eclipse.ecf.core.ssl.feature"/>
-      <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
-      <feature id="org.eclipse.emf.ecore"/>
-      <feature id="org.eclipse.equinox.p2.user.ui"/>
-      <feature id="org.eclipse.equinox.p2.extras.feature"/>
-      <feature id="org.eclipse.rcp"/>
-      <feature id="org.eclipse.ecf.core.feature"/>
-      <feature id="org.eclipse.equinox.p2.rcp.feature"/>
-      <feature id="org.eclipse.ecf.filetransfer.feature"/>
-      <feature id="org.eclipse.e4.rcp"/>
-      <feature id="org.txm.ca.feature"/>
-      <feature id="org.txm.chartsengine.jfreechart.feature"/>
-      <feature id="org.txm.xmleditor.feature"/>
-      <feature id="org.txm.searchengine.cqp.feature"/>
-      <feature id="org.txm.core.feature"/>
-      <feature id="org.txm.annotation.feature"/>
-      <feature id="org.txm.statsengine.r.feature"/>
-      <feature id="org.txm.edition.feature"/>
-      <feature id="org.txm.lexicaltable.feature"/>
-      <feature id="org.txm.internalview.feature"/>
-      <feature id="org.txm.partition.feature"/>
-      <feature id="org.txm.concordance.feature"/>
-      <feature id="org.txm.index.feature"/>
-      <feature id="org.txm.ahc.feature"/>
-      <feature id="org.txm.groovy.feature"/>
-      <feature id="org.txm.specificities.feature"/>
-      <feature id="org.eclipse.babel.nls_eclipse_fr"/>
-      <feature id="org.txm.perl.feature"/>
-      <feature id="org.txm.progression.feature"/>
-      <feature id="org.txm.treetagger.feature"/>
-      <feature id="org.txm.properties.feature"/>
-      <feature id="org.txm.referencer.feature"/>
-      <feature id="org.txm.chartsengine.r.feature"/>
-      <feature id="org.txm.cooccurrence.feature"/>
-      <feature id="org.txm.annotation.kr.feature"/>
-   </features>
-
-   <configurations>
-      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="1" />
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
-      <property name="osgi.instance.area" value="@noDefault" />
-   </configurations>
-
-   <preferencesInfo>
-      <targetfile overwrite="false"/>
-   </preferencesInfo>
-
-   <cssInfo>
-   </cssInfo>
-
-</product>
Index: TXM/trunk/org.txm.rcp/VERSION
===================================================================
--- TXM/trunk/org.txm.rcp/VERSION	(revision 3627)
+++ TXM/trunk/org.txm.rcp/VERSION	(revision 3628)
@@ -1 +1 @@
-0.8.2
\ No newline at end of file
+0.8.3
\ No newline at end of file
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java	(revision 3628)
@@ -1494,6 +1494,8 @@
 	public static String textsToProcess;
 
 	public static String pageProperties;
+
+	public static String textLanguage;
 	
 	static {
 		// initialize resource bundle
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 3628)
@@ -743,3 +743,5 @@
 zoomInAmpoutColonMouseWheelORShiftPlusRightMousePlusDrag=\ Zoom +/-\: Mouse wheel OR Shift + Right Mouse + Drag 
 zoomToSelectionColonCtrlPlusLeftMousePlusdrag=\ Zoom to selection\: Ctrl + Left Mouse + Drag 
 pageProperties=Page properties
+textLanguage=Text language
+
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties	(revision 3628)
@@ -744,3 +744,4 @@
 zoomInAmpoutColonMouseWheelORShiftPlusRightMousePlusDrag=\ Zoom +/- \: Roulette OU Maj + Clic Droit + Glisser 
 zoomToSelectionColonCtrlPlusLeftMousePlusdrag=\ Zoomer sur la sélection \: Ctrl + Clic Gauche + Glisser 
 pageProperties=Propriétés de la page
+textLanguage=Langue du texte
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/views/BasesView.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/views/BasesView.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/views/BasesView.java	(revision 3628)
@@ -89,6 +89,9 @@
 	 * Refresh.
 	 */
 	public static void refresh() {
+		
+		if (!PlatformUI.isWorkbenchRunning()) return;
+		
 		BasesView baseView = (BasesView) PlatformUI.getWorkbench()
 				.getActiveWorkbenchWindow().getActivePage().findView(
 						BasesView.ID);
@@ -100,6 +103,9 @@
 	 * Reload.
 	 */
 	public static void reload() {
+		
+		if (!PlatformUI.isWorkbenchRunning()) return;
+		
 		BasesView baseView = (BasesView) PlatformUI.getWorkbench()
 				.getActiveWorkbenchWindow().getActivePage().findView(
 						BasesView.ID);
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/views/QueriesView.java	(revision 3628)
@@ -119,6 +119,9 @@
 	 * Reload.
 	 */
 	public static void reload() {
+		
+		if (!PlatformUI.isWorkbenchRunning()) return;
+		
 		QueriesView baseView = (QueriesView) PlatformUI.getWorkbench()
 		.getActiveWorkbenchWindow().getActivePage().findView(
 				QueriesView.ID);
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/views/fileexplorer/MacroExplorer.java	(revision 3628)
@@ -131,6 +131,9 @@
 	 * Refresh.
 	 */
 	public static void refresh() {
+		
+		if (!PlatformUI.isWorkbenchRunning()) return;
+		
 		MacroExplorer explorerView = (MacroExplorer) PlatformUI.getWorkbench()
 				.getActiveWorkbenchWindow().getActivePage().findView(
 						MacroExplorer.ID);
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/CorporaView.java	(revision 3628)
@@ -148,6 +148,8 @@
 	 */
 	public static CorporaView getInstance() {
 		if (self == null) {
+			if (!PlatformUI.isWorkbenchRunning()) return null;
+			
 			IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 			if (window == null) return null;
 			IWorkbenchPage page = window.getActivePage();
@@ -617,6 +619,9 @@
 	 * @param arrayList
 	 */
 	public static void select(List<?> arrayList) {
+		
+		if (!PlatformUI.isWorkbenchRunning()) return;
+		
 		CorporaView corporaView = openView();
 		if (corporaView != null) {
 			StructuredSelection selection = new StructuredSelection(arrayList);
@@ -633,6 +638,8 @@
 	public static CorporaView openView() {
 		// open Unit View if not opened
 		try {
+			if (!PlatformUI.isWorkbenchRunning()) return null;
+			
 			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 			CorporaView view = (CorporaView) page.findView(CorporaView.ID);
 			if (view == null) {
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/utils/JobHandler.java	(revision 3628)
@@ -37,6 +37,7 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.internal.progress.ProgressManagerUtil;
 import org.eclipse.ui.texteditor.ISchedulingRuleProvider;
+import org.txm.rcp.Application;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.utils.logger.Log;
@@ -202,7 +203,11 @@
 	 *            the runable
 	 */
 	public void syncExec(Runnable runable) {
-		Display.getDefault().syncExec(runable);
+		if (Display.getDefault() != null && !Application.isHeadLess()) {
+			Display.getDefault().syncExec(runable);
+		} else {
+			runable.run();
+		}
 	}
 	
 	public void startJob() {
@@ -216,7 +221,7 @@
 		// if (modal) { // this will deadlock the job if the jobs needs to work on the RCP workspace files
 		// this.setRule(org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot());// set modal job
 		// }
-		this.setUser(true);// show popup
+		this.setUser(modal);// show popup
 		this.schedule();// start
 	}
 	
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/utils/SWTEditorsUtils.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/utils/SWTEditorsUtils.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/utils/SWTEditorsUtils.java	(revision 3628)
@@ -70,7 +70,7 @@
 						for (int i = 0; i < txmMultipageEditor.getEditors().size(); i++) {
 							if (txmMultipageEditor.getEditors().get(i) instanceof ITXMResultEditor) {
 								ITXMResultEditor txmEditor = ((ITXMResultEditor) txmMultipageEditor.getEditors().get(i));
-								ArrayList eds = tmpEditors.get(txmEditor.getResult());
+								ArrayList<ITXMResultEditor<TXMResult>> eds = tmpEditors.get(txmEditor.getResult());
 								if (eds == null) {
 									eds = new ArrayList<>();
 									tmpEditors.put(txmEditor.getResult(), eds);
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/preferences/RCPPreferences.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/preferences/RCPPreferences.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/preferences/RCPPreferences.java	(revision 3628)
@@ -102,7 +102,7 @@
 		preferences.putBoolean(CGU, false);
 		
 		preferences.putInt(NO_SESSION, 1);
-		preferences.putInt(MAX_NUMBER_OF_COLUMNS, 50);
+		preferences.putInt(MAX_NUMBER_OF_COLUMNS, 100);
 	}
 	
 	/**
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenLocalizedWebPage.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenLocalizedWebPage.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenLocalizedWebPage.java	(revision 3628)
@@ -44,9 +44,8 @@
 import org.txm.rcp.Activator;
 import org.txm.utils.logger.Log;
 
-// TODO: Auto-generated Javadoc
 /**
- * Open the internal browser of TXM with a file
+ * Replace a TXM URL with an accessible one and right language
  * 
  * @author mdecorde.
  */
@@ -288,7 +287,6 @@
 	}
 	
 	public static void main(String args[]) {
-		String s = getValidURL("https://txm.gitpages.huma-num.fr/textometrie/files/software/TXM/0.8.2beta/", "https://txm.gitpages.huma-num.fr/textometrie/files/software/TXM/0.8.2beta"); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(s);
+		
 	}
 }
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/RecoverCorporaFromInstalls.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/RecoverCorporaFromInstalls.java	(revision 0)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/RecoverCorporaFromInstalls.java	(revision 3628)
@@ -0,0 +1,240 @@
+package org.txm.rcp.commands;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.dialogs.ListSelectionDialog;
+import org.osgi.framework.Version;
+import org.txm.Toolbox;
+import org.txm.rcp.Activator;
+import org.txm.rcp.commands.workspace.LoadBinaryCorporaDirectory;
+import org.txm.rcp.messages.TXMUIMessages;
+import org.txm.rcp.utils.JobHandler;
+import org.txm.utils.DeleteDir;
+import org.txm.utils.io.IOUtils;
+import org.txm.utils.logger.Log;
+
+public class RecoverCorporaFromInstalls extends AbstractHandler {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		JobHandler job = new JobHandler("Recovering corpora") {
+
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				try {
+					restore(false);
+				} catch (Exception e) {
+					e.printStackTrace();
+					return org.eclipse.core.runtime.Status.CANCEL_STATUS;
+				}
+
+				return org.eclipse.core.runtime.Status.OK_STATUS;
+			}
+		};
+
+		job.schedule();
+		return job;
+	}
+
+	public static void restore(boolean currentTXM) throws IllegalStateException, IOException {
+
+		String installdirpath = Toolbox.getInstallDirectory();
+		File sampleCorporaDirectory = new File(installdirpath, "samples"); //$NON-NLS-1$
+
+		File txmhomedir = Platform.getLocation().toFile().getCanonicalFile();
+		txmhomedir.mkdirs(); // creates the directory if needed
+
+		File corporaDir = new File(txmhomedir, "corpora"); //$NON-NLS-1$
+
+		String previousVersions[] = { "0.8.2", "0.8.1", "0.8.0", "0.7.9" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		String previousVersionLabels[] = new String[previousVersions.length];
+		File previousVersionCorporaDirectories[] = new File[previousVersions.length];
+
+		for (int i = 0; i < previousVersions.length; i++) {
+			String v = previousVersions[i];
+
+			previousVersionLabels[i] = TXMUIMessages.bind(TXMUIMessages.corporaOfPreviousTXMP0, v);
+
+			File dir = new File(System.getProperty("user.home"), "TXM-" + v + "/corpora"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			if ("0.7.9".equals(v)) { //$NON-NLS-1$
+				dir = new File(System.getProperty("user.home"), "TXM/corpora"); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			previousVersionCorporaDirectories[i] = dir;
+		}
+
+		Version v = Activator.getDefault().getBundle().getVersion();
+		String vv = v.getMajor() + "." + v.getMinor() + "." + v.getMicro(); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
+		String SAMPLES = "1. " + TXMUIMessages.bind(TXMUIMessages.sampleCorporaOfCurrentTXMP0, vv); //$NON-NLS-1$
+		int n = 2;
+		String vCURRENT = "2. " + TXMUIMessages.bind(TXMUIMessages.corporaOfPreviousTXMP0, vv); //$NON-NLS-1$
+
+
+		final ArrayList<Object> selectedCorporaDirs = new ArrayList<>();
+		final ArrayList<Object> initialSelectionCorporaDirs = new ArrayList<>();
+
+		selectedCorporaDirs.add(SAMPLES);
+		initialSelectionCorporaDirs.add(SAMPLES);
+
+		if (currentTXM && corporaDir.exists() && corporaDir.listFiles(IOUtils.HIDDENFILE_FILTER).length > 0) {
+			selectedCorporaDirs.add(vCURRENT);
+			initialSelectionCorporaDirs.add(vCURRENT);
+			n++;
+		}
+
+		for (int i = 0; i < previousVersions.length; i++) {
+			if (previousVersionCorporaDirectories[i].exists()
+					&& previousVersionCorporaDirectories[i].listFiles(IOUtils.HIDDENFILE_FILTER).length > 0) {
+				previousVersionLabels[i] = "" + (n++) + ". " + previousVersionLabels[i];
+				selectedCorporaDirs.add(previousVersionLabels[i]); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+		}
+
+		String OTHER = "" + (n++) + ". " + TXMUIMessages.selectAnotherTXMCorporaToRestore; //$NON-NLS-1$ //$NON-NLS-2$
+		selectedCorporaDirs.add(OTHER);
+
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				Display display = Display.getDefault();
+				Shell shell = display.getActiveShell();
+
+				ListSelectionDialog dialog = ListSelectionDialog.of(selectedCorporaDirs)
+						.contentProvider(new ArrayContentProvider())
+						.labelProvider(new LabelProvider())
+						.message(TXMUIMessages.corporaWillBeRestoredInTheFollowingOrderCorporaAlreadyRestoredWillNotBeReplaced)
+						.title(TXMUIMessages.selectThecorporaSetsToRestore)
+						.create(shell);
+
+				dialog.setTitle(TXMUIMessages.selectThecorporaSetsToRestore);
+				dialog.setInitialElementSelections(initialSelectionCorporaDirs);
+				if (dialog.open() == ListSelectionDialog.OK) {
+					selectedCorporaDirs.clear();
+					List<Object> selection = Arrays.asList(dialog.getResult());
+					selectedCorporaDirs.addAll(selection);
+				}
+				else {
+					selectedCorporaDirs.clear();
+				}
+			}
+		});
+
+		// move the previous TXM 0.8.3 corpora
+		File backupDir = new File(corporaDir.getAbsolutePath() + "-previous"); //$NON-NLS-1$
+		if (currentTXM) {
+			if (corporaDir.exists()) {
+				backupDir.mkdirs();
+				for (File dir : corporaDir.listFiles(IOUtils.HIDDENFILE_FILTER)) {
+					File bdir = new File(backupDir, dir.getName());
+					DeleteDir.deleteDirectory(bdir);
+					dir.renameTo(bdir);
+				}
+			}
+
+			corporaDir.mkdir();
+		}
+
+		// load TXM-0.8.3 sample corpora (from the install directory)
+		if (selectedCorporaDirs.contains(SAMPLES) && sampleCorporaDirectory.exists()) {
+
+			Log.info(TXMUIMessages.installingSampleCorpus);
+
+			JobHandler job = LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(sampleCorporaDirectory, false, true, false);
+			try {
+				job.join();
+			}
+			catch (InterruptedException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+
+		// TXM-CURRENT previous installation corpora
+		if (currentTXM && selectedCorporaDirs.contains(vCURRENT) && backupDir.listFiles(IOUtils.HIDDENFILE_FILTER).length > 0) { // not a new install, restore corpus from the corpora-previous directory
+			Log.info(NLS.bind(TXMUIMessages.installingPreviousCorpusFromP0, vv, corporaDir));
+			JobHandler job = LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(backupDir, false, false, true);
+			try {
+				job.join();
+			}
+			catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+		}
+
+		for (int i = 0; i < previousVersions.length; i++) {
+			if (selectedCorporaDirs.contains(previousVersionLabels[i])) {
+
+				Log.info(NLS.bind(TXMUIMessages.installingPreviousCorpusFromP0, previousVersions[i], previousVersionCorporaDirectories[i]));
+
+				JobHandler job = LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(previousVersionCorporaDirectories[i], false, false, true);
+				try {
+					job.join();
+				}
+				catch (InterruptedException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+
+		// recovery from an other corpora directory to select by the user
+		if (selectedCorporaDirs.contains(OTHER)) { // new installation (empty corpora directory)
+			final HashMap<String, String> bindings = new HashMap<>();
+			Display.getDefault().syncExec(new Runnable() {
+
+				@Override
+				public void run() {
+					Display display = Display.getDefault();
+					Shell shell = display.getActiveShell();
+					DirectoryDialog dialog = new DirectoryDialog(shell);
+					String path = dialog.open();
+					if (path == null) return;
+
+					bindings.put("path", path); //$NON-NLS-1$
+				}
+			});
+			if (bindings.containsKey("path")) { //$NON-NLS-1$
+				File dir = new File(bindings.get("path")); //$NON-NLS-1$
+				if (!dir.equals(corporaDir)) {
+					Log.info(NLS.bind(TXMUIMessages.restoringCorporaFromTheP0Directory, dir));
+					JobHandler job = LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(dir, true, true, true);
+					try {
+						job.join();
+					}
+					catch (InterruptedException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+
+		Display.getDefault().syncExec(new Runnable() {
+
+			@Override
+			public void run() {
+				RestartTXM.reloadViews();
+			}
+		});	
+	}
+}

Property changes on: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/RecoverCorporaFromInstalls.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/ChangeTXMWorkspace.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/ChangeTXMWorkspace.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/ChangeTXMWorkspace.java	(revision 3628)
@@ -94,7 +94,7 @@
 				return Status.OK_STATUS;
 			}
 		};
-		jobhandler.startJob();
+		jobhandler.startJob(false);
 		return event;
 	}
 
@@ -103,7 +103,7 @@
 			defaultValue = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile().getAbsolutePath();
 		}
 		ChooseWorkspaceData launchData = new ChooseWorkspaceData(defaultValue);
-		DirectoryDialog dialog = new DirectoryDialog(Display.getCurrent().getActiveShell());
+		DirectoryDialog dialog = new DirectoryDialog(Display.getDefault().getActiveShell());
 		dialog.setText(TXMUIMessages.selectWorkingDirectory);
 		dialog.setMessage(TXMUIMessages.ThisWillRestartTXM);
 		dialog.setFilterPath(defaultValue);
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportClipboardText.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportClipboardText.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/ImportClipboardText.java	(revision 3628)
@@ -33,6 +33,7 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Locale;
 
 import org.eclipse.core.commands.AbstractHandler;
@@ -40,6 +41,8 @@
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.Toolbox;
@@ -49,11 +52,13 @@
 import org.txm.objects.Workspace;
 import org.txm.rcp.handlers.scripts.ExecuteImportScript;
 import org.txm.rcp.messages.TXMUIMessages;
+import org.txm.rcp.swt.dialog.ComboDialog;
 import org.txm.rcp.swt.dialog.TextDialog;
 import org.txm.searchengine.cqp.ReferencePattern;
 import org.txm.searchengine.cqp.corpus.CorpusManager;
 import org.txm.treetagger.core.preferences.TreeTaggerPreferences;
 import org.txm.utils.LangDetector;
+import org.txm.utils.logger.Log;
 
 /**
  * Import the text in the Clipboard as a corpus. The loader used is the QuickLoader.
@@ -74,17 +79,25 @@
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		String result = org.txm.rcp.utils.IOClipboard.read();
+		
 		if (result == null || result.length() == 0) {
-			System.out.println(TXMUIMessages.NoCopiedTextAborting);
+			MessageDialog.openError(Display.getDefault().getActiveShell(), TXMUIMessages.error, TXMUIMessages.clipboardIsEmpty);
 			return null;
 		}
-		System.out.println(TXMUIMessages.importClipboardText);
+		
+		result = result.trim();
+		if (result.length() == 0) {
+			MessageDialog.openError(HandlerUtil.getActiveShell(event), TXMUIMessages.error, TXMUIMessages.clipboardIsEmpty);
+			return null;
+		}
+		
+		Log.info(TXMUIMessages.importClipboardText);
 
 		try {
 			String corpusName = TXMUIMessages.clipboard_2.toUpperCase()+(nextclipcorpus++);
 			File wl = Toolbox.workspace.getLocation();
 			if (wl == null) {
-				System.err.println("Error: Toolbox is not correctly initialized. Clipboard import aborted."); //$NON-NLS-1$
+				Log.warning("Error: Toolbox is not correctly initialized. Clipboard import aborted."); //$NON-NLS-1$
 				return null;
 			}
 			while (new File(wl, corpusName).exists()) {
@@ -93,10 +106,12 @@
 			
 			String lang = TBXPreferences.getInstance().getString(TBXPreferences.CLIPBOARD_IMPORT_DEFAULT_LANG);
 			boolean askLang = TBXPreferences.getInstance().getBoolean(TBXPreferences.CLIPBOARD_IMPORT_ASK_LANG);
-			TextDialog dialog = new TextDialog(HandlerUtil.getActiveShell(event), TXMUIMessages.SelectTheImportLanguageToUse, TXMUIMessages.WhatLanguageMustBeUsedToImportTheClipboardContent, lang);
+			List<String> langs = Arrays.asList("fr", "en");
+			//ComboDialog dialog = new ComboDialog(HandlerUtil.getActiveShell(event), TXMUIMessages.SelectTheImportLanguageToUse, TXMUIMessages.WhatLanguageMustBeUsedToImportTheClipboardContent, lang);
+			ComboDialog dialog = new ComboDialog(HandlerUtil.getActiveShell(event), TXMUIMessages.textLanguage, langs, lang, SWT.SINGLE);
 			if (askLang) {
 				if (dialog.open() == TextDialog.CANCEL) return null;
-				lang = dialog.getText();
+				lang = dialog.getSelectedValue();
 			}
 			importText(result, corpusName, lang);
 			
@@ -117,8 +132,9 @@
 	 */
 	public static Object importText(String text, String corpusname, String lang) throws Exception {
 		corpusname = corpusname.toUpperCase();
+		text = text.trim();
 		if (text.length() == 0) {
-			System.err.println(TXMUIMessages.clipboardIsEmpty);
+			Log.warning(TXMUIMessages.clipboardIsEmpty);
 			return null;
 		}
 		String txmhome = Toolbox.getTxmHomePath();
@@ -164,10 +180,10 @@
 		if ("??".equals(lang)) { //$NON-NLS-1$
 			LangDetector detector = new LangDetector(quicksrc);
 			lang = detector.getLang();
-			System.out.println(TXMCoreMessages.bind(TXMUIMessages.identifiedLanguage, lang));
+			Log.info(TXMCoreMessages.bind(TXMUIMessages.identifiedLanguage, lang));
 		}
 		project.setLang(lang); //$NON-NLS-1$
-		System.out.println(TXMCoreMessages.bind(TXMUIMessages.usingLanguage, project.getLang()));
+		Log.info(TXMCoreMessages.bind(TXMUIMessages.usingLanguage, project.getLang()));
 		
 		String ttpath = TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.INSTALL_PATH);
 		
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/PrintHexacode.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/PrintHexacode.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/editor/PrintHexacode.java	(revision 3628)
@@ -29,8 +29,6 @@
 
 import java.math.BigInteger;
 
-import javax.xml.bind.DatatypeConverter;
-
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/RestartTXM.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/RestartTXM.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/RestartTXM.java	(revision 3628)
@@ -35,6 +35,7 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.osgi.util.NLS;
+import org.eclipse.ui.PlatformUI;
 import org.txm.Toolbox;
 import org.txm.rcp.JobsTimer;
 import org.txm.rcp.messages.TXMUIMessages;
@@ -108,6 +109,9 @@
 	}
 	
 	public static void reloadViews() {
+		
+		if (!PlatformUI.isWorkbenchRunning()) return;
+		
 		// System.out.println(Messages.RestartTXM_0);
 		// TODO TXM views must have been registered to be reloaded
 		
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorporaDirectory.java	(revision 3628)
@@ -54,6 +54,7 @@
 import org.txm.core.engines.EngineType;
 import org.txm.core.messages.TXMCoreMessages;
 import org.txm.objects.Project;
+import org.txm.objects.Workspace;
 import org.txm.rcp.IImageKeys;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.commands.RestartTXM;
@@ -158,7 +159,7 @@
 							@Override
 							public void run() {
 								
-								ArrayList<Project> tmp = loadBinaryCorpusFromCorporaDirectory(files, self, monitor, replace);
+								ArrayList<Project> tmp = loadBinaryCorpusFromCorporaDirectory(files, self, monitor, replace, directory.getAbsolutePath());
 								if (tmp != null) {
 									newProjects.addAll(tmp);
 								}
@@ -168,7 +169,7 @@
 					}
 					else { // try loading corpora and dont replace existing corpus
 						List<File> files = Arrays.asList(getBinaryCorpusFiles(directory, loadDirectories));
-						ArrayList<Project> tmp = loadBinaryCorpusFromCorporaDirectory(files, this, monitor, replace);
+						ArrayList<Project> tmp = loadBinaryCorpusFromCorporaDirectory(files, this, monitor, replace, directory.getAbsolutePath());
 						if (tmp != null) {
 							newProjects.addAll(tmp);
 						}
@@ -336,7 +337,7 @@
 	 */
 	protected static ArrayList<Project> loadBinaryCorpusFromCorporaDirectory(File directory, JobHandler job, IProgressMonitor monitor, boolean replace) {
 		File[] files = directory.listFiles(IOUtils.HIDDENFILE_FILTER);
-		return loadBinaryCorpusFromCorporaDirectory(Arrays.asList(files), job, monitor, replace);
+		return loadBinaryCorpusFromCorporaDirectory(Arrays.asList(files), job, monitor, replace, directory.getAbsolutePath());
 	}
 
 	/**
@@ -349,7 +350,7 @@
 	 * @param loadDirectories
 	 * @return the loaded projects
 	 */
-	protected static ArrayList<Project> loadBinaryCorpusFromCorporaDirectory(List<File> corporaFiles, JobHandler job, IProgressMonitor monitor, boolean replace) {
+	protected static ArrayList<Project> loadBinaryCorpusFromCorporaDirectory(List<File> corporaFiles, JobHandler job, IProgressMonitor monitor, boolean replace, String sourceName) {
 
 		ArrayList<Project> projects = new ArrayList<>();
 
@@ -360,13 +361,20 @@
 			// engine.stop();
 			// }
 
-			monitor.beginTask(TXMUIMessages.loadingBinaryCorpus, 100);
+			if (sourceName.matches(".+/TXM-.\\..\\../corpora")) {
+				sourceName = "TXM"+sourceName.substring(sourceName.length()-14, sourceName.length()-8);
+			}
+			monitor.beginTask(TXMUIMessages.loadingBinaryCorpus +" "+sourceName+" ("+corporaFiles.size()+").", corporaFiles.size());
 			// job.acquireSemaphore();
 			// Toolbox.getEngineManager(EngineType.SEARCH).stopEngines();
 			// job.releaseSemaphore();
 
-			monitor.subTask(TXMUIMessages.loadingTheCorpusInThePlatform);
+			
+			int n = 0;
 			for (File corpusDirectory : corporaFiles) {
+				n++;
+				monitor.subTask(TXMUIMessages.loadingTheCorpusInThePlatform+": \n"+corpusDirectory.getName()+" ("+n+"/"+corporaFiles.size()+").");
+				monitor.worked(1);
 				try {
 					if (corpusDirectory.isHidden()) {
 						continue;
@@ -380,7 +388,11 @@
 					}
 
 					if (corpusDirectory.isDirectory()) {
-						project = LoadBinaryCorpus.loadBinaryCorpusAsDirectory(corpusDirectory, monitor, replace);
+						if (Workspace.isCorpusBinarydirectoryValid(corpusDirectory)) {
+							project = LoadBinaryCorpus.loadBinaryCorpusAsDirectory(corpusDirectory, monitor, replace);
+						} else {
+							Log.fine("Skip recovering of corpus: "+corpusDirectory);
+						}
 					}
 					else {
 						project = LoadBinaryCorpus.loadBinaryCorpusArchive(corpusDirectory, job, monitor, replace);
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/commands/workspace/LoadBinaryCorpus.java	(revision 3628)
@@ -306,7 +306,6 @@
 	public static Project loadBinaryCorpusAsDirectory(File corpusDirectory, IProgressMonitor monitor, boolean replace) throws Exception {
 		if (!(corpusDirectory.exists() && corpusDirectory.isDirectory())) {
 			Log.warning(NLS.bind(TXMUIMessages.failedToLoadCorpusP0, corpusDirectory.getAbsolutePath()));
-			System.out.println(NLS.bind(TXMUIMessages.failedToLoadCorpusP0, corpusDirectory.getAbsolutePath()));
 			return null;
 		}
 		
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchWindowAdvisor.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchWindowAdvisor.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchWindowAdvisor.java	(revision 3628)
@@ -87,7 +87,7 @@
 		configurer.setShowMenuBar(true);
 		configurer.setShowCoolBar(true);
 		configurer.setShowStatusLine(true);
-		configurer.setShowFastViewBars(false);
+		//configurer.setShowFastViewBars(false);
 		configurer.setShowProgressIndicator(true);
 		configurer.setShowPerspectiveBar(true);
 		configurer.setTitle(TXMUIMessages.tXM);
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/IImageKeys.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/IImageKeys.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/IImageKeys.java	(revision 3628)
@@ -306,7 +306,7 @@
 	 * @param imageFilePath
 	 * @return
 	 */
-	public static ImageDescriptor getImageDescriptor(Class classOfPlugin, String imageFilePath) {
+	public static ImageDescriptor getImageDescriptor(Class<?> classOfPlugin, String imageFilePath) {
 		return getImageDescriptor(FrameworkUtil.getBundle(classOfPlugin).getSymbolicName(), imageFilePath);
 	}
 	
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/imports/sections/LangSection.java	(revision 3628)
@@ -72,7 +72,7 @@
 		sectionClient.setLayout(slayout);
 		this.section.setClient(sectionClient);
 		
-		Label l = toolkit.createLabel(sectionClient, "Language/Langue"); //$NON-NLS-1$
+		Label l = toolkit.createLabel(sectionClient, TXMUIMessages.textLanguage); //$NON-NLS-1$
 		TableWrapData gdata = getTextGridData();
 		gdata.colspan = 2;
 		l.setLayoutData(gdata);
@@ -103,33 +103,13 @@
 			public void widgetSelected(SelectionEvent e) {
 				btnSelectLang.setSelection(true);
 				btnGuessLang.setSelection(false);
-				// btnDefaultLang.setSelection(false);
 			}
 		});
 		
-		String locale = Locale.getDefault().getLanguage().toLowerCase();
-		int langToSelectIndex = -1;
-		int added = 0;
-		String modelsDir = TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.MODELS_PATH);
-		File files[] = new File(modelsDir).listFiles(IOUtils.HIDDENFILE_FILTER);
-		if (files != null && files.length > 0) {
-			for (File model : files) {
-				if (!model.getName().endsWith(".par")) continue; //$NON-NLS-1$
-				String lang = FileUtils.stripExtension(model);
-				langcombo.add(lang);
-				if (locale.equals(lang)) {
-					langToSelectIndex = added;
-				}
-				added++;
-			}
-		}
-		if (added == 0) {
-			String[] langs = { "bg", "cat", "zh", "cop", "cs", "dk", "nl", "en", "ee", "fi ", "fr", "gl", "gr", "de", "ne", "it", "kr", "lat", "mn", "pl", "pt", "ro", "ru", "sk", "sl", "es", "tz" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ //$NON-NLS-15$ //$NON-NLS-16$ //$NON-NLS-17$ //$NON-NLS-18$ //$NON-NLS-19$ //$NON-NLS-20$ //$NON-NLS-21$ //$NON-NLS-22$ //$NON-NLS-23$ //$NON-NLS-24$ //$NON-NLS-25$ //$NON-NLS-26$ //$NON-NLS-27$
-			Arrays.sort(langs);
-			langToSelectIndex = Arrays.binarySearch(langs, locale);
-			langcombo.setItems(langs);
-		}
-		
+		String locale = Locale.getDefault().getLanguage().toLowerCase(); // default lang
+		String[] langs = getAvailableLangs(); // get available langs from treetagger models if any
+		int langToSelectIndex = Arrays.binarySearch(langs, locale);
+		langcombo.setItems(langs);
 		if (langToSelectIndex >= 0) {
 			langcombo.select(langToSelectIndex);
 		}
@@ -162,6 +142,30 @@
 		
 	}
 	
+	public static String[] getAvailableLangs() {
+		
+		ArrayList<String> langList = new ArrayList<String>();
+		
+		String modelsDir = TreeTaggerPreferences.getInstance().getString(TreeTaggerPreferences.MODELS_PATH);
+		File files[] = new File(modelsDir).listFiles(IOUtils.HIDDENFILE_FILTER);
+		if (files != null && files.length > 0) {
+			for (File model : files) {
+				if (!model.getName().endsWith(".par")) continue; //$NON-NLS-1$
+				String lang = FileUtils.stripExtension(model);
+				langList.add(lang);
+			}
+		}
+		
+		if (langList.size() > 0) {
+			return langList.toArray(new String[langList.size()]);
+		} else {
+		
+			String[] tmp = { "bg", "cat", "zh", "cop", "cs", "dk", "nl", "en", "ee", "fi ", "fr", "gl", "gr", "de", "ne", "it", "kr", "lat", "mn", "pl", "pt", "ro", "ru", "sk", "sl", "es", "tz" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ //$NON-NLS-15$ //$NON-NLS-16$ //$NON-NLS-17$ //$NON-NLS-18$ //$NON-NLS-19$ //$NON-NLS-20$ //$NON-NLS-21$ //$NON-NLS-22$ //$NON-NLS-23$ //$NON-NLS-24$ //$NON-NLS-25$ //$NON-NLS-26$ //$NON-NLS-27$
+			Arrays.sort(tmp);
+			return tmp;
+		}
+	}
+	
 	@Override
 	public void updateFields(Project project) {
 		if (this.section.isDisposed()) return;
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java	(revision 3628)
@@ -124,6 +124,11 @@
 	 */
 	public final static String TOP_TOOLBAR_COMPUTE_BUTTON_ID = "compute"; //$NON-NLS-1$
 	
+	/**
+	 * ID defined in plugin.xml for the compute button contribution.
+	 */
+	public final static String TOP_TOOLBAR_REVERT_BUTTON_ID = "revert"; //$NON-NLS-1$
+	
 	public static final int MAX_NAME_LENGTH = 40;
 	
 	public static final int NMAXLINESTOTEST = 30;
@@ -175,6 +180,11 @@
 	protected ToolItem computeButton;
 	
 	/**
+	 * Revert tool item button.
+	 */
+	protected ToolItem revertButton;
+	
+	/**
 	 * To keep track of the parameters used for the last computing and updates only the widgets if a parameter has changed.
 	 */
 	// FIXME: SJ: useless?
@@ -270,7 +280,7 @@
 			
 			for (IConfigurationElement e : config) {
 				try {
-					Log.finer(" " + e.getName() + " from " + e.getContributor().getName()); //$NON-NLS-1$ //$NON-NLS-2$
+					Log.finest(" " + e.getName() + " from " + e.getContributor().getName()); //$NON-NLS-1$ //$NON-NLS-2$
 					final Object o = e.createExecutableExtension("class"); //$NON-NLS-1$
 					if (o instanceof TXMEditorExtension) {
 						ISafeRunnable runnable = new ISafeRunnable() {
@@ -443,6 +453,9 @@
 			// store the Compute button to access if later, especially from subclasses
 			this.computeButton = this.topToolBar.getItemByContributionId(TOP_TOOLBAR_COMPUTE_BUTTON_ID);
 			
+			// store the Compute button to access if later, especially from subclasses
+			this.revertButton = this.topToolBar.getItemByContributionId(TOP_TOOLBAR_REVERT_BUTTON_ID);
+			
 			// this.computeButton = new ToolItem(topToolBar, SWT.PUSH);//.topToolBar.getItemByContributionId(TOP_TOOLBAR_COMPUTE_BUTTON_ID);
 			// this.computeButton.setImage(IImageKeys.getImage(IImageKeys.START));
 			// this.computeButton.addSelectionListener(new ComputeSelectionListener(this, true));
@@ -1018,10 +1031,6 @@
 						Log.fine("TXMEditor.compute(): " + TXMEditor.this.getClass().getSimpleName() + ": computing failed."); //$NON-NLS-1$ //$NON-NLS-2$
 					}
 					
-					
-					
-					
-					
 					notifyExtensions("notifyEndOfCompute"); //$NON-NLS-1$
 					
 					// monitor.worked(50);
@@ -2071,6 +2080,15 @@
 	}
 	
 	/**
+	 * Gets the Compute Tool item button.
+	 * 
+	 * @return the computeButton
+	 */
+	protected ToolItem getRevertButton() {
+		return revertButton;
+	}
+	
+	/**
 	 * Removes the Compute Tool item button.
 	 */
 	protected void removeComputeButton() {
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableLinesViewerComparator.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableLinesViewerComparator.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/editors/TableLinesViewerComparator.java	(revision 3628)
@@ -30,14 +30,14 @@
 // The class TableResult or MatrixResult should define a method sort(int columnIndex), abstract or not
 public class TableLinesViewerComparator extends ViewerComparator {
 
-	
+
 	public static final int DESCENDING = 1;
-	
+
 	/**
 	 * Last column index.
 	 */
 	protected int lastColumnIndex = 0;
-	
+
 	/**
 	 * Current direction.
 	 */
@@ -47,12 +47,12 @@
 	 * Collator to use for Strings comparison.
 	 */
 	protected Collator collator;
-	
+
 	/**
 	 * If true all the viewer columns will be packed after a sort.
 	 */
 	protected boolean autoPackColumns;
-	
+
 	/**
 	 * 
 	 * @param collator
@@ -60,7 +60,7 @@
 	public TableLinesViewerComparator(Collator collator) {
 		this(collator, true);
 	}
-	
+
 	/**
 	 * 
 	 * @param collator
@@ -72,22 +72,26 @@
 		this.lastColumnIndex = 0;
 		this.direction = 0;
 	}
-	
 
+
 	@Override
 	public int compare(Viewer viewer, Object e1, Object e2) {
-		
+
 		int result = 0;
 
 		Object cell1 = e1;
 		Object cell2 = e2;
 
-		
-		if(e1 instanceof List)	{
+		if (e1 instanceof List)	{
 			cell1 = ((List)e1).get(this.lastColumnIndex);
 			cell2 = ((List)e2).get(this.lastColumnIndex);
 		}
-		
+
+		if (e1 instanceof Object[])	{
+			cell1 = ((Object[])e1)[this.lastColumnIndex];
+			cell2 = ((Object[])e2)[this.lastColumnIndex];
+		}
+
 		if (Integer.class.isInstance(cell1))	{
 			result = ((Integer)cell1).compareTo(((Integer)cell2));
 		}
@@ -109,8 +113,8 @@
 		else if (Date.class.isInstance(cell1))	{
 			result = ((Date)cell1).compareTo(((Date)cell2));
 		}
-		
-		
+
+
 		// reverse if needed
 		if (this.direction == DESCENDING) {
 			result = -result;
@@ -118,7 +122,7 @@
 		return result;
 	}
 
-	
+
 	/**
 	 * 
 	 * @return
@@ -131,7 +135,7 @@
 	 * 
 	 * @param column
 	 */
-	public void setColumn(int column) {
+	protected void setColumn(int column) {
 		if (column == this.lastColumnIndex) {
 			// same column as last, toggle sorting direction
 			this.direction = 1 - this.direction;
@@ -154,18 +158,23 @@
 		column.addSelectionListener(new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				
-				setColumn(index);
-				
-				viewer.getTable().setSortDirection(getDirection());
-				viewer.getTable().setSortColumn(column);
-				
-				if (autoPackColumns)	{
-					TXMEditor.packColumns(viewer);
+
+				if ((e.stateMask & SWT.SHIFT) != 0) {
+					
+
+				} else {
+					setColumn(index);
+
+					viewer.getTable().setSortDirection(getDirection());
+					viewer.getTable().setSortColumn(column);
+
+					if (autoPackColumns)	{
+						TXMEditor.packColumns(viewer);
+					}
+					else	{
+						viewer.refresh();
+					}
 				}
-				else	{
-					viewer.refresh();
-				}
 			}
 		});
 	}
@@ -178,14 +187,14 @@
 	 */
 	// FIXME: SJ: not used at this time but could be useful?
 	public void addSelectionAdapters(final TableViewer viewer, int startingColIndex, int endingColIndex) {
-		
+
 		Table table = viewer.getTable();
-		
+
 		for (int i = startingColIndex; i < endingColIndex; i++) {
 			this.addSelectionAdapter(viewer, table.getColumn(i), i);
 		}
 	}
-	
+
 	/**
 	 * Adds some selection adapters to all columns that have a non empty header label.
 	 * @param viewer
@@ -199,14 +208,14 @@
 			}
 		}
 	}
-	
 
+
 	/**
 	 * @param direction the direction to set
 	 */
 	public void setDirection(int direction) {
 		this.direction = direction;
 	}
-	
 
+
 }
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/splashHandlers/TXMSplashHandler.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/splashHandlers/TXMSplashHandler.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/splashHandlers/TXMSplashHandler.java	(revision 3628)
@@ -90,50 +90,50 @@
 		
 		
 		
-		// here you could check some condition on which decoration to show
-		
-		version = "TXM "+ApplicationWorkbenchAdvisor.getTXMVersion(); //$NON-NLS-1$
-		
-		String build_date =  ApplicationWorkbenchAdvisor.getBuildDate(ApplicationWorkbenchAdvisor.getBuildVersion());
-		
-		String txm_date = ApplicationWorkbenchAdvisor.getUpdateDate();
-		
-		level = ApplicationWorkbenchAdvisor.getVersionLevel().toUpperCase();
-		
-		greenTXM = new Color(splash.getDisplay(), 109,139,0);
-		redTXM = new Color(splash.getDisplay(), 255,0,0);
-		font = new Font(splash.getDisplay(), "Arial", 17, SWT.BOLD); //$NON-NLS-1$
-		
-		if (txm_date.equals(build_date)) {
-			infos = build_date;
-		}
-		else {
-			infos = "update " + txm_date + " - build " + build_date; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		
-		if ("STABLE".equals(level)) { //$NON-NLS-1$
-			level = null;
-		}
-		
-		getContent().addPaintListener(new PaintListener() {
-			
-			@Override
-			public void paintControl(PaintEvent e) {
-				e.gc.setFont(font);
-				e.gc.setForeground(greenTXM);
-				Point textSize2 = e.gc.textExtent(version);
-				e.gc.drawString(version, (int) (316 - textSize2.x - (BORDER*1.5)), 230, true);
-				
-				Point textSize = e.gc.textExtent(infos);
-				e.gc.drawString(infos, (int) (316 - textSize.x - (BORDER*1.5)), 233 + textSize2.y, true);
-				
-				if (level != null) {
-					e.gc.setForeground(redTXM);
-					textSize = e.gc.textExtent(level);
-					e.gc.drawString(level, (int) (316 - textSize.x - (BORDER*1.5)), 2*BORDER, true);
-				}
-			}
-		});
+//		// here you could check some condition on which decoration to show
+//		
+//		version = "TXM "+ApplicationWorkbenchAdvisor.getTXMVersion(); //$NON-NLS-1$
+//		
+//		String build_date =  ApplicationWorkbenchAdvisor.getBuildDate(ApplicationWorkbenchAdvisor.getBuildVersion());
+//		
+//		String txm_date = ApplicationWorkbenchAdvisor.getUpdateDate();
+//		
+//		level = ApplicationWorkbenchAdvisor.getVersionLevel().toUpperCase();
+//		
+//		greenTXM = new Color(splash.getDisplay(), 109,139,0);
+//		redTXM = new Color(splash.getDisplay(), 255,0,0);
+//		font = new Font(splash.getDisplay(), "Arial", 17, SWT.BOLD); //$NON-NLS-1$
+//		
+//		if (txm_date.equals(build_date)) {
+//			infos = build_date;
+//		}
+//		else {
+//			infos = "update " + txm_date + " - build " + build_date; //$NON-NLS-1$ //$NON-NLS-2$
+//		}
+//		
+//		if ("STABLE".equals(level)) { //$NON-NLS-1$
+//			level = null;
+//		}
+//		
+//		getContent().addPaintListener(new PaintListener() {
+//			
+//			@Override
+//			public void paintControl(PaintEvent e) {
+//				e.gc.setFont(font);
+//				e.gc.setForeground(greenTXM);
+//				Point textSize2 = e.gc.textExtent(version);
+//				e.gc.drawString(version, (int) (316 - textSize2.x - (BORDER*1.5)), 230, true);
+//				
+//				Point textSize = e.gc.textExtent(infos);
+//				e.gc.drawString(infos, (int) (316 - textSize.x - (BORDER*1.5)), 233 + textSize2.y, true);
+//				
+//				if (level != null) {
+//					e.gc.setForeground(redTXM);
+//					textSize = e.gc.textExtent(level);
+//					e.gc.drawString(level, (int) (316 - textSize.x - (BORDER*1.5)), 2*BORDER, true);
+//				}
+//			}
+//		});
 	}
 	
 	@Override
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/MultipleValueDialog.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/MultipleValueDialog.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/MultipleValueDialog.java	(revision 3628)
@@ -39,9 +39,8 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-// TODO: Auto-generated Javadoc
 /**
- * build a query with the help of simple questions @ author mdecorde.
+ * dialog with choices
  */
 public class MultipleValueDialog extends Dialog {
 	
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ComboDialog.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ComboDialog.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/swt/dialog/ComboDialog.java	(revision 3628)
@@ -32,9 +32,12 @@
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Layout;
 import org.eclipse.swt.widgets.Shell;
 
 // TODO: Auto-generated Javadoc
@@ -69,6 +72,8 @@
 	
 	/** The title. */
 	private String title;
+	
+	private Integer comboStyle;
 
 	/**
 	 * Instantiates a new combo dialog.
@@ -76,16 +81,33 @@
 	 * @param parentShell the parent shell
 	 * @param title the title
 	 * @param values the values
-	 * @param defaultValue the default value
+	 * @param defaultValue the default value (may be null)
+	 * @param comboStyle if null combo is SINGLE and READONLY
 	 */
 	public ComboDialog(Shell parentShell, String title, List<String> values,
 			String defaultValue) {
+		this(parentShell, title, values, defaultValue, null);
+		
+	}
+	
+	/**
+	 * Instantiates a new combo dialog.
+	 *
+	 * @param parentShell the parent shell
+	 * @param title the title
+	 * @param values the values
+	 * @param defaultValue the default value (may be null)
+	 * @param comboStyle if null combo is SINGLE and READONLY
+	 */
+	public ComboDialog(Shell parentShell, String title, List<String> values,
+			String defaultValue, Integer comboStyle) {
 		super(parentShell);
 		this.parentShell = parentShell;
 		this.setShellStyle(this.getShellStyle());
 		this.values = values;
 		this.defaultValue = defaultValue;
 		this.title = title;
+		this.comboStyle = comboStyle;
 	}
 
 	/* (non-Javadoc)
@@ -103,7 +125,21 @@
 	@Override
 	protected Control createDialogArea(Composite p) {
 		//System.out.println(p.getLayout());
-		combo = new Combo(p, SWT.READ_ONLY | SWT.SINGLE);
+		GridLayout layout = (GridLayout) p.getLayout();
+		layout.verticalSpacing = 5;
+		layout.marginBottom = 5;
+		layout.marginTop = 5;
+		layout.marginLeft = 5;
+		layout.marginRight = 5;
+		
+		Label l = new Label(p, SWT.NONE);
+		l.setText("Select between the following values");
+		
+		int style = SWT.READ_ONLY | SWT.SINGLE;
+		if (comboStyle != null) {
+			style = comboStyle;
+		}
+		combo = new Combo(p, style);
 		combo.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
 				true, 5, 1));
 		combo.setItems(values.toArray(new String[] {}));
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 3628)
@@ -1,30 +1,3 @@
-// Copyright © 2010-2020 ENS de Lyon., University of Franche-Comté
-// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
-// Lyon 2, University of Franche-Comté, University of Nice
-// Sophia Antipolis, University of Paris 3.
-//
-// The TXM platform is free software: you can redistribute it
-// and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation,
-// either version 2 of the License, or (at your option) any
-// later version.
-//
-// The TXM platform is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE. See the GNU General Public License for more
-// details.
-//
-// You should have received a copy of the GNU General
-// Public License along with the TXM platform. If not, see
-// http://www.gnu.org/licenses.
-//
-//
-//
-// $LastChangedDate:$
-// $LastChangedRevision:$
-// $LastChangedBy:$
-//
 package org.txm.rcp;
 
 import java.io.File;
@@ -57,7 +30,6 @@
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.preference.IPreferenceNode;
 import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.util.Util;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -69,11 +41,9 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPreferenceConstants;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.application.IWorkbenchConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
@@ -89,7 +59,6 @@
 import org.eclipse.ui.internal.IPreferenceConstants;
 import org.eclipse.ui.internal.WorkbenchPlugin;
 import org.eclipse.ui.internal.dialogs.WorkbenchPreferenceNode;
-import org.eclipse.ui.statushandlers.StatusManager;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
@@ -101,6 +70,7 @@
 import org.txm.core.results.TXMResult;
 import org.txm.objects.Project;
 import org.txm.rcp.commands.OpenWelcomePage;
+import org.txm.rcp.commands.RecoverCorporaFromInstalls;
 import org.txm.rcp.commands.RestartTXM;
 import org.txm.rcp.commands.workspace.LoadBinaryCorporaDirectory;
 import org.txm.rcp.handlers.scripts.ExecuteGroovyScript;
@@ -115,11 +85,8 @@
 import org.txm.utils.io.IOUtils;
 import org.txm.utils.logger.Log;
 
-/**
- * Manages the opening and closing of TXM
- */
 public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-	
+
 	private boolean installPreferenceRestored;
 	
 	private IOConsoleOutputStream stream;
@@ -137,8 +104,9 @@
 	
 	@Override
 	public IAdaptable getDefaultPageInput() {
-		org.eclipse.core.resources.IWorkspace workspace = org.eclipse.core.resources.ResourcesPlugin.getWorkspace();
-		return workspace.getRoot();
+		// MD test 02022023
+		//org.eclipse.core.resources.IWorkspace workspace = org.eclipse.core.resources.ResourcesPlugin.getWorkspace();
+		return null;
 	}
 	
 	/**
@@ -236,10 +204,11 @@
 						}
 						
 						// CREATE THE CLOSE CONTROL FILE
-						File lockFile = new File(ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile().getAbsolutePath(), "txm_was_not_closed_correctly.lock");
+						String rootPath = Platform.getInstanceLocation().getURL().toURI().getPath();
+						File lockFile = new File(rootPath, "txm_was_not_closed_correctly.lock");
 						if (lockFile.exists()) { // the close control file was not deleted //$NON-NLS-1$
 							
-							File checkupResultFile = new File(ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile().getAbsolutePath(), "startup_diagnostic_"+Toolbox.dateformat.format(new Date())+".txt"); //$NON-NLS-1$ //$NON-NLS-2$
+							File checkupResultFile = new File(rootPath, "startup_diagnostic_"+Toolbox.dateformat.format(new Date())+".txt"); //$NON-NLS-1$ //$NON-NLS-2$
 							this.syncExec(new Runnable() {
 								@Override
 								public void run() {
@@ -821,7 +790,9 @@
 			try {
 				Log.info(NLS.bind(TXMUIMessages.installPathColonP0, Toolbox.getInstallDirectory()));
 				
-				txmhomedir = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile().getCanonicalFile();
+				//MD test 02022023
+				//txmhomedir = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile().getCanonicalFile();
+				txmhomedir = Platform.getLocation().toFile().getCanonicalFile();
 				txmhomedir.mkdirs(); // creates the directory if needed
 				
 				txmhomedir.mkdirs(); // creates the directory if needed
@@ -847,10 +818,6 @@
 				return false;
 			}
 			
-			
-			
-			
-			
 		} // end if
 		
 		return true;
@@ -860,181 +827,18 @@
 	 * Install the sample corpora and previous TXM version corpora in TXM corpora directory
 	 * 
 	 * @param monitor
+	 * @throws IOException 
+	 * @throws IllegalStateException 
 	 */
-	private void installCorporaDirectory(IProgressMonitor monitor) {
+	private void installCorporaDirectory(IProgressMonitor monitor) throws IllegalStateException, IOException {
 		// if (org.eclipse.core.runtime.Platform.inDevelopmentMode()) {
 		// System.out.println("DEV MODE: no corpus restored!");
 		// return; // dev mode
 		// }
 		monitor.setTaskName(TXMUIMessages.restoringCorpora);
-		String installdirpath = Toolbox.getInstallDirectory();
-		File sampleCorporaDirectory = new File(installdirpath, "samples"); //$NON-NLS-1$
 		
-		if (txmhomedir == null) {
-			txmhomedir = new File(Toolbox.getTxmHomePath().trim());
-		}
-		corporaDir = new File(txmhomedir, "corpora"); //$NON-NLS-1$
+		RecoverCorporaFromInstalls.restore(true);
 		
-		String previousVersions[] = { "0.8.1", "0.8.0", "0.7.9" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		String previousVersionLabels[] = new String[previousVersions.length];
-		File previousVersionCorporaDirectories[] = new File[previousVersions.length];
-		
-		for (int i = 0; i < previousVersions.length; i++) {
-			String v = previousVersions[i];
-			
-			previousVersionLabels[i] = TXMUIMessages.bind(TXMUIMessages.corporaOfPreviousTXMP0, v);
-			
-			File dir = new File(System.getProperty("user.home"), "TXM-" + v + "/corpora"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			if ("0.7.9".equals(v)) { //$NON-NLS-1$
-				dir = new File(System.getProperty("user.home"), "TXM/corpora"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			previousVersionCorporaDirectories[i] = dir;
-		}
-		
-		Version v = Activator.getDefault().getBundle().getVersion();
-		String vv = v.getMajor() + "." + v.getMinor() + "." + v.getMicro(); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
-		String SAMPLES = "1. " + TXMUIMessages.bind(TXMUIMessages.sampleCorporaOfCurrentTXMP0, vv); //$NON-NLS-1$
-		int n = 2;
-		String vCURRENT = "2. " + TXMUIMessages.bind(TXMUIMessages.corporaOfPreviousTXMP0, vv); //$NON-NLS-1$
-		
-		
-		final ArrayList<Object> selectedCorporaDirs = new ArrayList<>();
-		selectedCorporaDirs.add(SAMPLES);
-		
-		if (corporaDir.exists() && corporaDir.listFiles(IOUtils.HIDDENFILE_FILTER).length > 0) {
-			selectedCorporaDirs.add(vCURRENT);
-			n++;
-		}
-		
-		for (int i = 0; i < previousVersions.length; i++) {
-			if (previousVersionCorporaDirectories[i].exists()
-					&& previousVersionCorporaDirectories[i].listFiles(IOUtils.HIDDENFILE_FILTER).length > 0) {
-				selectedCorporaDirs.add("" + (n++) + ". " + previousVersionLabels[i]); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-		
-		String OTHER = "" + (n++) + ". " + TXMUIMessages.selectAnotherTXMCorporaToRestore; //$NON-NLS-1$ //$NON-NLS-2$
-		selectedCorporaDirs.add(OTHER);
-		
-		final ArrayList<Object> initialSelectionCorporaDirs = new ArrayList<>();
-		initialSelectionCorporaDirs.add(SAMPLES);
-		initialSelectionCorporaDirs.add(vCURRENT);
-		
-		Display.getDefault().syncExec(new Runnable() {
-			
-			@Override
-			public void run() {
-				Display display = Display.getDefault();
-				Shell shell = display.getActiveShell();
-				ListSelectionDialog dialog = new ListSelectionDialog(shell, selectedCorporaDirs,
-						new ArrayContentProvider(), new LabelProvider(), TXMUIMessages.corporaWillBeRestoredInTheFollowingOrderCorporaAlreadyRestoredWillNotBeReplaced);
-				dialog.setTitle(TXMUIMessages.selectThecorporaSetsToRestore);
-				dialog.setInitialElementSelections(initialSelectionCorporaDirs);
-				if (dialog.open() == ListSelectionDialog.OK) {
-					selectedCorporaDirs.clear();
-					List<Object> selection = Arrays.asList(dialog.getResult());
-					selectedCorporaDirs.addAll(selection);
-				}
-				else {
-					selectedCorporaDirs.clear();
-				}
-			}
-		});
-		
-		// move the previous TXM 0.8.2 corpora
-		File backupDir = new File(corporaDir.getAbsolutePath() + "-previous"); //$NON-NLS-1$
-		if (corporaDir.exists()) {
-			backupDir.mkdirs();
-			for (File dir : corporaDir.listFiles(IOUtils.HIDDENFILE_FILTER)) {
-				File bdir = new File(backupDir, dir.getName());
-				DeleteDir.deleteDirectory(bdir);
-				dir.renameTo(bdir);
-			}
-		}
-		
-		corporaDir.mkdir();
-		
-		// load TXM-0.8.2 sample corpora (from the install directory)
-		if (selectedCorporaDirs.contains(SAMPLES) && sampleCorporaDirectory.exists()) {
-			
-			Log.info(TXMUIMessages.installingSampleCorpus);
-			
-			JobHandler job = LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(sampleCorporaDirectory, false, true, false);
-			try {
-				job.join();
-			}
-			catch (InterruptedException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		
-		// TXM-CURRENT previous installation corpora
-		if (selectedCorporaDirs.contains(vCURRENT) && backupDir.listFiles(IOUtils.HIDDENFILE_FILTER).length > 0) { // not a new install, restore corpus from the corpora-previous directory
-			Log.info(NLS.bind(TXMUIMessages.installingPreviousCorpusFromP0, vv, corporaDir));
-			JobHandler job = LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(backupDir, false, false, true);
-			try {
-				job.join();
-			}
-			catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-		}
-		
-		for (int i = 0; i < previousVersions.length; i++) {
-			if (selectedCorporaDirs.contains(previousVersionLabels[i])) {
-				
-				Log.info(NLS.bind(TXMUIMessages.installingPreviousCorpusFromP0, previousVersions[i], previousVersionCorporaDirectories[i]));
-				
-				JobHandler job = LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(previousVersionCorporaDirectories[i], false, false, true);
-				try {
-					job.join();
-				}
-				catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		
-		// recovery from an other corpora directory to select by the user
-		if (selectedCorporaDirs.contains(OTHER)) { // new installation (empty corpora directory)
-			final HashMap<String, String> bindings = new HashMap<>();
-			Display.getDefault().syncExec(new Runnable() {
-				
-				@Override
-				public void run() {
-					Display display = Display.getDefault();
-					Shell shell = display.getActiveShell();
-					DirectoryDialog dialog = new DirectoryDialog(shell);
-					String path = dialog.open();
-					if (path == null) return;
-					
-					bindings.put("path", path); //$NON-NLS-1$
-				}
-			});
-			if (bindings.containsKey("path")) { //$NON-NLS-1$
-				File dir = new File(bindings.get("path")); //$NON-NLS-1$
-				if (!dir.equals(corporaDir)) {
-					Log.info(NLS.bind(TXMUIMessages.restoringCorporaFromTheP0Directory, dir));
-					JobHandler job = LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(dir, true, true, true);
-					try {
-						job.join();
-					}
-					catch (InterruptedException e) {
-						e.printStackTrace();
-					}
-				}
-			}
-		}
-		
-		Display.getDefault().syncExec(new Runnable() {
-			
-			@Override
-			public void run() {
-				RestartTXM.reloadViews();
-			}
-		});
-		
 		try {
 			Display.getDefault().syncExec(new Runnable() {
 				
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/Application.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/Application.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/Application.java	(revision 3628)
@@ -38,6 +38,7 @@
 
 import org.eclipse.core.net.proxy.IProxyService;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
@@ -48,7 +49,6 @@
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.ide.ChooseWorkspaceData;
 import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
@@ -59,10 +59,19 @@
 import org.txm.Toolbox;
 import org.txm.core.messages.TXMCoreMessages;
 import org.txm.core.preferences.TBXPreferences;
+import org.txm.objects.Project;
+import org.txm.objects.Workspace;
+import org.txm.rcp.commands.workspace.Load080BinaryCorpus;
+import org.txm.rcp.handlers.scripts.ExecuteImportScript;
 import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.swt.dialog.CGUMessageDialog;
+import org.txm.rcp.utils.JobHandler;
+import org.txm.searchengine.cqp.CQPSearchEngine;
+import org.txm.searchengine.cqp.clientExceptions.UnexpectedAnswerException;
+import org.txm.searchengine.cqp.serverException.CqiServerError;
 import org.txm.utils.BundleUtils;
+import org.txm.utils.LogMonitor;
 import org.txm.utils.logger.Log;
 
 
@@ -72,12 +81,16 @@
 public class Application implements IApplication {
 	/** The Constant PLUGIN_ID. */
 	public static final String PLUGIN_ID = "org.txm.rcp"; //$NON-NLS-1$
-	
+
 	/** The Constant FIRST_LAUNCH. */
 	public static final String FIRST_LAUNCH = "first_launch"; //$NON-NLS-1$
-	
+
 	private static ApplicationWorkbenchAdvisor awa;
+
+	private static boolean headlessMode = false;
 	
+	private static boolean restMode = false;
+
 	// public static OpenDocumentEventProcessor openDocProcessor = new OpenDocumentEventProcessor();
 	/*
 	 * (non-Javadoc)
@@ -85,10 +98,29 @@
 	 */
 	@Override
 	public Object start(IApplicationContext context) throws Exception {
+
+		Map args = context.getArguments();
+		List<String> argsList = Arrays.asList((String[]) (args.get("application.args"))); //$NON-NLS-1$
+		System.out.println(TXMCoreMessages.bind(TXMUIMessages.argsColon, argsList));
+
+		headlessMode = argsList.contains("--headless");
+		if (headlessMode) {
+			return startHeadLess(argsList);
+		}
 		
+		restMode = argsList.contains("--rest");
+		if (restMode) {
+			return startRest(argsList);
+		}
+
+		return startDesktop(argsList);
+	}
+
+	private int startDesktop(List<String> argsList) {
+		// if not headless continue as usual for the Desktop version to start
 		Display display = PlatformUI.createDisplay();
-		
-		
+
+
 		// if (Platform.inDevelopmentMode() || Platform.inDebugMode()) {
 		// // this can not work in development environment
 		// // as it need to have a default workspace set to none
@@ -100,10 +132,10 @@
 		// } else {
 		// in Release mode only : platform workspace selection on startup
 		// then restart if needed (on workspace error...)
-		
+
 		System.out.println("instance location=" + Platform.getInstanceLocation().getURL()); //$NON-NLS-1$
 		if (Platform.getInstanceLocation().getURL() == null) {
-			
+
 			Integer ret = openCGU();
 			if (ret == IApplication.EXIT_RESTART) {
 				System.out.println("** Working directory set by user."); //$NON-NLS-1$
@@ -117,23 +149,23 @@
 				// OK
 			}
 		}
-		
+
 		// Die if platform WS not set (user cancel)
 		// ---------------------------
-		
+
 		if (Platform.getInstanceLocation().getURL() == null) {
 			System.out.println("** Working directory not set."); //$NON-NLS-1$
 			return IApplication.EXIT_OK;
 		}
-		
-		
+
+
 		// load JVM fonts in SWT env
 		if (System.getProperty("os.name").contains("Linux")) { // $NON-NLS-1$ $NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-2$
 			File javaFontsPath = new File(System.getProperty("java.home") //$NON-NLS-1$
 					+ System.getProperty("file.separator") + "lib" //$NON-NLS-1$ //$NON-NLS-2$
 					+ System.getProperty("file.separator") + "fonts" //$NON-NLS-1$ //$NON-NLS-2$
 					+ System.getProperty("file.separator")); //$NON-NLS-1$
-			
+
 			String[] fontFiles = javaFontsPath.list();
 			if (fontFiles != null) {
 				for (int i = 0; i < fontFiles.length; i++) {
@@ -146,13 +178,7 @@
 				}
 			}
 		}
-		
-		Map args = context.getArguments();
-		
-		List<String> argsList = Arrays.asList((String[]) (args.get("application.args"))); //$NON-NLS-1$
-		
-		System.out.println(TXMCoreMessages.bind(TXMUIMessages.argsColon, argsList));
-		
+
 		if (argsList.contains("-log")) { //$NON-NLS-1$
 			System.out.println(TXMUIMessages.logOptionDetected);
 			Log.setPrintInConsole(true);
@@ -162,8 +188,10 @@
 			Toolbox.setPreference(TBXPreferences.LOG_LEVEL, "ALL"); //$NON-NLS-1$
 			Toolbox.setPreference(TBXPreferences.LOG_STACKTRACE, true);
 		}
-		
-		if (argsList.contains("-run") || System.getProperty("os.name").contains("Mac") || Platform.inDevelopmentMode()) { //$NON-NLS-1$
+
+		if (argsList.contains("-run") //$NON-NLS-1$
+				|| System.getProperty("os.name").contains("Mac") //$NON-NLS-1$
+				|| Platform.inDevelopmentMode()) { // special case when TXM is run with Eclipse
 			System.out.println("Running TXM"); //$NON-NLS-1$
 			// FIXME: need to check that all has been well moved in Workspace class or build.properties
 			// } else if (argsList.contains("-standalone")) { //$NON-NLS-1$
@@ -203,22 +231,22 @@
 		else {
 			System.err.println("TXM must be launch with the argument '-run' to start."); //$NON-NLS-1$
 			System.err.println(TXMUIMessages.thisFileIsNotMeantToRunTXMPleaseConsultTXMUserManual);
-			
+
 			javax.swing.JOptionPane.showMessageDialog(null, TXMUIMessages.thisFileIsNotMeantToRunTXMPleaseConsultTXMUserManual);
 			return IApplication.EXIT_OK;
 		}
 		// test if Java 1.6 is installed
 		String version = System.getProperty("java.version"); //$NON-NLS-1$
 		Log.warning("java.version : " + version); //$NON-NLS-1$
-		
+
 		boolean exit = false;// parseCommandLine();
 		if (exit) {
 			return IApplication.EXIT_OK;
 		}
-		
-		
+
+
 		// display.addListener(SWT.OpenDocument, openDocProcessor);
-		
+
 		// //Lock the RCP workspace, thus there is only one TXM instance running
 		// Log.warning(TXMUIMessages.lockRCPWorkspace);
 		// if (!Platform.getInstanceLocation().lock()){
@@ -226,7 +254,7 @@
 		// System.out.println("TXM is already running. Exiting...");
 		// return IApplication.EXIT_OK;
 		// }
-		
+
 		try {
 			Log.warning(TXMUIMessages.activateProxyService);
 			activateProxyService();
@@ -234,18 +262,19 @@
 		catch (Exception e) {
 			Log.warning(TXMCoreMessages.bind(TXMUIMessages.couldNotStartProxyConfigurationColon, e));
 		}
-		
+
 		try {			
 			// run the application mainloop
 			awa = new ApplicationWorkbenchAdvisor();
 			System.out.println("Running TXM workbench."); //$NON-NLS-1$
+
 			int returnCode = PlatformUI.createAndRunWorkbench(display, awa);
-			
+
 			if (returnCode == PlatformUI.RETURN_RESTART) {
 				System.out.println("Restarting TXM."); //$NON-NLS-1$
 				return IApplication.EXIT_RESTART;
 			}
-			
+
 			System.out.println("Exiting TXM."); //$NON-NLS-1$
 			return IApplication.EXIT_OK;
 		}
@@ -255,9 +284,182 @@
 		}
 	}
 	
+	private int startRest(List<String> argsList) throws IllegalStateException, IOException {
+		System.out.println("NOT IMPLEMENTED");
+		
+		return 0;
+	}
+
+	private int startHeadLess(List<String> argsList) throws IllegalStateException, IOException {
+
+		if (Toolbox.getTxmHomePath() == null || Toolbox.getTxmHomePath().isEmpty()) {
+			File txmhomedir = Platform.getLocation().toFile().getCanonicalFile();
+			TBXPreferences.getInstance().put(TBXPreferences.USER_TXM_HOME, txmhomedir.getAbsolutePath());
+		}
+		int ret = IApplication.EXIT_OK;
+
+		try {
+			if (Toolbox.initialize(TBXPreferences.class, new LogMonitor())) {
+
+				if (argsList.contains("--action=list")) {
+					ret = doList();
+				}
+
+				if (argsList.contains("--action=new")) {
+					String path = argsList.get(argsList.size() -2);
+					File sourcePath = new File(path);
+
+					String name = argsList.get(argsList.size() -1);
+					
+					ret = doNew(sourcePath, name);
+					
+				} else if (argsList.contains("--action=import")) {
+					String path = argsList.get(argsList.size() -1);
+					File sourcePath = new File(path);
+					
+					ret = doImport(sourcePath);
+				} else if (argsList.contains("--action=export")) {
+					String path = argsList.get(argsList.size() -1).trim();
+					ret = doExport(path);
+				} else if (argsList.contains("--action=remove")) {
+					String path = argsList.get(argsList.size() -1).trim();
+					ret = doRemove(path);
+				} else if (argsList.contains("--action=command")) {
+
+					String name = argsList.get(argsList.size() -2).trim();
+
+					String path = argsList.get(argsList.size() -1).trim();
+
+					ret = doCommand(name, path);
+				}
+
+				Toolbox.workspace.saveParameters(true);
+				Toolbox.shutdown();
+			} else {
+				Log.severe("Toolbox not initialized - good luck");
+			}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			ret = -1;
+		}
+
+		return ret;
+	}
+
+	private int doList() throws UnexpectedAnswerException, IOException, CqiServerError {
+		
+		System.out.println(Arrays.asList(CQPSearchEngine.getCqiClient().listCorpora()));
+		return IApplication.EXIT_OK;
+	}
+
+	private int doExport(String path) throws IOException {
+		
+		int ret = IApplication.EXIT_OK;
+		if (path.length() == 0) {
+			System.err.println("No corpus name provided.");
+			ret = -1;
+		} else {
+			Project p = Workspace.getInstance().getProject(path);
+			if (p == null) {
+				System.err.println("No corpus found with name: "+path);
+				ret = -1;
+			} else {
+				File f = new File(Toolbox.getTxmHomePath(), path+".txm");
+				p.export(f);
+				System.out.println("Exported file: "+f.getAbsolutePath());
+			}
+		}
+		return ret;
+	}
+
+	private int doCommand(String name, String path) {
+		
+		int ret = IApplication.EXIT_OK;
+		if (name.length() == 0) {
+			System.err.println("No command name parameter provided. Ex: concordance, index");
+			ret = -1;
+		} else if (path.length() == 0) {
+			System.err.println("No target path parameter provided. Ex: corpus path /VOEUX , concordance name /VOEUX/myconc");
+			ret = -1;
+		} else {
+			System.out.println("DO: "+name+ " WITH "+path);
+		}
+		return ret;
+	}
+
+	private int doRemove(String path) {
+		
+		int ret = IApplication.EXIT_OK;
+		
+		if (path.length() == 0) {
+			System.err.println("No corpus name provided.");
+			ret = -1;
+		} else {
+			Project p = Workspace.getInstance().getProject(path);
+			if (p == null) {
+				System.err.println("No corpus found with name: "+path);
+				ret = -1;
+			} else {
+				p.delete();
+				System.out.println("Deleted corpus: "+path);
+			}
+		}
+		return ret;
+	}
+
+	private int doImport(File sourcePath) throws Exception {
+		
+		int ret = IApplication.EXIT_OK;
+		if (!sourcePath.exists()) {
+			System.err.println("No TXM corpus file found: "+sourcePath);
+			ret = -1;
+		} else if (!sourcePath.canRead()) {
+			System.err.println("Cannot read TXM corpus file: "+sourcePath);
+			ret = -1;
+		} else if (!sourcePath.getName().endsWith(".txm") || !sourcePath.isFile()) {
+			System.err.println("Not a TXM corpus file: "+sourcePath);
+			ret = -1;
+		} else { // DO IT
+			Project p = Load080BinaryCorpus.loadBinaryCorpusArchive(sourcePath, new LogMonitor(), true);
+
+			if (p == null) {
+				ret = -1;
+			} 
+
+			System.out.println(Arrays.asList(CQPSearchEngine.getCqiClient().listCorpora()));
+			ret = 0;
+		}
+		return ret;
+	}
+
+	private int doNew(File sourcePath, String name) throws InterruptedException {
+		
+		int ret = IApplication.EXIT_OK;
+		
+		if (!sourcePath.exists()) {
+			System.err.println("No source directory found: "+sourcePath);
+			ret = -1;
+		} else if (!sourcePath.canRead()) {
+			System.err.println("Cannot read source directory: "+sourcePath);
+			ret = -1;
+		} else if (!sourcePath.isDirectory()) {
+			System.err.println("Not a source directory: "+sourcePath);
+			ret = -1;
+		} else { // DO IT
+			Project p = org.txm.rcp.corpuswizard.ImportWizard.doCreateProject(sourcePath, name);
+			p.setDirty();
+			JobHandler job = ExecuteImportScript.executeScript(p);
+			job.join();
+
+			ret = job.getResult() == Status.OK_STATUS ? IApplication.EXIT_OK:-1;
+		}
+		return ret;
+	}
+
 	private Integer openCGU() {
 		try {
-			
+
 			Version v = BundleUtils.getBundleVersion("org.txm.rcp");//$NON-NLS-1$
 			if (v == null) {
 				System.out.println("Error: no 'org.txm.rcp' version found."); //$NON-NLS-1$
@@ -269,11 +471,11 @@
 				version += "-dev"; //$NON-NLS-1$
 			}
 			System.out.println("Version=" + version); //$NON-NLS-1$
-			
+
 			File txmhomedir = new File(System.getProperty("user.home"), "TXM-" + version); //$NON-NLS-1$ //$NON-NLS-2$
-			
-			
-			
+
+
+
 			// System.out.println("CGU="+ConfigurationScope.INSTANCE.getNode(IDEWorkbenchPlugin.IDE_WORKBENCH).getBoolean(RCPPreferences.CGU, false));
 			if (!ConfigurationScope.INSTANCE.getNode(IDEWorkbenchPlugin.IDE_WORKBENCH).getBoolean(RCPPreferences.CGU, false)) {
 				ChooseWorkspaceData launchData = new ChooseWorkspaceData(txmhomedir.getAbsolutePath());
@@ -283,7 +485,7 @@
 				boolean ret = (dialog.open() == MessageDialog.OK) && dialog.hasCheckBeenPressed();
 				if (ret) {
 					// TBXPreferences.getInstance().put(RCPPreferences.CGU, true);
-					
+
 					// check choosen path
 					String path = launchData.getSelection();
 					if (path != null) { // reset the letadata file
@@ -296,19 +498,19 @@
 					if (ret2 != -1) {
 						return ret2;
 					}
-					
+
 					// validate Current as default Workspace, save configuration & history
-					
+
 					launchData.writePersistedData();
 					System.out.println("save workspace location: " + launchData.getSelection()); //$NON-NLS-1$
 					ChooseWorkspaceData.setShowDialogValue(false);
-					
+
 					Preferences node = ConfigurationScope.INSTANCE.getNode(IDEWorkbenchPlugin.IDE_WORKBENCH);
 					node.putBoolean(RCPPreferences.CGU, true);
 					node.flush();
-					
+
 					return -1;
-					
+
 				}
 				else {
 					return IApplication.EXIT_OK;
@@ -317,7 +519,7 @@
 			else {
 				ChooseWorkspaceData launchData = new ChooseWorkspaceData(txmhomedir.getAbsolutePath());
 				String[] recent = launchData.getRecentWorkspaces();
-				
+
 				// If the selection dialog was not used then the workspace to use is either the
 				// most recent selection or the initialDefault (if there is no history).
 				String workspace = null;
@@ -328,7 +530,7 @@
 					workspace = launchData.getInitialDefault();
 				}
 				launchData.workspaceSelected(TextProcessor.deprocess(workspace));
-				
+
 				return setInstanceLocation(launchData);
 			}
 		}
@@ -338,14 +540,14 @@
 			return IApplication.EXIT_OK;
 		}
 	}
-	
+
 	private Integer setInstanceLocation(ChooseWorkspaceData launchData) {
 		String selWS = launchData.getSelection();
 		if (selWS == null) {
 			System.out.println("** No workspace set in configuration scope."); //$NON-NLS-1$
 			return IApplication.EXIT_OK;// user cancelled (no restart)
 		}
-		
+
 		// Switch workspace :
 		URL url = null;
 		try {
@@ -355,12 +557,12 @@
 			showWorkspaceError("Workspace path could not be found."); //$NON-NLS-1$
 			return IApplication.EXIT_OK;
 		}
-		
+
 		try {
 			if (org.eclipse.core.runtime.Platform.inDevelopmentMode()) {
 				return -1; // can't call Platform.getInstanceLocation().set(...) in dev mode
 			}
-			
+
 			if (!Platform.getInstanceLocation().set(url, true)) {
 				showWorkspaceError("TXM is already running. Exiting..."); //$NON-NLS-1$
 				ChooseWorkspaceData.setShowDialogValue(false);
@@ -380,10 +582,10 @@
 			ChooseWorkspaceData.setShowDialogValue(true);
 			return IApplication.EXIT_OK;
 		}
-		
-		
+
+
 	}
-	
+
 	// /**
 	// * Open choose workspace dialog and validate the user's choice. Returns true
 	// * if restart needed.
@@ -436,30 +638,30 @@
 	// ChooseWorkspaceData.setShowDialogValue(false);
 	// return -1;// user cancelled (no restart)
 	// }
-	
+
 	private static void showWorkspaceError(String message) {
 		MessageBox messageBox = new MessageBox(new Shell(), SWT.DIALOG_TRIM | SWT.ERROR);
 		messageBox.setText(TXMUIMessages.TXTStartingError);
 		messageBox.setMessage(message);
 		messageBox.open();
 	}
-	
+
 	public ApplicationWorkbenchAdvisor getApplicationWorkbenchAdvisor() {
 		return awa;
 	}
-	
+
 	@Override
 	public void stop() {
 		// TODO Auto-generated method stub
-		
+
 	}
-	
+
 	/**
 	 * Activates the proxy service and sets the network connection active provider as native.
 	 */
 	private void activateProxyService() {
 		String systemProxyHost = System.getProperty("http.proxyHost"); // must be called before IProxyService is used //$NON-NLS-1$
-		
+
 		Bundle bundle = Platform.getBundle("org.eclipse.ui.ide"); //$NON-NLS-1$
 		IProxyService proxyService = null;
 		if (bundle != null) {
@@ -477,7 +679,7 @@
 				System.out.println("System proxy detected. Force network provider to manual with proxy_host=" + systemProxyHost); //$NON-NLS-1$
 				proxyService.setProxiesEnabled(true);
 			}
-			
+
 			// if (Util.isMac()) { // configure only for Mac OS X
 			// // String proxy_conf = "";
 			// // ProxyConf conf = new ProxyConf(this);
@@ -504,7 +706,11 @@
 			// }
 		}
 	}
-	
+
+	public static boolean isHeadLess() {
+		return headlessMode || restMode;
+	}
+
 	// /**
 	// * Parses the command line.
 	// *
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/corpuswizard/ImportWizard.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/corpuswizard/ImportWizard.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/corpuswizard/ImportWizard.java	(revision 3628)
@@ -41,114 +41,118 @@
 	@Override
 	public boolean performFinish() {
 		if (page1.isCompleted()) {
-			try {
-				File path = new File(page1.getSourcePath());
-				String name = page1.getCorpusName();// AsciiUtils.buildId(path.getName()).toUpperCase();
+			File path = new File(page1.getSourcePath());
+			String name = page1.getCorpusName();// AsciiUtils.buildId(path.getName()).toUpperCase();
+			project = doCreateProject(path, name);
+			return true;
+		}
+		return false;
+	}
+	
+	public static Project doCreateProject(File path, String name) {
+		try {
+			IProject rcpProject = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
+			if (rcpProject.exists() && !rcpProject.isOpen()) {
+				rcpProject.open(new LogMonitor("Opening corpus for import")); //$NON-NLS-1$
+			}
+			Project project = null;
+			
+			// find last project using this src directory
+			for (Project p : Toolbox.workspace.getProjects()) {
+				File psrc = p.getSrcdir();
+				if (!path.equals(psrc)) {
+					continue;
+				}
+				if (!name.equals(p.getRCPProject().getName())) {
+					continue;
+				}
 				
-				IProject rcpProject = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-				if (rcpProject.exists() && !rcpProject.isOpen()) {
-					rcpProject.open(new LogMonitor("Opening corpus for import")); //$NON-NLS-1$
+				// get the more recent one
+				if (project != null && p.getLastComputingDate().compareTo(project.getLastComputingDate()) > 0) {
+					project = p;
 				}
-				project = null;
+				else {
+					project = p;
+				}
+			}
+			boolean newProject = (project == null);
+			if (newProject) { // it's a new project configuration
+				File settingsDirectory = new File(path, "parameters"); //$NON-NLS-1$
+				if (settingsDirectory.exists()) {
+					File settingsCopy = new File(Toolbox.workspace.getLocation(), name + "/.settings"); //$NON-NLS-1$
+					settingsCopy.getParentFile().mkdirs();
+					FileCopy.copyFiles(settingsDirectory, settingsCopy);
+				}
 				
-				// find last project using this src directory
-				for (Project p : Toolbox.workspace.getProjects()) {
-					File psrc = p.getSrcdir();
-					if (!path.equals(psrc)) {
-						continue;
-					}
-					if (!name.equals(p.getRCPProject().getName())) {
-						continue;
-					}
-					
-					// get the more recent one
-					if (project != null && p.getLastComputingDate().compareTo(project.getLastComputingDate()) > 0) {
-						project = p;
-					}
-					else {
-						project = p;
-					}
+				project = Toolbox.workspace.getProject(name);
+				if (project == null) {
+					project = new Project(Toolbox.workspace, name);
 				}
-				boolean newProject = (project == null);
-				if (newProject) { // it's a new project configuration
-					File settingsDirectory = new File(path, "parameters"); //$NON-NLS-1$
-					if (settingsDirectory.exists()) {
-						File settingsCopy = new File(Toolbox.workspace.getLocation(), name + "/.settings"); //$NON-NLS-1$
-						settingsCopy.getParentFile().mkdirs();
-						FileCopy.copyFiles(settingsDirectory, settingsCopy);
-					}
-					
-					project = Toolbox.workspace.getProject(name);
-					if (project == null) {
-						project = new Project(Toolbox.workspace, name);
-					}
-					project.setSourceDirectory(path.getAbsolutePath());
-					project.setDescription(NLS.bind(TXMUIMessages.DashImportedByP0, System.getProperty("user.name"))); //$NON-NLS-2$
-					project.setLang(Locale.getDefault().getLanguage().toLowerCase());
-					
-					project.getEditionDefinition("default").setEnableCollapsible(false); //$NON-NLS-1$
-					project.getEditionDefinition("default").setPageBreakTag("pb"); //$NON-NLS-1$ //$NON-NLS-2$
-					project.getEditionDefinition("default").setPaginateEdition(true); //$NON-NLS-1$
-					project.getEditionDefinition("default").setWordsPerPage(1000); //$NON-NLS-1$
-					project.getEditionDefinition("default").setBuildEdition(true); //$NON-NLS-1$
-					
-					Log.info(NLS.bind(TXMUIMessages.theP0CorpusWillBeCreatedFromTheP1Directory, project.getName(), project.getSrcdir()));
-					
-					Engine e = Toolbox.getEngineManager(EngineType.ANNOTATION).getEngine("TreeTagger"); //$NON-NLS-1$
-					if (e != null) {
-						project.setAnnotate(e.isRunning());
-					}
-					
-					if (project.getAnnotate()) {
-						Log.info(TXMUIMessages.TheAnnotateImportParameterHasBeenActivatedSinceTreeTaggerIsInstalled);
-					}
-					else {
-						Log.info(TXMUIMessages.TheAnnotateImportParameterWasNotActivatedSinceTreeTaggerIsNotInstalled);
-					}
-					
-					File importxml = new File(page1.getSourcePath(), "import.xml"); //$NON-NLS-1$
-					if (importxml.exists()) {
-						System.out.println(TXMUIMessages.AnImportDotXMLImportConfigurationFileWasFoundRestoringImportParametersUsingThisfile);
-						BaseOldParameters params = new BaseOldParameters(importxml);
-						params.load();
-						params.initializeProject(project);
-					}
+				project.setSourceDirectory(path.getAbsolutePath());
+				project.setDescription(NLS.bind(TXMUIMessages.DashImportedByP0, System.getProperty("user.name"))); //$NON-NLS-2$
+				project.setLang(Locale.getDefault().getLanguage().toLowerCase());
+				
+				project.getEditionDefinition("default").setEnableCollapsible(false); //$NON-NLS-1$
+				project.getEditionDefinition("default").setPageBreakTag("pb"); //$NON-NLS-1$ //$NON-NLS-2$
+				project.getEditionDefinition("default").setPaginateEdition(true); //$NON-NLS-1$
+				project.getEditionDefinition("default").setWordsPerPage(1000); //$NON-NLS-1$
+				project.getEditionDefinition("default").setBuildEdition(true); //$NON-NLS-1$
+				
+				Log.info(NLS.bind(TXMUIMessages.theP0CorpusWillBeCreatedFromTheP1Directory, project.getName(), project.getSrcdir()));
+				
+				Engine e = Toolbox.getEngineManager(EngineType.ANNOTATION).getEngine("TreeTagger"); //$NON-NLS-1$
+				if (e != null) {
+					project.setAnnotate(e.isRunning());
 				}
+				
+				if (project.getAnnotate()) {
+					Log.info(TXMUIMessages.TheAnnotateImportParameterHasBeenActivatedSinceTreeTaggerIsInstalled);
+				}
 				else {
-					Date date = project.getLastComputingDate();
-					if (date == null) {
-						date = Calendar.getInstance().getTime(); // today
-					}
-					
-//					if (MessageDialog.openQuestion(ImportWizard.this.getShell(), NLS.bind(TXMUIMessages.p0Import, project), NLS.bind(TXMUIMessages.theP1P0CorpusWillBeReplaced+"\nContinue ?", project, date))) {
-						Log.info(NLS.bind(TXMUIMessages.theP1P0CorpusWillBeReplaced, project, date));
-//					} else {
-//						Log.info(TXMUIMessages.abort);
-//						return false;
-//					}
-					
-					
+					Log.info(TXMUIMessages.TheAnnotateImportParameterWasNotActivatedSinceTreeTaggerIsNotInstalled);
 				}
 				
-				// if (!project.hasEditionDefinition("default")) {
-				// EditionDefinition def = project.getEditionDefinition("default");
-				// def.setBuildEdition(true);
-				// def.setWordsPerPage(1000);
-				// def.setPageBreakTag("pb");
-				// }
+				File importxml = new File(path, "import.xml"); //$NON-NLS-1$
+				if (importxml.exists()) {
+					System.out.println(TXMUIMessages.AnImportDotXMLImportConfigurationFileWasFoundRestoringImportParametersUsingThisfile);
+					BaseOldParameters params = new BaseOldParameters(importxml);
+					params.load();
+					params.initializeProject(project);
+				}
+			}
+			else {
+				Date date = project.getLastComputingDate();
+				if (date == null) {
+					date = Calendar.getInstance().getTime(); // today
+				}
 				
-				project.setDoUpdate(false, false);
-				project.saveParameters();
-				return true;
+//				if (MessageDialog.openQuestion(ImportWizard.this.getShell(), NLS.bind(TXMUIMessages.p0Import, project), NLS.bind(TXMUIMessages.theP1P0CorpusWillBeReplaced+"\nContinue ?", project, date))) {
+					Log.info(NLS.bind(TXMUIMessages.theP1P0CorpusWillBeReplaced, project, date));
+//				} else {
+//					Log.info(TXMUIMessages.abort);
+//					return false;
+//				}
+				
+				
 			}
-			catch (Exception e) {
-				e.printStackTrace();
-				return false;
-			}
+			
+			// if (!project.hasEditionDefinition("default")) {
+			// EditionDefinition def = project.getEditionDefinition("default");
+			// def.setBuildEdition(true);
+			// def.setWordsPerPage(1000);
+			// def.setPageBreakTag("pb");
+			// }
+			
+			project.setDoUpdate(false, false);
+			project.saveParameters();
+			return project;
 		}
-		return false;
+		catch (Exception e) {
+			e.printStackTrace();
+			return null;
+		}
 	}
-	
+
 	@Override
 	public void addPages() {
 		addPage(page1);
Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/RevertTXMResult.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/RevertTXMResult.java	(revision 0)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/RevertTXMResult.java	(revision 3628)
@@ -0,0 +1,59 @@
+package org.txm.rcp.handlers.results;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.txm.core.results.TXMResult;
+import org.txm.rcp.editors.TXMEditorToolBar;
+import org.txm.utils.logger.Log;
+
+/**
+ * Calls TXMEditor.compute() on the current active editor.
+ * 
+ * @author mdecorde
+ *
+ */
+public class RevertTXMResult extends AbstractHandler {
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		try {
+			revert(event);
+		} catch (Exception e) {
+			Log.severe(e);
+			Log.printStackTrace(e);
+		}
+
+		return null;
+	}
+	
+	public static Object revert(ExecutionEvent event) throws Exception {
+		
+		Object trigger = event.getTrigger();
+
+		if (trigger instanceof Event) {
+			Event e = (Event) trigger;
+			if (e.widget instanceof ToolItem) {
+				ToolItem ti = (ToolItem) e.widget;
+				ToolBar parent = ti.getParent();
+				if (parent instanceof TXMEditorToolBar) {
+					TXMResult result = ((TXMEditorToolBar)parent).getEditorPart().getResult();
+					ArrayList<HashMap<String, Object>> history = result.getParametersHistory();
+					if (history != null && history.size() > 0) {
+						result.revertParametersFromHistory();
+						return ((TXMEditorToolBar)parent).getEditorPart().compute(true);
+					}
+					return null;
+				}
+			}
+		}
+		return null;
+	}
+}

Property changes on: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/RevertTXMResult.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/ComputeTXMResult.java
===================================================================
--- TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/ComputeTXMResult.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp/src/main/java/org/txm/rcp/handlers/results/ComputeTXMResult.java	(revision 3628)
@@ -6,10 +6,6 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.rcp.editors.TXMEditor;
 import org.txm.rcp.editors.TXMEditorToolBar;
 
 /**
@@ -23,27 +19,14 @@
 
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IWorkbenchPart part = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActivePart();
-		IEditorPart activeEditor = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().getActiveEditor();
 
 		compute(event);
-		// gets the main editor if the active editor is a multipages editor
-//		if(part instanceof TXMMultiPageEditor)	{
-//			part = (IWorkbenchPart) ((TXMMultiPageEditor)part).getEditors().get(0);
-//		}
-//		
-//		if (!(part instanceof TXMEditor)) {
-//			System.out.println("Active editor is not a TXMEditor. Aborting.");
-//			return null;
-//		}
-//
-//		TXMEditor editor = (TXMEditor) part;
-//		editor.compute(true);
 
 		return null;
 	}
 	
 	public static Object compute(ExecutionEvent event) {
+		
 		Object trigger = event.getTrigger();
 
 		if (trigger instanceof Event) {
Index: TXM/trunk/org.txm.rcp/build.properties
===================================================================
--- TXM/trunk/org.txm.rcp/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.rcp/build.properties	(revision 3628)
@@ -5,21 +5,17 @@
                .,\
                splash.bmp,\
                lib/,\
-               rcp.product,\
                plugin_customization.ini,\
                lib/commons-cli-1.2.jar,\
                lib/commons-lang-2.4.jar,\
                lib/junit-4.5.jar,\
                lib/log4j-1.2.12.jar,\
-               installtreetagger_en.html,\
                css/,\
                p2.inf,\
-               TXM.sh,\
                icons/,\
                OSGI-INF/,\
                OSGI-INF/l10n/bundle.properties,\
                SUBVERSION,\
                VERSION
 source..=src/main/java/
-bin.excludes = lib/batik/
 #qualifier=svn
Index: TXM/trunk/org.txm.rcp/plugin.xml
===================================================================
--- TXM/trunk/org.txm.rcp/plugin.xml	(revision 3627)
+++ TXM/trunk/org.txm.rcp/plugin.xml	(revision 3628)
@@ -30,10 +30,10 @@
       <product
             application="org.txm.rcp.Application"
             description="%product.description"
-            name="TXM 0.8.2">
+            name="TXM 0.8.3">
          <property
                name="appName"
-               value="TXM 0.8.2">
+               value="TXM 0.8.3">
          </property>
          <property
                name="windowImages"
@@ -53,7 +53,7 @@
          </property>
          <property
                name="aboutText"
-               value="[Contrat d&apos;utilisation du logiciel TXM]&#x0A;&#x0A;TXM 0.8.2 Copyright © 2010-2021 ENS de Lyon, University of Franche-Comté, CNRS&#x0A;&#x0A;&lt;English version below&gt;&#x0A;&#x0A;EN ACCEPTANT CETTE INSTALLATION OU MISE À JOUR ET EN UTILISANT TXM, VOUS VOUS ENGAGEZ À CITER L&apos;ARTICLE DE RÉFÉRENCE DE LA PLATEFORME* DANS VOS PUBLICATIONS DE RÉSULTATS OBTENUS À PARTIR D&apos;ELLE. CELA EST ESSENTIEL POUR NOUS PERMETTRE DE JUSTIFIER LE BESOIN DE PÉRENNISATION DE CET INSTRUMENT DE TRAVAIL POUR LA COMMUNAUTÉ SCIENTIFIQUE.&#x0A;&#x0A;Le logiciel TXM est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier suivant les termes de la Licence publique générale GNU telle que publiée par la Free Software Foundation, soit la version 2 de cette License, soit une version ultérieure.&#x0A;&#x0A;Le logiciel TXM est distribué dans l&apos;espoir qu&apos;il sera utile, mais sans aucune garantie, y compris mais non de façon limitative les garanties implicites de qualité marchande et de convenance à un usage particulier. Consultez la version 2 et la version 3 de la Licence publique générale GNU pour plus de détails.&#x0A;&#x0A;Vous devriez avoir reçu une copie de la Licence publique générale GNU en accompagnement du logiciel TXM ; si ce n&apos;est pas le cas, veuillez consulter la page http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;* Serge Heiden, Jean-Philippe Magué, Bénédicte Pincemin.&#x0A;TXM : Une plateforme logicielle open-source pour la textométrie - conception et développement. Sergio Bolasco, Isabella Chiari, Luca Giuliano. 10th International Conference on the Statistical Analysis of Textual Data - JADT 2010, Jun 2010, Rome, Italie.&#x0A;Edizioni Universitarie di Lettere Economia Diritto, 2 (3), pp.1021-1032, 2010. &lt;halshs-00549779&gt;&#x0A;&#x0A;&#x0A;ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH&#x0A;&#x0A;[TXM Software User Agreement]&#x0A;&#x0A;By accepting this update and by using TXM, you agree to cite the TXM platform reference article** in your publications of results obtained from it. That is essential for us to justify the need for sustainability of this instrument for the scientific community.&#x0A;&#x0A;The TXM platform is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.&#x0A;&#x0A;The TXM platform is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&#x0A;&#x0A;You should have received a copy of the GNU General Public License along with the TXM platform. If not, see http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;** Serge Heiden. The TXM Platform: Building Open-Source Textual&#x0A;Analysis Software Compatible with the TEI Encoding Scheme. Ryo Otoguro, Kiyoshi Ishikawa, Hiroshi Umemoto, Kei Yoshimoto and Yasunari Harada. 24th Pacific Asia Conference on Language, Information and Computation, Nov 2010, Sendai, Japan. Institute for Digital Enhancement of Cognitive Development, Waseda University, pp.389-398, 2010. &lt;halshs-00549764&gt;">
+               value="[Contrat d&apos;utilisation du logiciel TXM]&#x0A;&#x0A;TXM 0.8.3 Copyright © 2010-2021 ENS de Lyon, University of Franche-Comté, CNRS&#x0A;&#x0A;&lt;English version below&gt;&#x0A;&#x0A;EN ACCEPTANT CETTE INSTALLATION OU MISE À JOUR ET EN UTILISANT TXM, VOUS VOUS ENGAGEZ À CITER L&apos;ARTICLE DE RÉFÉRENCE DE LA PLATEFORME* DANS VOS PUBLICATIONS DE RÉSULTATS OBTENUS À PARTIR D&apos;ELLE. CELA EST ESSENTIEL POUR NOUS PERMETTRE DE JUSTIFIER LE BESOIN DE PÉRENNISATION DE CET INSTRUMENT DE TRAVAIL POUR LA COMMUNAUTÉ SCIENTIFIQUE.&#x0A;&#x0A;Le logiciel TXM est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier suivant les termes de la Licence publique générale GNU telle que publiée par la Free Software Foundation, soit la version 2 de cette License, soit une version ultérieure.&#x0A;&#x0A;Le logiciel TXM est distribué dans l&apos;espoir qu&apos;il sera utile, mais sans aucune garantie, y compris mais non de façon limitative les garanties implicites de qualité marchande et de convenance à un usage particulier. Consultez la version 2 et la version 3 de la Licence publique générale GNU pour plus de détails.&#x0A;&#x0A;Vous devriez avoir reçu une copie de la Licence publique générale GNU en accompagnement du logiciel TXM ; si ce n&apos;est pas le cas, veuillez consulter la page http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;* Serge Heiden, Jean-Philippe Magué, Bénédicte Pincemin.&#x0A;TXM : Une plateforme logicielle open-source pour la textométrie - conception et développement. Sergio Bolasco, Isabella Chiari, Luca Giuliano. 10th International Conference on the Statistical Analysis of Textual Data - JADT 2010, Jun 2010, Rome, Italie.&#x0A;Edizioni Universitarie di Lettere Economia Diritto, 2 (3), pp.1021-1032, 2010. &lt;halshs-00549779&gt;&#x0A;&#x0A;&#x0A;ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH&#x0A;&#x0A;[TXM Software User Agreement]&#x0A;&#x0A;By accepting this update and by using TXM, you agree to cite the TXM platform reference article** in your publications of results obtained from it. That is essential for us to justify the need for sustainability of this instrument for the scientific community.&#x0A;&#x0A;The TXM platform is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.&#x0A;&#x0A;The TXM platform is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&#x0A;&#x0A;You should have received a copy of the GNU General Public License along with the TXM platform. If not, see http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;** Serge Heiden. The TXM Platform: Building Open-Source Textual&#x0A;Analysis Software Compatible with the TEI Encoding Scheme. Ryo Otoguro, Kiyoshi Ishikawa, Hiroshi Umemoto, Kei Yoshimoto and Yasunari Harada. 24th Pacific Asia Conference on Language, Information and Computation, Nov 2010, Sendai, Japan. Institute for Digital Enhancement of Cognitive Development, Waseda University, pp.389-398, 2010. &lt;halshs-00549764&gt;">
          </property>
          <property
                name="startupProgressRect"
@@ -552,7 +552,7 @@
                      icon="icons/functions/import_parameters.png"
                      label="%command.label.102"
                      style="push"
-                     tooltip="Compute a command from a &quot;.txmcmd&quot; file">
+                     tooltip="Import a calculus from a .txmcmd file">
                   <visibleWhen
                         checkEnabled="false">
                      <and>
@@ -576,6 +576,11 @@
                      label="%command.label.11"
                      style="push">
                </command>
+               <command
+                     commandId="org.txm.rcp.commands.RecoverCorporaFromInstalls"
+                     label="Recover corpora"
+                     style="push">
+               </command>
                <separator
                      name="menu.file.load.separator.end"
                      visible="false">
@@ -655,7 +660,7 @@
                      icon="icons/functions/export_parameters.png"
                      label="%command.label.103"
                      style="push"
-                     tooltip="Export the command in a &quot;.txmcmd&quot; file">
+                     tooltip="Export a calculus to a .txmcmd file">
                   <visibleWhen
                         checkEnabled="false">
                      <and>
@@ -1529,21 +1534,6 @@
          <toolbar
                id="org.txm.rcp.toolbars.result">
             <command
-                  commandId="org.txm.rcp.handlers.export.ImportResultParameters"
-                  icon="icons/functions/import_parameters.png"
-                  label="%command.label.141"
-                  style="push"
-                  tooltip="Compute a command from a &quot;.txmcmd&quot; file">
-               <visibleWhen
-                     checkEnabled="false">
-                  <and>
-                     <reference
-                           definitionId="OneTXMResultSelected">
-                     </reference>
-                  </and>
-               </visibleWhen>
-            </command>
-            <command
                   commandId="org.txm.rcp.commands.function.ExportResult"
                   icon="icons/functions/export_data.png"
                   label="%command.label.51"
@@ -1567,26 +1557,6 @@
                   </and>
                </visibleWhen>
             </command>
-            <command
-                  commandId="org.txm.rcp.handlers.export.ExportResultParameters"
-                  icon="icons/functions/export_parameters.png"
-                  label="%command.label.142"
-                  style="push"
-                  tooltip="Export the command in a &quot;.txmcmd&quot; file">
-               <visibleWhen
-                     checkEnabled="false">
-                  <and>
-                     <reference
-                           definitionId="OneTXMResultSelected">
-                     </reference>
-                     <not>
-                        <reference
-                              definitionId="OneMainCorpusSelected">
-                        </reference>
-                     </not>
-                  </and>
-               </visibleWhen>
-            </command>
          </toolbar>
          <toolbar
                id="org.txm.rcp.toolbarcorpus">
@@ -1644,6 +1614,41 @@
                   name="org.txm.rcp.toolbars.tools.separators.extensions"
                   visible="true">
             </separator>
+            <command
+                  commandId="org.txm.rcp.handlers.export.ImportResultParameters"
+                  icon="icons/functions/import_parameters.png"
+                  label="%command.label.141"
+                  style="push"
+                  tooltip="Import a calculus from a .txmcmd file">
+               <visibleWhen
+                     checkEnabled="false">
+                  <and>
+                     <reference
+                           definitionId="OneTXMResultSelected">
+                     </reference>
+                  </and>
+               </visibleWhen>
+            </command>
+            <command
+                  commandId="org.txm.rcp.handlers.export.ExportResultParameters"
+                  icon="icons/functions/export_parameters.png"
+                  label="%command.label.142"
+                  style="push"
+                  tooltip="Export a calculus to a .txmcmd file">
+               <visibleWhen
+                     checkEnabled="false">
+                  <and>
+                     <reference
+                           definitionId="OneTXMResultSelected">
+                     </reference>
+                     <not>
+                        <reference
+                              definitionId="OneMainCorpusSelected">
+                        </reference>
+                     </not>
+                  </and>
+               </visibleWhen>
+            </command>
          </toolbar>
          <separator
                name="org.txm.rcp.toolbar.separator2"
@@ -2125,7 +2130,7 @@
                         icon="icons/functions/export_parameters.png"
                         label="%command.label.194"
                         style="push"
-                        tooltip="Export the command in a &quot;.txmcmd&quot; file">
+                        tooltip="Export a calculus to a .txmcmd file">
                      <visibleWhen
                            checkEnabled="false">
                         <and>
@@ -2146,7 +2151,7 @@
                   icon="icons/functions/import_parameters.png"
                   label="%command.label.195"
                   style="push"
-                  tooltip="Compute a command from a &quot;.txmcmd&quot; file">
+                  tooltip="Import a calculus from a .txmcmd file">
                <visibleWhen
                      checkEnabled="false">
                   <and>
@@ -2807,6 +2812,12 @@
             id="org.txm.rcp.commands.editor.PrintHexacode"
             name="%command.name.93">
       </command>
+      <command
+            categoryId="org.txm.rcp.category.txm"
+            defaultHandler="org.txm.rcp.commands.RecoverCorporaFromInstalls"
+            id="org.txm.rcp.commands.RecoverCorporaFromInstalls"
+            name="Recover corpora">
+      </command>
    </extension>
    <extension
          id="commands"
@@ -2994,6 +3005,13 @@
             id="org.txm.rcp.handlers.ComputeTXMResult"
             name="%command.name.32">
       </command>
+            <command
+            categoryId="org.txm.rcp.categories.results"
+            defaultHandler="org.txm.rcp.handlers.results.RevertTXMResult"
+            description="Revert"
+            id="org.txm.rcp.handlers.RevertTXMResult"
+            name="%command.name.32">
+      </command>
       <command
             categoryId="org.txm.rcp.categories.results"
             defaultHandler="org.txm.rcp.handlers.results.SetTXMResultPersistentState"
@@ -3401,17 +3419,6 @@
    </extension>
   
    <extension
-         point="org.eclipse.ui.splashHandlers">
-      <splashHandler
-            class="org.txm.rcp.splashHandlers.TXMSplashHandler"
-            id="org.txm.rcp.splashHandlers.TXMSplashHandler">
-      </splashHandler>
-      <splashHandlerProductBinding
-            productId="org.txm.rcp.product"
-            splashId="org.txm.rcp.splashHandlers.TXMSplashHandler">
-      </splashHandlerProductBinding>
-   </extension>
-   <extension
          point="org.eclipse.core.expressions.propertyTesters">
       <propertyTester
             class="org.txm.rcp.testers.ToolboxTester"
@@ -3621,5 +3628,45 @@
          </variable>
       </sourceProvider>
    </extension>
+   <extension
+         id="txmheadless"
+         point="org.eclipse.core.runtime.products">
+      <product
+            application="org.txm.rcp.Application"
+            name="TXM 0.8.3">
+         <property
+               name="windowImages"
+               value="icons/logo/TXM logo 16x16.png,icons/logo/TXM_logo.png,icons/logo/TXM logo 48x48.png,icons/logo/TXM_logo_64x64.png,icons/logo/TXM logo 128x128.png,icons/logo/TXM logo 256x256.png">
+         </property>
+         <property
+               name="aboutText"
+               value="[Contrat d&apos;utilisation du logiciel TXM]&#x0A;&#x0A;TXM 0.8.3 Copyright © 2010-2023 ENS de Lyon, University of Franche-Comté, CNRS&#x0A;&#x0A;&lt;English version below&gt;&#x0A;&#x0A;EN ACCEPTANT CETTE INSTALLATION OU MISE À JOUR ET EN UTILISANT TXM, VOUS VOUS ENGAGEZ À CITER L&apos;ARTICLE DE RÉFÉRENCE DE LA PLATEFORME* DANS VOS PUBLICATIONS DE RÉSULTATS OBTENUS À PARTIR D&apos;ELLE. CELA EST ESSENTIEL POUR NOUS PERMETTRE DE JUSTIFIER LE BESOIN DE PÉRENNISATION DE CET INSTRUMENT DE TRAVAIL POUR LA COMMUNAUTÉ SCIENTIFIQUE.&#x0A;&#x0A;Le logiciel TXM est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier suivant les termes de la Licence publique générale GNU telle que publiée par la Free Software Foundation, soit la version 2 de cette License, soit une version ultérieure.&#x0A;&#x0A;Le logiciel TXM est distribué dans l&apos;espoir qu&apos;il sera utile, mais sans aucune garantie, y compris mais non de façon limitative les garanties implicites de qualité marchande et de convenance à un usage particulier. Consultez la version 2 et la version 3 de la Licence publique générale GNU pour plus de détails.&#x0A;&#x0A;Vous devriez avoir reçu une copie de la Licence publique générale GNU en accompagnement du logiciel TXM ; si ce n&apos;est pas le cas, veuillez consulter la page http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;* Serge Heiden, Jean-Philippe Magué, Bénédicte Pincemin.&#x0A;TXM : Une plateforme logicielle open-source pour la textométrie - conception et développement. Sergio Bolasco, Isabella Chiari, Luca Giuliano. 10th International Conference on the Statistical Analysis of Textual Data - JADT 2010, Jun 2010, Rome, Italie.&#x0A;Edizioni Universitarie di Lettere Economia Diritto, 2 (3), pp.1021-1032, 2010. &lt;halshs-00549779&gt;&#x0A;&#x0A;&#x0A;ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH ENGLISH&#x0A;&#x0A;[TXM Software User Agreement]&#x0A;&#x0A;By accepting this update and by using TXM, you agree to cite the TXM platform reference article** in your publications of results obtained from it. That is essential for us to justify the need for sustainability of this instrument for the scientific community.&#x0A;&#x0A;The TXM platform is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version.&#x0A;&#x0A;The TXM platform is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.&#x0A;&#x0A;You should have received a copy of the GNU General Public License along with the TXM platform. If not, see http://www.gnu.org/licenses/gpl-2.0.html&#x0A;_______________&#x0A;** Serge Heiden. The TXM Platform: Building Open-Source Textual&#x0A;Analysis Software Compatible with the TEI Encoding Scheme. Ryo Otoguro, Kiyoshi Ishikawa, Hiroshi Umemoto, Kei Yoshimoto and Yasunari Harada. 24th Pacific Asia Conference on Language, Information and Computation, Nov 2010, Sendai, Japan. Institute for Digital Enhancement of Cognitive Development, Waseda University, pp.389-398, 2010. &lt;halshs-00549764&gt;">
+         </property>
+         <property
+               name="aboutImage"
+               value="icons/logo/about TXM.png">
+         </property>
+         <property
+               name="startupForegroundColor"
+               value="000000">
+         </property>
+         <property
+               name="startupProgressRect"
+               value="13,332,290,15">
+         </property>
+         <property
+               name="startupMessageRect"
+               value="13,312,290,20">
+         </property>
+         <property
+               name="appName"
+               value="TXM 0.8.3">
+         </property>
+         <property
+               name="preferenceCustomization"
+               value="plugin_customization.ini">
+         </property>
+      </product>
+   </extension>
 
 </plugin>
Index: TXM/trunk/org.txm.rcp/SUBVERSION
===================================================================
--- TXM/trunk/org.txm.rcp/SUBVERSION	(revision 3627)
+++ TXM/trunk/org.txm.rcp/SUBVERSION	(revision 3628)
@@ -0,0 +1 @@
+alpha
Index: TXM/trunk/org.txm.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -106,55 +106,65 @@
  org.txm.rcp.wizard,
  swing2swt.layout
 Bundle-SymbolicName: org.txm.rcp;singleton:=true
-Bundle-Version: 0.8.2.qualifier
+Bundle-Version: 0.8.3.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-ClassPath: .,lib/commons-cli-1.2.jar,lib/commons-lang-2.4.jar,l
  ib/junit-4.5.jar,lib/log4j-1.2.12.jar,swing2swt.jar
 Require-Bundle: org.eclipse.ui;visibility:=reexport,
- org.eclipse.core.filesystem;bundle-version="1.2.0";visibility:=reexport,
+ org.eclipse.core.filesystem;visibility:=reexport,
  org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.ui.console;bundle-version="3.4.0";visibility:=reexport,
+ org.eclipse.ui.console;visibility:=reexport,
  org.eclipse.jface.text;visibility:=reexport,
- org.eclipse.ui.browser;bundle-version="3.2.300";visibility:=reexport,
+ org.eclipse.ui.browser;visibility:=reexport,
  org.eclipse.ui.forms;visibility:=reexport,
  org.eclipse.ui.editors;visibility:=reexport,
- org.eclipse.equinox.p2.ui;bundle-version="2.3.0";visibility:=reexport,
- org.eclipse.equinox.p2.ui.sdk;bundle-version="1.0.300";visibility:=reexport,
- org.eclipse.equinox.p2.ui.sdk.scheduler;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.100";visibility:=reexport,
+ org.eclipse.equinox.p2.ui;visibility:=reexport,
+ org.eclipse.equinox.p2.ui.sdk;visibility:=reexport,
+ org.eclipse.equinox.p2.ui.sdk.scheduler;visibility:=reexport,
+ org.eclipse.e4.ui.css.swt.theme;visibility:=reexport,
  org.eclipse.equinox.p2.operations;visibility:=reexport,
- org.eclipse.equinox.p2.ui.discovery;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.equinox.p2.metadata;bundle-version="2.2.0";visibility:=reexport,
- org.eclipse.equinox.p2.discovery;bundle-version="1.0.200";visibility:=reexport,
- org.eclipse.equinox.p2.repository;bundle-version="2.3.0";visibility:=reexport,
- org.eclipse.equinox.p2.core;bundle-version="2.3.0";visibility:=reexport,
- org.eclipse.equinox.p2.engine;bundle-version="2.3.0";visibility:=reexport,
+ org.eclipse.equinox.p2.ui.discovery;visibility:=reexport,
+ org.eclipse.equinox.p2.metadata;visibility:=reexport,
+ org.eclipse.equinox.p2.discovery;visibility:=reexport,
+ org.eclipse.equinox.p2.repository;visibility:=reexport,
+ org.eclipse.equinox.p2.core;visibility:=reexport,
+ org.eclipse.equinox.p2.engine;visibility:=reexport,
  org.eclipse.e4.ui.model.workbench;visibility:=reexport,
- org.eclipse.e4.ui.workbench;bundle-version="1.0.0";visibility:=reexport,
+ org.eclipse.e4.ui.workbench;visibility:=reexport,
  org.eclipse.core.expressions;visibility:=reexport,
- org.eclipse.e4.core.contexts;bundle-version="1.6.0";visibility:=reexport,
- org.eclipse.osgi;bundle-version="3.12.100";visibility:=reexport,
- org.eclipse.equinox.ds;bundle-version="1.5.0";visibility:=reexport,
- org.eclipse.equinox.util;bundle-version="1.0.500";visibility:=reexport,
- org.eclipse.equinox.event;bundle-version="1.4.0";visibility:=reexport,
- org.eclipse.ui.themes;bundle-version="1.2.1";visibility:=reexport,
- org.txm.libs.batik;bundle-version="0.0.0";visibility:=reexport,
+ org.eclipse.e4.core.contexts;visibility:=reexport,
+ org.eclipse.osgi;visibility:=reexport,
+ org.eclipse.equinox.event;visibility:=reexport,
+ org.eclipse.ui.themes;visibility:=reexport,
+ org.eclipse.ui.views;visibility:=reexport,
+ org.eclipse.equinox.p2.discovery.compatibility;visibility:=reexport,
+ org.eclipse.e4.ui.workbench.renderers.swt;visibility:=reexport,
+ org.eclipse.ui.net;visibility:=reexport,
+ org.txm.libs.batik;visibility:=reexport,
  org.txm.libs.args4j;bundle-version="1.0.0";visibility:=reexport,
- org.txm.tokenizer.core;bundle-version="1.0.0";visibility:=reexport,
+ org.txm.annotation.core;visibility:=reexport,
+ org.txm.groovy.core;visibility:=reexport,
  org.txm.searchengine.cqp.core;bundle-version="1.1.0";visibility:=reexport,
  org.txm.statsengine.core;visibility:=reexport,
- org.txm.annotation.core;visibility:=reexport,
- org.eclipse.ui.views;bundle-version="3.9.0";visibility:=reexport,
- org.txm.groovy.core;visibility:=reexport,
+ org.txm.tokenizer.core;bundle-version="1.0.0";visibility:=reexport,
  org.txm.treetagger.core;visibility:=reexport,
- org.eclipse.equinox.p2.discovery.compatibility;bundle-version="1.0.201";visibility:=reexport,
- org.eclipse.e4.ui.workbench.renderers.swt;visibility:=reexport,
  javax.annotation;bundle-version="1.2.0";visibility:=reexport,
- org.eclipse.ui.net;bundle-version="1.3.300"
+ org.eclipse.ui.navigator;visibility:=reexport,
+ org.apache.felix.scr;bundle-version="2.2.2";visibility:=reexport,
+ org.eclipse.equinox.simpleconfigurator;bundle-version="1.4.100";visibility:=reexport,
+ org.osgi.service.cm;bundle-version="1.6.1";visibility:=reexport,
+ org.osgi.service.metatype;bundle-version="1.4.1";visibility:=reexport,
+ org.osgi.service.component;bundle-version="1.5.0";visibility:=reexport,
+ org.osgi.service.component.annotations;bundle-version="1.5.0";visibility:=reexport,
+ org.eclipse.equinox.simpleconfigurator.manipulator;bundle-version="2.2.0",
+ org.eclipse.e4.ui.widgets;bundle-version="1.3.0";visibility:=reexport,
+ org.eclipse.e4.ui.workbench.addons.swt;bundle-version="1.4.400";visibility:=reexport,
+ org.eclipse.e4.ui.workbench.swt;bundle-version="0.16.600";visibility:=reexport,
+ org.eclipse.debug.core;bundle-version="3.20.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.txm.rcp.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.txm.rcp
 
Index: TXM/trunk/org.txm.rcp/splash.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.rcp/icons/functions/import_data.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.rcp/icons/functions/export_parameters.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.rcp/icons/functions/export_data.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.rcp/icons/functions/import_parameters.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.rcp/icons/objects/start.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.rcp/icons/logo/TXM logo 16x16 8-bit.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.rcp/icons/logo/TXM logo 48x48 8-bit.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.rcp/icons/logo
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.rcp/OSGI-INF/l10n/bundle.properties
===================================================================
--- TXM/trunk/org.txm.rcp/OSGI-INF/l10n/bundle.properties	(revision 3627)
+++ TXM/trunk/org.txm.rcp/OSGI-INF/l10n/bundle.properties	(revision 3628)
@@ -170,7 +170,7 @@
 command.label.42         = Show hidden parents
 command.label.43         = Console
 command.label.44         = Delete
-command.label.45         = Edit...
+command.label.45         = Edit file...
 command.label.46         = Copy
 command.label.47         = Cut
 command.label.48         = Hide intermediate parents
@@ -212,7 +212,7 @@
 command.label.80         = Open corpus
 command.label.81         = XML-TMX
 command.label.82         = CQP
-command.label.83         = New...
+command.label.83         = New file...
 command.label.84         = Lexicon
 command.label.85         = Clone all
 command.label.86         = Save
@@ -548,7 +548,7 @@
 product.name.0      = TXM
 product.name.1      = TXM
 product.name.2      = TXM
-product.name.3      = TXM 0.8.2
+product.name.3      = TXM 0.8.3
 
 scheme.description = TXM binding scheme
 scheme.name        = TXM binding scheme
Index: TXM/trunk/org.txm.rcp/OSGI-INF/l10n/bundle_fr.properties
===================================================================
--- TXM/trunk/org.txm.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 3627)
+++ TXM/trunk/org.txm.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 3628)
@@ -33,8 +33,8 @@
 command.label.10        = un corpus binaire (.txm)...
 command.label.100       = Trouver pr\u00E9c\u00E9dent
 command.label.101       = Graphique...
-command.label.102       = Commande...
-command.label.103       = Commande...
+command.label.102       = Calcul...
+command.label.103       = Calcul...
 command.label.104       = Supprimer la ligne
 command.label.105       = Fusionner les lignes
 command.label.106       = Exporter la table pour r\u00E9-import
@@ -169,7 +169,7 @@
 command.label.42        = Afficher les parents cach\u00E9s
 command.label.43        = Console
 command.label.44        = Supprimer
-command.label.45        = \u00C9diter...
+command.label.45        = \u00C9diter fichier...
 command.label.46        = Copier
 command.label.47        = Couper
 command.label.48        = Cacher les parents interm\u00E9diaires
@@ -211,7 +211,7 @@
 command.label.80        = Ouvrir le corpus
 command.label.81        = XML-TMX
 command.label.82        = CQP
-command.label.83        = Nouveau...
+command.label.83        = Nouveau fichier...
 command.label.84        = Lexique
 command.label.85        = Cloner tout
 command.label.86        = Enregistrer

Property changes on: TXM/trunk/org.txm.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.treetagger.files.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.treetagger.files.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.treetagger.files.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:19 CEST 2018
-bin.includes=feature.xml
+bin.includes=feature.xml, build.properties

Property changes on: TXM/trunk/org.txm.treetagger.files.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.wordcloud.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.wordcloud.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.wordcloud.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
  xport,org.txm.chartsengine.rcp;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.wordcloud.rcp
 

Property changes on: TXM/trunk/org.txm.wordcloud.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.tigersearch.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.tigersearch.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.tigersearch.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,7 +5,7 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: textometrie.org
 Automatic-Module-Name: org.txm.tigersearch.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Require-Bundle: org.txm.core;visibility:=reexport,
  org.txm.treesearch.core;bundle-version="1.0.0";visibility:=reexport
 Export-Package: org.txm.tigersearch.preferences

Property changes on: TXM/trunk/org.txm.tigersearch.core
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.chartsengine.raster.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.chartsengine.raster.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.raster.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -7,7 +7,7 @@
 Require-Bundle: org.txm.chartsengine.rcp;bundle-version="1.0.0";visibi
  lity:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.chartsengine.raster.rcp
 

Property changes on: TXM/trunk/org.txm.chartsengine.raster.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.partition.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.partition.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.partition.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -9,6 +9,6 @@
  partition.core;bundle-version="1.0.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.partition.rcp
Index: TXM/trunk/org.txm.partition.rcp/src/org/txm/partition/rcp/adapters/PartitionAdapterFactory.java
===================================================================
--- TXM/trunk/org.txm.partition.rcp/src/org/txm/partition/rcp/adapters/PartitionAdapterFactory.java	(revision 3627)
+++ TXM/trunk/org.txm.partition.rcp/src/org/txm/partition/rcp/adapters/PartitionAdapterFactory.java	(revision 3628)
@@ -2,7 +2,6 @@
 package org.txm.partition.rcp.adapters;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.FrameworkUtil;
 import org.txm.rcp.adapters.TXMResultAdapter;
Index: TXM/trunk/org.txm.partition.rcp/src/org/txm/partition/rcp/adapters/PartitionDimensionsAdapterFactory.java
===================================================================
--- TXM/trunk/org.txm.partition.rcp/src/org/txm/partition/rcp/adapters/PartitionDimensionsAdapterFactory.java	(revision 3627)
+++ TXM/trunk/org.txm.partition.rcp/src/org/txm/partition/rcp/adapters/PartitionDimensionsAdapterFactory.java	(revision 3628)
@@ -2,7 +2,6 @@
 package org.txm.partition.rcp.adapters;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.FrameworkUtil;
 import org.txm.partition.core.functions.PartitionDimensions;

Property changes on: TXM/trunk/org.txm.partition.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.annotation.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.annotation.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.annotation.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
  ty:=reexport,org.txm.core;visibility:=reexport,org.txm.edition.rcp;bu
  ndle-version="1.0.0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.annotation.rcp
 

Property changes on: TXM/trunk/org.txm.annotation.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.chartsengine.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.chartsengine.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -7,10 +7,10 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Require-Bundle: org.txm.chartsengine.core;bundle-version="1.0.0";visib
- ility:=reexport,org.txm.rcp;bundle-version="0.8.0";visibility:=reexpo
+ ility:=reexport,org.txm.rcp;bundle-version="0.8.3";visibility:=reexpo
  rt
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.chartsengine.rcp
 
Index: TXM/trunk/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/AdvancedChartEditorToolBar.java
===================================================================
--- TXM/trunk/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/AdvancedChartEditorToolBar.java	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/swt/AdvancedChartEditorToolBar.java	(revision 3628)
@@ -197,10 +197,10 @@
 		if (TBXPreferences.getInstance().getBoolean(TBXPreferences.EXPERT_USER)) {
 			
 			ArrayList<String> chartsEngineNames = new ArrayList<>();
-			ArrayList<ChartCreator> allChartCreators = new ArrayList<>();
+			ArrayList<ChartCreator<?,?>> allChartCreators = new ArrayList<>();
 			
 			for (ChartsEngine engine : ChartsEnginesManager.getChartsEngines()) {
-				for (ChartCreator creator : engine.getChartCreators(this.getEditorPart().getResult())) {
+				for (ChartCreator<?,?> creator : engine.getChartCreators(this.getEditorPart().getResult())) {
 					chartsEngineNames.add(engine.getName());
 					allChartCreators.add(creator);
 				}
@@ -321,6 +321,7 @@
 		if (renderingModeCombo != null) {
 			renderingModeCombo.addSelectionListener(listener);
 		}
+		
 		fontCombo.addSelectionListener(listener);
 		fontSizeCombo.addSelectionListener(listener);
 		fontStyleCombo.addSelectionListener(listener);
Index: TXM/trunk/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ZoomInChartView.java
===================================================================
--- TXM/trunk/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ZoomInChartView.java	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/ZoomInChartView.java	(revision 3628)
@@ -20,7 +20,7 @@
 	
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ChartEditor chartEditor = SWTChartsComponentsProvider.getActiveChartEditor(event);
+		ChartEditor<?> chartEditor = SWTChartsComponentsProvider.getActiveChartEditor(event);
 		
 		try {
 			Point p = chartEditor.getChartComposite().getSize();
Index: TXM/trunk/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/CopyChartViewToClipboard.java
===================================================================
--- TXM/trunk/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/CopyChartViewToClipboard.java	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/handlers/CopyChartViewToClipboard.java	(revision 3628)
@@ -3,6 +3,7 @@
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.txm.chartsengine.core.results.ChartResult;
 import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
 import org.txm.chartsengine.rcp.editors.ChartEditor;
 import org.txm.utils.logger.Log;
@@ -18,7 +19,7 @@
 
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ChartEditor chartEditor = SWTChartsComponentsProvider.getActiveChartEditor(event);
+		ChartEditor<? extends ChartResult> chartEditor = SWTChartsComponentsProvider.getActiveChartEditor(event);
 		chartEditor.copyChartViewToClipboard();
 		
 		Log.info("Chart view copied to clipboard.");
Index: TXM/trunk/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java
===================================================================
--- TXM/trunk/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java	(revision 3628)
@@ -305,7 +305,7 @@
 	 * @param style
 	 * @return the composite
 	 */
-	public abstract ChartComposite createComposite(ChartEditor chartEditor, Composite parent);
+	public abstract ChartComposite createComposite(ChartEditor<?> chartEditor, Composite parent);
 	
 	
 	/**

Property changes on: TXM/trunk/org.txm.chartsengine.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.cooccurrence.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.cooccurrence.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.cooccurrence.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
  bility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.cooccurrence.core
 

Property changes on: TXM/trunk/org.txm.cooccurrence.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.python.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.python.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.python.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,7 +5,7 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: textometrie.org
 Automatic-Module-Name: org.txm.python.rcp
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Require-Bundle: org.txm.python.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.rcp;bundle-version="0.8.2"
+ org.txm.rcp;bundle-version="0.8.3"
 Export-Package: org.txm.python.rcp

Property changes on: TXM/trunk/org.txm.python.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.concordance.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.concordance.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.concordance.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
  isibility:=reexport,org.txm.statsengine.r.core;bundle-version="1.0.0"
  ;visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometry.org
 Automatic-Module-Name: org.txm.concordance.core
 

Property changes on: TXM/trunk/org.txm.concordance.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.searchengine.cqp.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:16 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.searchengine.cqp.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.searchengine.cqp.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.cqp.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       SearchEngine
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -42,7 +42,7 @@
       <import plugin="org.txm.core"/>
       <import plugin="org.txm.searchengine.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.libs.cqp" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
    </requires>
 

Property changes on: TXM/trunk/org.txm.searchengine.cqp.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.libs.javafx.win32/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.javafx.win32/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.javafx.win32/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.txm.libs.javafx.win32
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.txm.libs.javafx.win32
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-ClassPath: jfxswt.jar,
  jfxrt.jar
 Export-Package: com.sun.deploy.uitoolkit.impl.fx,

Property changes on: TXM/trunk/org.txm.libs.javafx.win32
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.chartsengine.graphstream.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.chartsengine.graphstream.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.graphstream.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -7,11 +7,11 @@
 Bundle-Version: 1.0.0.qualifier
 Require-Bundle: org.txm.chartsengine.graphstream.core;bundle-version="
  1.0.0";visibility:=reexport,org.txm.chartsengine.rcp;bundle-version="
- 1.0.0";visibility:=reexport,org.txm.rcp;bundle-version="0.8.0";visibi
+ 1.0.0";visibility:=reexport,org.txm.rcp;bundle-version="0.8.3";visibi
  lity:=reexport,org.txm.cooccurrence.core;bundle-version="1.0.0";visib
  ility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.txm.chartsengine.graphstream.rcp
 

Property changes on: TXM/trunk/org.txm.chartsengine.graphstream.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java
===================================================================
--- TXM/trunk/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java	(revision 3627)
+++ TXM/trunk/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/RWorkspace.java	(revision 3628)
@@ -1537,7 +1537,7 @@
 	 * @throws RException the r exception
 	 * @throws REXPMismatchException the rEXP mismatch exception
 	 */
-	public REXP safeEval(String expr) throws RserveException, RException, REXPMismatchException {
+	public synchronized REXP safeEval(String expr) throws RserveException, RException, REXPMismatchException {
 		if (logging && inputLogger != null) {
 			inputLogger.printMessage(expr);
 		}
Index: TXM/trunk/org.txm.statsengine.r.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.statsengine.r.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.statsengine.r.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -12,7 +12,7 @@
  =reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.statsengine.r.core
 

Property changes on: TXM/trunk/org.txm.statsengine.r.core
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.libs.cqp.win32/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.cqp.win32/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.cqp.win32/META-INF/MANIFEST.MF	(revision 3628)
@@ -3,9 +3,9 @@
 Bundle-Name: CQP.win32
 Bundle-Version: 1.1.0.qualifier
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Eclipse-PlatformFilter: (osgi.os=win32)
 Bundle-Vendor: Textometrie.org
 Fragment-Host: org.txm.libs.cqp
 Automatic-Module-Name: org.txm.libs.cqp.win32
-
+Eclipse-BundleShape: dir

Property changes on: TXM/trunk/org.txm.libs.cqp.win32
___________________________________________________________________
Added: svn:ignore
   + target



Property changes on: TXM/trunk/org.txm.udpipe.core
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.statsengine.r.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.statsengine.r.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.statsengine.r.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:17 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.statsengine.r.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.statsengine.r.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.statsengine.r.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Statistic engine
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -41,7 +41,7 @@
       <import plugin="org.txm.statsengine.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.libs.rserve"/>
       <import plugin="org.txm.statsengine.r.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
    </requires>
 
    <plugin

Property changes on: TXM/trunk/org.txm.statsengine.r.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.groovy.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.groovy.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.groovy.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:10 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.groovy.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.groovy.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.groovy.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="Groovy"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Groovy scripts and macros
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -37,7 +37,7 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.core" version="0.8.3" match="greaterOrEqual"/>
    </requires>
 
    <plugin

Property changes on: TXM/trunk/org.txm.groovy.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.ahc.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.ahc.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.ahc.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,6 +10,6 @@
  xport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 

Property changes on: TXM/trunk/org.txm.ahc.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.lexicaltable.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.lexicaltable.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.lexicaltable.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:11 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.lexicaltable.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.lexicaltable.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.lexicaltable.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="LexicalTable"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Lexical Table
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.lexicaltable.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.cql2lsa.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.cql2lsa.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.cql2lsa.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,7 +5,7 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: %Bundle-Name
 Require-Bundle: org.txm.core;bundle-version="0.7.0";visibility:=reexpo
- rt,org.txm.rcp;bundle-version="0.8.0";visibility:=reexport,org.eclips
+ rt,org.txm.rcp;bundle-version="0.8.3";visibility:=reexport,org.eclips
  e.ui;visibility:=reexport,org.eclipse.core.runtime;visibility:=reexpo
  rt,org.eclipse.ui.editors;bundle-version="3.8.100";visibility:=reexpo
  rt,org.eclipse.core.expressions;bundle-version="3.4.500";visibility:=
@@ -15,7 +15,7 @@
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-Activator: cql2lsarcp.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.cql2lsa.rcp
 

Property changes on: TXM/trunk/org.txm.cql2lsa.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.edition.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.edition.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.edition.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:09 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.edition.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.edition.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.edition.feature/feature.xml	(revision 3628)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Edition editor for multi-edition corpora
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
+      TXM 0.8.3
 Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of

Property changes on: TXM/trunk/org.txm.edition.feature
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.perl.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.perl.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.perl.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,6 +5,6 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: textometrie.org
 Automatic-Module-Name: org.txm.perl.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.txm.core;bundle-version="0.8.2";visibility:=reexport
+Bundle-RequiredExecutionEnvironment: JavaSE-16
+Require-Bundle: org.txm.core;bundle-version="0.8.3";visibility:=reexport
 Export-Package: org.txm.perl.core

Property changes on: TXM/trunk/org.txm.perl.core
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.index.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.index.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.index.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -9,7 +9,7 @@
  org.txm.links.rcp;bundle-version="1.0.0";visibility:=reexport,
  org.txm.index.core;bundle-version="1.0.0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.index.rcp
 
Index: TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java
===================================================================
--- TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java	(revision 3627)
+++ TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/editors/PartitionIndexEditor.java	(revision 3628)
@@ -28,8 +28,10 @@
 package org.txm.index.rcp.editors;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -354,6 +356,13 @@
 			
 			@Override
 			public void widgetSelected(SelectionEvent e) {
+				
+				List<Line> sel = viewer.getStructuredSelection().toList();
+				HashSet<String> lineNames = new HashSet<String>();
+				for (Line l : sel) {
+					lineNames.add(l.getSignature());
+				}
+				
 				StatusLine.setMessage(TXMUIMessages.sortingColumn);
 				if (viewer.getTable().getSortColumn() != unitColumn) {
 					viewer.getTable().setSortColumn(unitColumn);
@@ -373,6 +382,16 @@
 				
 				StatusLine.setMessage(TXMUIMessages.sortDone);
 				fillResultArea();
+				
+				if (lineNames.size() > 0) {
+					List<Line> newLines = (List<Line>) viewer.getInput();
+					List<Line> newSelection = new ArrayList<Line>();
+					for (Line l : newLines) {
+						if (lineNames.contains(l.getSignature())) newSelection.add(l);
+						if (lineNames.size() == 0) break;
+					}
+					viewer.setSelection(new StructuredSelection(newSelection));
+				}
 			}
 			
 			@Override
@@ -421,6 +440,13 @@
 				
 				@Override
 				public void widgetSelected(SelectionEvent e) {
+					
+					List<Line> sel = viewer.getStructuredSelection().toList();
+					HashSet<String> lineNames = new HashSet<String>();
+					for (Line l : sel) {
+						lineNames.add(l.getSignature());
+					}
+					
 					if (viewer.getTable().getSortColumn() != freqColumn) {
 						viewer.getTable().setSortColumn(freqColumn);
 						viewer.getTable().setSortDirection(SWT.UP);
@@ -438,6 +464,16 @@
 					}
 					StatusLine.setMessage(TXMUIMessages.sortDone);
 					fillResultArea();
+					
+					if (lineNames.size() > 0) {
+						List<Line> newLines = (List<Line>) viewer.getInput();
+						List<Line> newSelection = new ArrayList<Line>();
+						for (Line l : newLines) {
+							if (lineNames.contains(l.getSignature())) newSelection.add(l);
+							if (lineNames.size() == 0) break;
+						}
+						viewer.setSelection(new StructuredSelection(newSelection));
+					}
 				}
 				
 				@Override
Index: TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java
===================================================================
--- TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java	(revision 3627)
+++ TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java	(revision 3628)
@@ -28,8 +28,10 @@
 package org.txm.index.rcp.editors;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -80,73 +82,73 @@
  * @author mdecorde
  */
 public class IndexEditor extends TXMEditor<Index> {
-	
+
 	/** The index. */
 	protected Index index;
-	
+
 	// params
 	/** The query label. */
 	protected Label queryLabel;
-	
+
 	// infos
 	/** The navigation area. */
 	protected NavigationWidget navigationArea;
-	
+
 	/** The l fmin info. */
 	protected Label lFminInfo;
-		
+
 	/** The line table viewer. */
 	protected TableViewer viewer;
-	
+
 	/** The n column. */
 	protected TableColumn nColumn;
-	
+
 	/** The unit column. */
 	protected TableColumn unitColumn;
-	
+
 	/** The freq column. */
 	protected TableColumn freqColumn;
-	
+
 	/** The separator column. */
 	protected TableColumn separatorColumn;
-	
-	
+
+
 	/** The title. */
 	String title;
-	
+
 	/** The query widget. */
 	@Parameter(key = TXMPreferences.QUERY)
 	protected AssistedChoiceQueryWidget queryWidget;
-	
+
 	/**
 	 * Minimum frequency filtering spinner.
 	 */
 	@Parameter(key = TXMPreferences.F_MIN)
 	protected Spinner fMinSpinner;
-	
+
 	/**
 	 * Maximum frequency filtering spinner.
 	 */
 	@Parameter(key = TXMPreferences.F_MAX)
 	protected Spinner fMaxSpinner;
-	
+
 	/**
 	 * Maximum number of lines filtering.
 	 */
 	@Parameter(key = TXMPreferences.V_MAX)
 	protected Spinner vMaxSpinner;
-	
-	
+
+
 	/** The N ligne p page spinner. */
 	@Parameter(key = TXMPreferences.N_LINES_PER_PAGE)
 	protected Spinner nLinesPerPageSpinner;
-	
+
 	/**
 	 * Word properties selector.
 	 */
 	@Parameter(key = TXMPreferences.UNIT_PROPERTIES)
 	protected PropertiesSelector<WordProperty> propertiesSelector;
-	
+
 	/**
 	 * Creates the part control.
 	 *
@@ -156,22 +158,22 @@
 	 */
 	@Override
 	public void _createPartControl() throws CqiClientException {
-		
-		
+
+
 		this.index = this.getResult();
-		
+
 		// Computing listeners
 		ComputeSelectionListener computeSelectionListener = new ComputeSelectionListener(this);
 		ComputeKeyListener computeKeyListener = new ComputeKeyListener(this);
-		
+
 		Composite extendedParametersComposite = this.getExtendedParametersGroup();
 		// extendedParametersComposite.setLayout(new FormLayout());
-		
+
 		// info&navigation panel
 		final GLComposite infosArea = this.getBottomToolbar().installGLComposite(IndexUIMessages.infos, 1, false);
 		infosArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
 		infosArea.getLayout().numColumns = 5; // nav panel + labels
-		
+
 		// on créé une Query, ici le pivot de la concordance est "[]"
 		// Query Area: query itself + view properties
 		// Composite queryArea = new Composite(extendedParametersComposite, SWT.NONE);
@@ -183,21 +185,21 @@
 		// queryArea.setLayoutData(queryLayoutData);
 		//
 		// queryArea.setLayout(new GridLayout(4, false));
-		
+
 		// | Query: [ (v)] [Search] |
-		
-		
+
+
 		// Main parameters
 		// Query
 		this.getMainParametersComposite().getLayout().numColumns = 3;
 		// make the zone expandable to display the longest query field
 		this.getMainParametersComposite().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
-		
+
 		// Query:
 		queryLabel = new Label(this.getMainParametersComposite(), SWT.NONE);
 		queryLabel.setText(TXMCoreMessages.common_query);
 		queryLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, true));
-		
+
 		// [ (v)]
 		queryWidget = new AssistedChoiceQueryWidget(this.getMainParametersComposite(), SWT.DROP_DOWN, index.getCorpus());
 		GridData layoutData = new GridData(GridData.VERTICAL_ALIGN_CENTER);
@@ -206,7 +208,7 @@
 		queryWidget.setLayoutData(layoutData);
 		queryWidget.addKeyListener(computeKeyListener);
 		queryWidget.getQueryWidget().addModifyListener(computeKeyListener);
-		
+
 		// Word properties selector
 		propertiesSelector = new PropertiesSelector<>(this.getMainParametersComposite(), SWT.NONE);
 		propertiesSelector.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
@@ -221,25 +223,25 @@
 		}
 		// Listener
 		propertiesSelector.addSelectionListener(computeSelectionListener);
-		
-		
+
+
 		// Extended parameters
-		
+
 		// Filters
 		//CustomThresholdsGroup thresholdsGroup = new CustomThresholdsGroup(this.getExtendedParametersGroup(), this, new CustomThresholdsGroup.Configuration("F", 0, 100, 0, true, true), new CustomThresholdsGroup.Configuration("V", 0, 100, 0, false, true));
 		ThresholdsGroup thresholdsGroup = new ThresholdsGroup(this.getExtendedParametersGroup(), this, true);
-		
+
 		this.fMinSpinner = thresholdsGroup.getFMinSpinner();
 		this.fMaxSpinner = thresholdsGroup.getFMaxSpinner();
 		this.vMaxSpinner = thresholdsGroup.getVMaxSpinner();
-		
+
 		CQPCorpus corpus = getResult().getFirstParent(MainCorpus.class);
 		if (corpus != null) {
 			this.vMaxSpinner.setMaximum(corpus.getSize());
 			this.fMaxSpinner.setMaximum(corpus.getSize());
 			this.fMinSpinner.setMaximum(corpus.getSize());
 		}
-		
+
 		// FIXME: SJ: we should create a widget class for the number of results per page
 		// Number of results per page
 		LabeledSpinner numberOfResultsPerPage = new LabeledSpinner(this.getExtendedParametersGroup(), this, IndexUIMessages.pageSize);
@@ -248,18 +250,18 @@
 		this.nLinesPerPageSpinner.setMaximum(99999);
 		this.nLinesPerPageSpinner.setIncrement(1);
 		this.nLinesPerPageSpinner.setPageIncrement(100);
-		
-		
-		
+
+
+
 		// Bottom tool bar
 		navigationArea = new NavigationWidget(infosArea, SWT.NONE);
 		navigationArea.setLayoutData(new GridData(SWT.CENTER, SWT.FILL, true, false));
-		
+
 		navigationArea.addFirstListener(new SelectionListener() {
-			
+
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
-			
+
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				index.setTopLine(0);
@@ -270,27 +272,27 @@
 			}
 		});
 		navigationArea.addLastListener(new SelectionListener() {
-			
+
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
-			
+
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int i = (index.getV() / nLinesPerPageSpinner.getSelection());
 				int top = i * nLinesPerPageSpinner.getSelection();
-				
+
 				index.setTopLine(top);
 				fillResultArea();
-				
+
 				viewer.getTable().select(0);
 				viewer.getTable().showSelection();
 			}
 		});
 		navigationArea.addNextListener(new SelectionListener() {
-			
+
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
-			
+
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				index.setTopLine(index.getTopIndex() + index.getNLinesPerPage());
@@ -300,10 +302,10 @@
 			}
 		});
 		navigationArea.addPreviousListener(new SelectionListener() {
-			
+
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
-			
+
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int top = index.getTopIndex() - index.getNLinesPerPage();
@@ -316,23 +318,23 @@
 				viewer.getTable().showSelection();
 			}
 		});
-		
-		
+
+
 		lFminInfo = new Label(infosArea, SWT.NONE);
 		lFminInfo.setText(""); //$NON-NLS-1$
 		// lFminInfo.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
-		
-		
-		
+
+
+
 		// Result area
 		Composite resultArea = this.getResultArea();
-		
+
 		viewer = new TableViewer(resultArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER | SWT.VIRTUAL);
-		
+
 		viewer.getTable().setLinesVisible(true);
 		viewer.getTable().setHeaderVisible(true);
 		viewer.getTable().addKeyListener(new TableKeyListener(viewer));
-		
+
 		String fontName = index.getCorpus().getProject().getFont();
 		if (fontName != null && fontName.length() > 0) {
 			Font old = viewer.getTable().getFont();
@@ -341,25 +343,33 @@
 			Font font = new Font(Display.getCurrent(), fontName, fD.getHeight(), fD.getStyle());
 			viewer.getTable().setFont(font);
 		}
-		
+
 		viewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
-		
+
 		viewer.setLabelProvider(new LineLabelProvider(viewer.getTable()));
 		viewer.setContentProvider(new LineContentProvider());
 		viewer.setInput(new ArrayList<Property>());
-		
+
 		nColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
 		nColumn.setText(" "); //$NON-NLS-1$
 		nColumn.pack();
-		
+
 		unitColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
 		unitColumn.setText(TXMCoreMessages.common_units);
 		unitColumn.setToolTipText(TXMCoreMessages.common_units);
 		unitColumn.setWidth(300);
 		unitColumn.addSelectionListener(new SelectionListener() {
-			
+
 			@Override
 			public void widgetSelected(SelectionEvent e) {
+				
+				
+				List<Line> sel = viewer.getStructuredSelection().toList();
+				HashSet<String> lineNames = new HashSet<String>();
+				for (Line l : sel) {
+					lineNames.add(l.getSignature());
+				}
+				
 				StatusLine.setMessage(TXMUIMessages.sortingColumn);
 				if (viewer.getTable().getSortColumn() != unitColumn) {
 					viewer.getTable().setSortColumn(unitColumn);
@@ -376,23 +386,41 @@
 						index.sortLines(SortMode.UNITFREQ, false);
 					}
 				}
-				
+
 				StatusLine.setMessage(TXMUIMessages.sortDone);
 				fillResultArea();
+				
+				if (lineNames.size() > 0) {
+					List<Line> newLines = (List<Line>) viewer.getInput();
+					List<Line> newSelection = new ArrayList<Line>();
+					for (Line l : newLines) {
+						if (lineNames.contains(l.getSignature())) newSelection.add(l);
+						if (lineNames.size() == 0) break;
+					}
+					viewer.setSelection(new StructuredSelection(newSelection));
+				}
 			}
-			
+
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
 		});
-		
+
 		freqColumn = new TableColumn(viewer.getTable(), SWT.RIGHT);
 		freqColumn.setText(TXMCoreMessages.common_frequency);
 		freqColumn.setToolTipText(TXMCoreMessages.common_frequency);
 		freqColumn.setWidth(100);
 		freqColumn.addSelectionListener(new SelectionListener() {
-			
+
 			@Override
 			public void widgetSelected(SelectionEvent e) {
+
+				List<Line> sel = viewer.getStructuredSelection().toList();
+				HashSet<String> lineNames = new HashSet<String>();
+				for (Line l : sel) {
+					lineNames.add(l.getSignature());
+				}
+
+				System.out.println("sellines: "+sel);
 				if (viewer.getTable().getSortColumn() != freqColumn) {
 					viewer.getTable().setSortColumn(freqColumn);
 					viewer.getTable().setSortDirection(SWT.UP);
@@ -410,62 +438,72 @@
 				}
 				StatusLine.setMessage(TXMUIMessages.sortDone);
 				fillResultArea();
+
+				if (lineNames.size() > 0) {
+					List<Line> newLines = (List<Line>) viewer.getInput();
+					List<Line> newSelection = new ArrayList<Line>();
+					for (Line l : newLines) {
+						if (lineNames.contains(l.getSignature())) newSelection.add(l);
+						if (lineNames.size() == 0) break;
+					}
+					viewer.setSelection(new StructuredSelection(newSelection));
+				}
 			}
-			
+
 			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {}
 		});
-		
+
 		separatorColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
 		separatorColumn.setText(""); //$NON-NLS-1$
 		separatorColumn.pack();
-		
-		
-		
+
+
+
 		extendedParametersComposite.pack();
-		
+
 		// Add double click, "Send to" command
 		TXMEditor.addDoubleClickCommandListener(viewer.getTable(), 1, "org.txm.concordance.rcp.handlers.ComputeConcordance"); //$NON-NLS-1$
 		TXMEditor.addDoubleClickCommandListener(viewer.getTable(), 2, viewer.getTable().getColumnCount() - 1, "org.txm.progression.rcp.handlers.ComputeProgression"); //$NON-NLS-1$
-		
+
 		// Register the context menu
 		TXMEditor.initContextMenu(this.viewer.getTable(), this.getSite(), this.viewer);
 		TXMEditor.packColumns(this.viewer);
 		setFocus();
-		
+
 	}
-	
-	
-	
-	
+
+
+
+
 	@Override
 	public void updateResultFromEditor() {
 		// nothing to do
 	}
-	
-	
+
+
 	/**
 	 * Computes index.
 	 */
 	@Override
 	public void updateEditorFromResult(final boolean update) {
-		
+
 		QueriesView.refresh();
 		RVariablesView.refresh();
-		
+
 		if (!queryWidget.isDisposed()) {
 			queryWidget.memorize();
 		}
-		
+
 		fillResultArea();
-		
+
 		TXMEditor.packColumns(this.viewer);
-		
+
 		viewer.getTable().setFocus();
 	}
-	
-	
-	
+
+
+
 	/**
 	 * Fill result area using the index top and index number of results per page parameters.
 	 *
@@ -473,10 +511,10 @@
 	public void fillResultArea() {
 		// System.out.println("call fill from "+from+" to "+to);
 		int from = index.getTopIndex();
-		
+
 		int to = from + index.getNLinesPerPage();
 		to = Math.min(to, index.getV());
-		
+
 		List<Line> lines = null;
 		if (index.getV() > 0) {
 			lines = index.getLines(from, to);
@@ -484,16 +522,16 @@
 		else {
 			lines = new ArrayList<>();
 		}
-		
+
 		navigationArea.setInfoLineText(Integer.toString(from + 1), NLS.bind("{0} / {1}", to, index.getV())); //$NON-NLS-1$
 		navigationArea.setPreviousEnabled(from > 0);
 		navigationArea.setFirstEnabled(from > 0);
 		navigationArea.setNextEnabled(to < index.getV());
 		navigationArea.setLastEnabled(to < index.getV());
-		
+
 		lFminInfo.setText(TXMCoreMessages.bind(IndexUIMessages.tP0vP1fminP2fmaxP3, index.getT(), index.getV(), index.getFmin(), index.getFmax()));
 		lFminInfo.getParent().layout();
-		
+
 		String unitColumnHeader = ""; //$NON-NLS-1$
 		for (Property p : index.getProperties()) {
 			unitColumnHeader += p.getName() + index.getPropertySeparator();
@@ -502,17 +540,17 @@
 			unitColumnHeader = unitColumnHeader.substring(0, unitColumnHeader.length() - 1);
 		}
 		unitColumn.setText(unitColumnHeader);
-		
+
 		viewer.setInput(lines);
 		if (from == 0) {
 			viewer.getTable().setTopIndex(0);
 		}
-		
+
 		// Refresh and pack the columns
 		TXMEditor.packColumns(viewer);
-		
+
 	}
-	
+
 	/**
 	 * Sets the focus.
 	 *
@@ -525,7 +563,7 @@
 		}
 		StatusLine.setMessage(IndexUIMessages.openingTheIndexResults);
 	}
-	
+
 	/**
 	 * Gets the corpus of the index.
 	 *
@@ -534,7 +572,7 @@
 	public CQPCorpus getCorpus() {
 		return index.getCorpus();
 	}
-	
+
 	/**
 	 * Gets the query of the query widget.
 	 * 
@@ -548,7 +586,7 @@
 
 
 	public TableViewer getTableViewer() {
-		
+
 		return viewer;
 	}
 }
Index: TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/adapters/LexiconAdapterFactory.java
===================================================================
--- TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/adapters/LexiconAdapterFactory.java	(revision 3627)
+++ TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/adapters/LexiconAdapterFactory.java	(revision 3628)
@@ -2,7 +2,6 @@
 package org.txm.index.rcp.adapters;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.FrameworkUtil;
 import org.txm.index.core.functions.Lexicon;
Index: TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/adapters/PartitionIndexAdapterFactory.java
===================================================================
--- TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/adapters/PartitionIndexAdapterFactory.java	(revision 3627)
+++ TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/adapters/PartitionIndexAdapterFactory.java	(revision 3628)
@@ -22,15 +22,15 @@
 			"platform:/plugin/" + FrameworkUtil.getBundle(PartitionIndexAdapterFactory.class).getSymbolicName() + "/icons/partitionindex.png"); //$NON-NLS-1$ //$NON-NLS-2$
 	
 	@Override
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		if (this.canAdapt(adapterType) && adaptableObject instanceof PartitionIndex) {
-			return new TXMResultAdapter() {
+			return adapterType.cast(new TXMResultAdapter() {
 				
 				@Override
 				public ImageDescriptor getImageDescriptor(Object object) {
 					return ICON;
 				}
-			};
+			});
 		}
 		return null;
 	}
Index: TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/adapters/IndexAdapterFactory.java
===================================================================
--- TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/adapters/IndexAdapterFactory.java	(revision 3627)
+++ TXM/trunk/org.txm.index.rcp/src/org/txm/index/rcp/adapters/IndexAdapterFactory.java	(revision 3628)
@@ -2,13 +2,11 @@
 package org.txm.index.rcp.adapters;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.FrameworkUtil;
 import org.txm.index.core.functions.Index;
 import org.txm.rcp.adapters.TXMResultAdapter;
 import org.txm.rcp.adapters.TXMResultAdapterFactory;
-import org.txm.searchengine.cqp.corpus.CQPLexicon;
 
 
 /**
@@ -24,19 +22,18 @@
 			"platform:/plugin/" + FrameworkUtil.getBundle(IndexAdapterFactory.class).getSymbolicName() + "/icons/index.png"); //$NON-NLS-1$ //$NON-NLS-2$
 	
 	@Override
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		if (this.canAdapt(adapterType) && adaptableObject instanceof Index) {
-			return new TXMResultAdapter() {
+			return adapterType.cast(new TXMResultAdapter() {
 				
 				@Override
 				public ImageDescriptor getImageDescriptor(Object object) {
-					// TODO Auto-generated method stub
 					return ICON;
 				}
-			};
+			});
 		}
 		return null;
 	}
+
 	
-	
 }

Property changes on: TXM/trunk/org.txm.index.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.gson/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.gson/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.gson/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.txm.libs.gson
 Bundle-Version: 2.8.6
 Automatic-Module-Name: org.txm.libs.gson
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-ClassPath: gson-2.8.6.jar,
  .
 Export-Package: com.google.gson,

Property changes on: TXM/trunk/org.txm.libs.gson
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.svn.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.svn.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.svn.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:18 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.svn.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.svn.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.svn.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="SVN"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       SVN access
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.svn.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.xmleditor.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.xmleditor.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.xmleditor.feature/build.properties	(revision 3628)
@@ -1 +1 @@
-bin.includes = feature.xml
+bin.includes = feature.xml, build.properties
Index: TXM/trunk/org.txm.xmleditor.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.xmleditor.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.xmleditor.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Add a XML Editor in TXM
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -37,6 +37,30 @@
       [Enter License Description here.]
    </license>
 
+   <requires>
+      <import plugin="org.eclipse.ui.ide" version="3.12.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.views" version="3.8.0" match="compatible"/>
+      <import plugin="org.eclipse.jface.text" version="3.10.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.10.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.sse.ui" version="1.3.500" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.wst.sse.core" version="1.1.900" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui" version="3.107.0" match="compatible"/>
+      <import plugin="org.eclipse.core.resources" version="3.11.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime" version="3.12.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.uriresolver" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.wst.xml.core" version="1.1.1100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.wst.common.ui" version="1.2.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.wst.validation" version="1.2.700" match="equivalent"/>
+      <import plugin="org.eclipse.wst.validation.ui"/>
+      <import plugin="org.eclipse.core.expressions" version="3.5.0" match="compatible"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.6.0" match="compatible"/>
+      <import plugin="org.txm.rcp" version="0.7.8" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.wst.xml.ui" version="1.1.800" match="greaterOrEqual"/>
+      <import plugin="org.txm.concordance.rcp" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.txm.edition.rcp" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.search"/>
+   </requires>
+
    <plugin
          id="org.txm.xmleditor.rcp"
          download-size="0"

Property changes on: TXM/trunk/org.txm.xmleditor.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.tokenizer.core/build.properties
===================================================================
--- TXM/trunk/org.txm.tokenizer.core/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.tokenizer.core/build.properties	(revision 3628)
@@ -2,7 +2,6 @@
 output..=bin/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml,\
                OSGI-INF/
 source..=src/
 #qualifier=svn
Index: TXM/trunk/org.txm.tokenizer.core/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- TXM/trunk/org.txm.tokenizer.core/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3627)
+++ TXM/trunk/org.txm.tokenizer.core/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3628)
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-groovy.compiler.level=-1
+groovy.compiler.level=40
 groovy.script.filters=**/*.dsld,y,**/*.gradle,n
Index: TXM/trunk/org.txm.tokenizer.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.tokenizer.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.tokenizer.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -8,6 +8,6 @@
  ity:=reexport,org.txm.utils.core;bundle-version="1.0.0";visibility:=r
  eexport,org.eclipse.core.resources;visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 
Index: TXM/trunk/org.txm.tokenizer.core/src/org/txm/tokenizer/SimpleStringTokenizer.groovy
===================================================================
--- TXM/trunk/org.txm.tokenizer.core/src/org/txm/tokenizer/SimpleStringTokenizer.groovy	(revision 3627)
+++ TXM/trunk/org.txm.tokenizer.core/src/org/txm/tokenizer/SimpleStringTokenizer.groovy	(revision 3628)
@@ -137,7 +137,7 @@
 	/**
 	 * Process word.
 	 */
-	public ArrayList<ArrayList<String>> processText(String text) {
+	public List<List<String>> processText(String text) {
 		ArrayList<ArrayList<String>> result = new ArrayList<String>()
 		ArrayList<String> sresult = new ArrayList<String>()
 		if (regSplitWhiteSpaces != null) {
@@ -256,7 +256,7 @@
 			["fr", "C'est un autre test."],
 			[
 				"fr",
-				"C'est une version 0.8.2 un 01:12:12 test vers http://un.site.web.fr, fin."
+				"C'est une version 1.2.3 un 01:12:12 test vers http://un.site.web.fr, fin."
 			],
 			["en", "This is a test."],
 			["en", "It's a test."]

Property changes on: TXM/trunk/org.txm.tokenizer.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.cqp.macosx/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.cqp.macosx/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.cqp.macosx/META-INF/MANIFEST.MF	(revision 3628)
@@ -3,9 +3,10 @@
 Bundle-Name: org.txm.libs.cqp.macosx
 Bundle-Version: 1.1.0.qualifier
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Eclipse-PlatformFilter: (osgi.os=macosx)
 Bundle-Vendor: Textometrie.org
 Fragment-Host: org.txm.libs.cqp
 Automatic-Module-Name: org.txm.libs.cqp.macosx
+Eclipse-BundleShape: dir
 

Property changes on: TXM/trunk/org.txm.libs.cqp.macosx
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.ca.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.ca.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.ca.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
  ca.core;bundle-version="1.0.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.ca.rcp
 

Property changes on: TXM/trunk/org.txm.ca.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.statsengine.r.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.statsengine.r.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.statsengine.r.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -6,11 +6,11 @@
 Bundle-SymbolicName: org.txm.statsengine.r.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: %Bundle-Name
-Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexpor
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3";visibility:=reexpor
  t,org.txm.statsengine.r.core;bundle-version="1.0.0";visibility:=reexp
  ort
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.statsengine.r.rcp
 

Property changes on: TXM/trunk/org.txm.statsengine.r.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.annotation.kr.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.annotation.kr.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.annotation.kr.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -11,7 +11,7 @@
  bility:=reexport,org.txm.annotation.rcp;bundle-version="1.0.0";visibi
  lity:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.annotation.kr.rcp
 

Property changes on: TXM/trunk/org.txm.annotation.kr.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.referencer.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.referencer.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.referencer.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:15 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.referencer.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.referencer.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.referencer.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="Referencer"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       References
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.referencer.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.ruby.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.ruby.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.ruby.feature/build.properties	(revision 3628)
@@ -1 +1 @@
-bin.includes = feature.xml
+bin.includes = feature.xml, build.properties
Index: TXM/trunk/org.txm.ruby.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.ruby.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.ruby.feature/feature.xml	(revision 3628)
@@ -17,8 +17,8 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.core" version="0.8.3" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.txm.ruby.core" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 

Property changes on: TXM/trunk/org.txm.ruby.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.annotation.kr.core/.classpath
===================================================================
--- TXM/trunk/org.txm.annotation.kr.core/.classpath	(revision 3627)
+++ TXM/trunk/org.txm.annotation.kr.core/.classpath	(revision 3628)
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con"
-		path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-	<classpathentry kind="con"
-		path="org.eclipse.pde.core.requiredPlugins">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
-			<accessrule kind="accessible" pattern="**" />
+			<accessrule kind="accessible" pattern="**"/>
 		</accessrules>
 	</classpathentry>
-	<classpathentry kind="src" path="src" />
-	<classpathentry kind="lib" path="libs/hsqldb.jar" />
-	<classpathentry kind="lib"
-		path="libs/postgresql-9.4.1207.jre6.jar" />
-	<classpathentry kind="lib"
-		path="libs/sqlite-jdbc-3.8.11.2.jar" />
-	<classpathentry kind="output" path="bin" />
-</classpath>
\ No newline at end of file
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="libs/postgresql-9.4.1207.jre6.jar"/>
+	<classpathentry kind="lib" path="libs/sqlite-jdbc-3.8.11.2.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: TXM/trunk/org.txm.annotation.kr.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.annotation.kr.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.annotation.kr.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -2,37 +2,59 @@
 Automatic-Module-Name: org.txm.annotation.kr.core
 Bundle-SymbolicName: org.txm.annotation.kr.core;singleton:=true
 Require-Bundle: org.txm.searchengine.cqp.core;visibility:=reexport,
- javax.persistence;bundle-version="2.1.0";visibility:=reexport,
- org.eclipse.persistence.jpa;bundle-version="2.6.0";visibility:=reexport,
- org.eclipse.persistence.jpa.jpql;bundle-version="2.6.0";visibility:=reexport,
  org.txm.annotation.core;visibility:=reexport,
- org.eclipse.persistence.asm;bundle-version="6.0.0";visibility:=reexport
+ org.eclipse.persistence.core,
+ org.eclipse.persistence.jpa,
+ org.eclipse.persistence.asm,
+ org.eclipse.persistence.jpa.jpql,
+ org.eclipse.persistence.antlr,
+ jakarta.persistence
 Meta-Persistence: META-INF/persistence.xml
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
-Export-Package: org.hsqldb,org.hsqldb.auth,org.hsqldb.dbinfo,org.hsqld
- b.error,org.hsqldb.index,org.hsqldb.jdbc,org.hsqldb.jdbc.pool,org.hsq
- ldb.lib,org.hsqldb.lib.java,org.hsqldb.lib.tar,org.hsqldb.map,org.hsq
- ldb.navigator,org.hsqldb.persist,org.hsqldb.resources,org.hsqldb.resu
- lt,org.hsqldb.rights,org.hsqldb.rowio,org.hsqldb.scriptio,org.hsqldb.
- server,org.hsqldb.types,org.hsqldb.util,org.postgresql,org.postgresql
- .copy,org.postgresql.core,org.postgresql.core.v2,org.postgresql.core.
- v3,org.postgresql.ds,org.postgresql.ds.common,org.postgresql.fastpath
- ,org.postgresql.geometric,org.postgresql.gss,org.postgresql.hostchoos
- er,org.postgresql.jdbc,org.postgresql.jdbc2,org.postgresql.jdbc2.opti
- onal,org.postgresql.jdbc3,org.postgresql.largeobject,org.postgresql.o
- sgi,org.postgresql.ssl,org.postgresql.ssl.jdbc4,org.postgresql.sspi,o
- rg.postgresql.translation,org.postgresql.util,org.postgresql.xa,org.s
- qlite,org.sqlite.core,org.sqlite.date,org.sqlite.javax,org.sqlite.jdb
- c3,org.sqlite.jdbc4,org.sqlite.util,org.txm.annotation.kr.core,org.tx
- m.annotation.kr.core.conversion,org.txm.annotation.kr.core.preference
- s,org.txm.annotation.kr.core.repository,org.txm.annotation.kr.core.st
- orage.temporary,org.txm.annotation.kr.core.temporary
+Export-Package: org.postgresql,
+ org.postgresql.copy,
+ org.postgresql.core,
+ org.postgresql.core.v2,
+ org.postgresql.core.v3,
+ org.postgresql.ds,
+ org.postgresql.ds.common,
+ org.postgresql.fastpath,
+ org.postgresql.geometric,
+ org.postgresql.gss,
+ org.postgresql.hostchooser,
+ org.postgresql.jdbc,
+ org.postgresql.jdbc2,
+ org.postgresql.jdbc2.optional,
+ org.postgresql.jdbc3,
+ org.postgresql.largeobject,
+ org.postgresql.osgi,
+ org.postgresql.ssl,
+ org.postgresql.ssl.jdbc4,
+ org.postgresql.sspi,
+ org.postgresql.translation,
+ org.postgresql.util,
+ org.postgresql.xa,
+ org.sqlite,
+ org.sqlite.core,
+ org.sqlite.date,
+ org.sqlite.javax,
+ org.sqlite.jdbc3,
+ org.sqlite.jdbc4,
+ org.sqlite.util,
+ org.txm.annotation.kr.core,
+ org.txm.annotation.kr.core.conversion,
+ org.txm.annotation.kr.core.messages,
+ org.txm.annotation.kr.core.preferences,
+ org.txm.annotation.kr.core.repository,
+ org.txm.annotation.kr.core.storage.temporary,
+ org.txm.annotation.kr.core.temporary
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: KR Annotation Core
-Bundle-ClassPath: .,libs/hsqldb.jar,libs/postgresql-9.4.1207.jre6.jar,
+Bundle-ClassPath: .,
+ libs/postgresql-9.4.1207.jre6.jar,
  libs/sqlite-jdbc-3.8.11.2.jar
 Bundle-Activator: org.txm.annotation.kr.core.Activator
 
Index: TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/AnnotationInjector.java
===================================================================
--- TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/AnnotationInjector.java	(revision 3627)
+++ TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/AnnotationInjector.java	(revision 3628)
@@ -862,8 +862,8 @@
 	
 	public static void main(String[] args) {
 		try {
-			File xmlFile = new File(System.getProperty("user.home"), "TXM-0.8.2/corpora/XMLLINEBREAK/txm/XMLLINEBREAK/test.xml");
-			File outfile = new File(System.getProperty("user.home"), "TXM-0.8.2/corpora/XMLLINEBREAK/txm/XMLLINEBREAK/test-out.xml");
+			File xmlFile = new File(System.getProperty("user.home"), "TXM-0.8.3/corpora/XMLLINEBREAK/txm/XMLLINEBREAK/test.xml");
+			File outfile = new File(System.getProperty("user.home"), "TXM-0.8.3/corpora/XMLLINEBREAK/txm/XMLLINEBREAK/test-out.xml");
 			
 			ArrayList<Annotation> segmentAnnotations = new ArrayList<>();
 			// int starts[] = { 3, 6 };
Index: TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/Annotation.java
===================================================================
--- TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/Annotation.java	(revision 3627)
+++ TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/Annotation.java	(revision 3628)
@@ -1,11 +1,12 @@
 package org.txm.annotation.kr.core;
 
 import java.io.Serializable;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import javax.persistence.*;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.IdClass;
+import javax.persistence.Table;
 
 import org.txm.Toolbox;
 import org.txm.annotation.kr.core.repository.KnowledgeRepository;
Index: TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/storage/temporary/TemporaryAnnotationManager.java
===================================================================
--- TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/storage/temporary/TemporaryAnnotationManager.java	(revision 3627)
+++ TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/storage/temporary/TemporaryAnnotationManager.java	(revision 3628)
@@ -164,7 +164,6 @@
 						}
 						else {
 							// System.out.println(annot.getStart()+"-"+annot.getEnd()+" // "+startPos+"-"+endPos);
-							
 						}
 					}
 				}
@@ -499,6 +498,9 @@
 	}
 	
 	public EntityManager initTemporaryAnnotationDatabase(HashMap<String, Object> properties) {
+		
+		if (em != null) return em;
+		
 		PersistenceProvider pp = new PersistenceProvider();
 		// System.out.println("Check for provider: "+pp.checkForProviderProperty(properties));
 		
@@ -514,7 +516,7 @@
 		emf = pp.createEntityManagerFactory(DatabasePersistenceManager.PERSISTENCE_UNIT_NAME, properties);
 		
 		em = emf.createEntityManager();
-		
+				
 		return em;
 	}
 	
Index: TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/repository/KnowledgeRepository.java
===================================================================
--- TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/repository/KnowledgeRepository.java	(revision 3627)
+++ TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/repository/KnowledgeRepository.java	(revision 3628)
@@ -1,28 +1,20 @@
 package org.txm.annotation.kr.core.repository;
 
 import java.io.File;
-import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-import javax.persistence.spi.PersistenceUnitInfo;
 
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.persistence.config.PersistenceUnitProperties;
-import org.eclipse.persistence.internal.jpa.deployment.JPAInitializer;
-import org.eclipse.persistence.internal.jpa.deployment.SEPersistenceUnitInfo;
 import org.eclipse.persistence.jpa.PersistenceProvider;
-import org.osgi.framework.Bundle;
 import org.txm.Toolbox;
 import org.txm.annotation.kr.core.DatabasePersistenceManager;
-import org.txm.core.preferences.TBXPreferences;
-import org.txm.utils.BundleUtils;
 import org.txm.utils.logger.Log;
 
 public abstract class KnowledgeRepository { // extends Vector<AnnotationType>
@@ -125,7 +117,6 @@
 		
 		// Logger.getLogger("org").setLevel(Level.ALL);
 		PersistenceProvider pp = new PersistenceProvider();
-		
 		emf = pp.createEntityManagerFactory(DatabasePersistenceManager.PERSISTENCE_UNIT_NAME, properties);
 		if (emf == null) {
 			Log.warning(NLS.bind("Error: could not create the ''{0}'' EntityManagerFactory and PersistenceProvider={1}.", DatabasePersistenceManager.PERSISTENCE_UNIT_NAME, pp));
@@ -133,6 +124,7 @@
 		}
 		EntityManager entityManager = (EntityManager) emf.createEntityManager();
 		this.jpaem = entityManager;
+		
 		return entityManager;
 	}
 	
@@ -247,6 +239,7 @@
 	 * @throws Exception
 	 */
 	public List<TypedValue> getValues(AnnotationType type, int limit) throws Exception {
+		
 		TypedQuery<TypedValue> query = jpaem.createQuery("SELECT t FROM TypedValue AS t "
 				+ "WHERE t.PK.typeId LIKE '" + type.getId() + "'", TypedValue.class);
 		if (limit != -1) {
Index: TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/repository/AnnotationType.java
===================================================================
--- TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/repository/AnnotationType.java	(revision 3627)
+++ TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/repository/AnnotationType.java	(revision 3628)
@@ -4,6 +4,8 @@
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Table;
 
 /**
  * An annotation typed defined in a named Knowledge repository
Index: TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/AnnotationPK.java
===================================================================
--- TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/AnnotationPK.java	(revision 3627)
+++ TXM/trunk/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/AnnotationPK.java	(revision 3628)
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.persistence.*;
+import javax.persistence.Embeddable;
 
 @Embeddable
 public class AnnotationPK implements Serializable {
Index: TXM/trunk/org.txm.annotation.kr.core/libs/hsqldb.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.annotation.kr.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.chartsengine.graphstream.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.chartsengine.graphstream.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.graphstream.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
  chartsengine.core;bundle-version="1.0.0";visibility:=reexport,org.txm
  .core;visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.chartsengine.graphstream.core
 

Property changes on: TXM/trunk/org.txm.chartsengine.graphstream.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.treetagger.binaries.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.treetagger.binaries.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.treetagger.binaries.feature/build.properties	(revision 3628)
@@ -1 +1 @@
-bin.includes = feature.xml
+bin.includes = feature.xml, build.properties

Property changes on: TXM/trunk/org.txm.treetagger.binaries.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.lexicaltable.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.lexicaltable.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.lexicaltable.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
  reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.lexicaltable.core
 
Index: TXM/trunk/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/statsengine/r/data/LexicalTableImpl.java
===================================================================
--- TXM/trunk/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/statsengine/r/data/LexicalTableImpl.java	(revision 3627)
+++ TXM/trunk/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/statsengine/r/data/LexicalTableImpl.java	(revision 3628)
@@ -49,7 +49,6 @@
 import org.txm.statsengine.r.core.exceptions.RException;
 import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
 
-import cern.colt.Arrays;
 import cern.colt.matrix.DoubleFactory2D;
 import cern.colt.matrix.DoubleMatrix2D;
 
@@ -402,14 +401,22 @@
 	 */
 	@Override
 	public int getFMin() {
-		List<Integer> freqs = getFreqs();
-		int min = 999999;
-		for (int i : freqs) {
-			if (min > i) {
-				min = i;
-			}
+//		List<Integer> freqs = getFreqs();
+//		int min = 999999;
+//		for (int i : freqs) {
+//			if (min > i) {
+//				min = i;
+//			}
+//		}
+//		return min;
+		
+		try {
+			return rw.eval("min(colSums("+this.symbol+"))").asInteger();
+		} catch (RWorkspaceException | REXPMismatchException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return 0;
 		}
-		return min;
 	}
 	
 	/*

Property changes on: TXM/trunk/org.txm.lexicaltable.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.whatsnew.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.whatsnew.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.whatsnew.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,7 +5,7 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: textometrie.org
 Automatic-Module-Name: org.txm.whatsnew.rcp
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.txm.rcp;bundle-version="0.8.2",
+Bundle-RequiredExecutionEnvironment: JavaSE-16
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3",
  org.txm.core
 Import-Package: org.txm
Index: TXM/trunk/org.txm.whatsnew.rcp/src/org/txm/whatsnew/rcp/NewsPreferences.java
===================================================================
--- TXM/trunk/org.txm.whatsnew.rcp/src/org/txm/whatsnew/rcp/NewsPreferences.java	(revision 3627)
+++ TXM/trunk/org.txm.whatsnew.rcp/src/org/txm/whatsnew/rcp/NewsPreferences.java	(revision 3628)
@@ -33,6 +33,6 @@
 		preferences.put(NEWS_VERSION, "0"); // $NON-NLS-1$
 		
 		preferences.putBoolean(SHOW_NEW_SETUP, true);
-		preferences.put(NEW_SETUP_VERSION, "0.8.2"); // $NON-NLS-1$
+		preferences.put(NEW_SETUP_VERSION, "0.8.3"); // $NON-NLS-1$
 	}
 }

Property changes on: TXM/trunk/org.txm.whatsnew.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.setups/BuildLinux64bit.sh
===================================================================
--- TXM/trunk/org.txm.setups/BuildLinux64bit.sh	(revision 3627)
+++ TXM/trunk/org.txm.setups/BuildLinux64bit.sh	(revision 3628)
@@ -1,12 +1,14 @@
-VERSIONWITHOUTSUB=`cat ../org.txm.rcp/VERSION`
-SUBVERSION=`cat ../org.txm.rcp/SUBVERSION`
+DIRNAME=`dirname $0`
+VERSIONWITHOUTSUB=`cat $DIRNAME/../bundles/org.txm.rcp/VERSION`
+SUBVERSION=`cat $DIRNAME/../bundles/org.txm.rcp/SUBVERSION`
 VERSION=${VERSIONWITHOUTSUB}${SUBVERSION}
 
 STEP=$1
 ARCH="64"
 ARCHCODE="x86_64"
 TIMESTAMP=`date +"%Y-%m-%d"`
-APP="TXM_${VERSION}_${TIMESTAMP}_Linux${ARCH}"
+APP="$DIRNAME/TXM_${VERSION}_${TIMESTAMP}_Linux${ARCH}"
+BUILDDIR="$DIRNAME/../products/org.txm.rcp.product/target/products/org.txm.rcp.app/linux/gtk/$ARCHCODE"
 
 rm -rf "$APP"
 mkdir "$APP"
@@ -15,19 +17,19 @@
 echo purge | sudo debconf-communicate TXM
 
 # ensure postinst preinst ... rights
-chmod 644 shared/debian/DEBIAN/templates &&
-chmod 755 shared/debian/DEBIAN/postinst &&
-chmod 755 shared/debian/DEBIAN/postrm &&
-chmod 755 shared/debian/DEBIAN/preinst &&
-chmod 755 shared/debian/usr/bin/TXM*
+chmod 644 $DIRNAME/shared/debian/DEBIAN/templates &&
+chmod 755 $DIRNAME/shared/debian/DEBIAN/postinst &&
+chmod 755 $DIRNAME/shared/debian/DEBIAN/postrm &&
+chmod 755 $DIRNAME/shared/debian/DEBIAN/preinst &&
+chmod 755 $DIRNAME/shared/debian/usr/bin/TXM*
 if [ $? != 0 ]; then
 	echo "** $APP: failed to set rights of postinst preinst ... files "
 	exit 1;
 fi
 
 # remove old profile that can contains unwanted repositories
-rm -f "exportRCP/linux.gtk.${ARCHCODE}/TXM/p2/org.eclipse.equinox.p2.engine/.settings/*" &&
-rm -f "exportRCP/linux.gtk.${ARCHCODE}/TXM/p2/org.eclipse.equinox.p2.engine/profileRegistry/profile.profile/.data/.settings/*"
+rm -f "$BUILDDIR/p2/org.eclipse.equinox.p2.engine/.settings/*" &&
+rm -f "$BUILDDIR/p2/org.eclipse.equinox.p2.engine/profileRegistry/profile.profile/.data/.settings/*"
 if [ $? != 0 ]; then
 	echo "** $APP: failed to remove p2 preferences"
 	exit 1;
@@ -36,28 +38,30 @@
 mkdir -p "$APP/usr/lib/TXM"
 
 # copy debian shared files: INSTALL, R libs...
-rsync -r  --exclude '.svn' shared/debian/* "$APP"
+rsync -r  --exclude '.svn' $DIRNAME/shared/debian/* "$APP"
 if [ $? != 0 ]; then
 	echo "** $APP: failed to get 'debian' shared files"
 	exit 1;
 fi
 
 # copy shared files: css, xsl, scripts, samples...
-rsync -r  --exclude '.svn' shared/all/* "$APP/usr/lib/TXM"
+rsync -r  --exclude '.svn' $DIRNAME/shared/all/* "$APP/usr/lib/TXM"
 if [ $? != 0 ]; then
 	echo "** $APP: failed to get shared files"
 	exit 1;
 fi
 
 # copy eclise arch dependent build
-rsync -r  --exclude '.svn' "exportRCP/linux.gtk.${ARCHCODE}/TXM" "$APP/usr/lib"
+rsync -r  --exclude '.svn' "$BUILDDIR" "$APP/usr/lib/TXM"
+cp -rf "$APP/usr/lib/TXM/$ARCHCODE/"* "$APP/usr/lib/TXM"
+rm -rf "$APP/usr/lib/TXM/$ARCHCODE"
 if [ $? != 0 ]; then
 	echo "** $APP: failed to get ${ARCH}bit binaries Linux $ARCHCODE files"
 	exit 1;
 fi
 
 echo " clean"
-bash directoryCleaner.sh "$APP"
+bash $DIRNAME/directoryCleaner.sh "$APP"
 if [ $? != 0 ]; then
 	echo "** $APP: failed to clean Debian package $APP"
 	exit 1;
Index: TXM/trunk/org.txm.setups/BuildAll.sh
===================================================================
--- TXM/trunk/org.txm.setups/BuildAll.sh	(revision 3627)
+++ TXM/trunk/org.txm.setups/BuildAll.sh	(revision 3628)
@@ -1,29 +1,23 @@
 #echo "get scripts"
-sh getSharedFiles.sh
-if [ $? != 0 ]; then
-	echo "** Failed to get shared files"
-	exit 1;
-fi
+DIRNAME=`dirname $0`
 
-echo "Linux64"
-sh Linux64bit.sh
+echo "LINUX !!"
+sh $DIRNAME/BuildLinux64bit.sh
 if [ $? != 0 ]; then
 	echo "** Failed to get build Linux64"
-	exit 1;
 fi
 
-echo "MacOSX"
-sh MacOSXIntel.sh
+echo "MacOSX :("
+sh $DIRNAME/BuildMacOSXIntel.sh
 if [ $? != 0 ]; then
 	echo "** Failed to get build Mac OS X"
-	exit 1;
 fi
 
-echo "Win64"
-sh Win64bit.sh
+echo "WINDOWS !!"
+sh $DIRNAME/BuildWin64bit.sh
 if [ $? != 0 ]; then
 	echo "** Failed to get build Win64"
-	exit 1;
 fi
 
 #play end.wav
+echo "DONE !!"
Index: TXM/trunk/org.txm.setups/shared/all/license_agreement_fr.txt
===================================================================
--- TXM/trunk/org.txm.setups/shared/all/license_agreement_fr.txt	(revision 3627)
+++ TXM/trunk/org.txm.setups/shared/all/license_agreement_fr.txt	(revision 3628)
@@ -1,6 +1,6 @@
-          TXM 0.8.0
+          TXM 0.8.3
 
-Copyright © 2010-2017 ENS de Lyon,University of Franche-Comté.
+Copyright © 2010-2023 ENS de Lyon,University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
Index: TXM/trunk/org.txm.setups/shared/all/license_agreement.txt
===================================================================
--- TXM/trunk/org.txm.setups/shared/all/license_agreement.txt	(revision 3627)
+++ TXM/trunk/org.txm.setups/shared/all/license_agreement.txt	(revision 3628)
@@ -1,6 +1,6 @@
-          TXM 0.8.0
+          TXM 0.8.3
 
-Copyright © 2010-2017 ENS de Lyon,University of Franche-Comté.
+Copyright © 2010-2023 ENS de Lyon,University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
Index: TXM/trunk/org.txm.setups/shared/mac/INSTALL
===================================================================
--- TXM/trunk/org.txm.setups/shared/mac/INSTALL	(revision 3627)
+++ TXM/trunk/org.txm.setups/shared/mac/INSTALL	(revision 3628)
@@ -92,6 +92,9 @@
 chmod +rx "$TXMINSTALLDIR/Contents/MacOS/TXM"
 chmod -R +rx /opt/local/lib
 
+#necessary to launch the app
+sudo xattr -cd "$TXMINSTALLDIR"
+
 echo "sudo chown -R $USER $TXMINSTALLDIR"
 sudo chown -R "$USER" "$TXMINSTALLDIR"
 
Index: TXM/trunk/org.txm.setups/shared/mac/BUILDPKG.pkgproj
===================================================================
--- TXM/trunk/org.txm.setups/shared/mac/BUILDPKG.pkgproj	(revision 3627)
+++ TXM/trunk/org.txm.setups/shared/mac/BUILDPKG.pkgproj	(revision 3628)
@@ -1207,11 +1207,11 @@
 					<key>DICTIONARY</key>
 					<dict>
 						<key>IC_REQUIREMENT_CPU_ARCHITECTURE_FAMILY</key>
-						<integer>2</integer>
+						<integer>0</integer>
 						<key>IC_REQUIREMENT_CPU_INTEL_ARCHITECTURE_TYPE</key>
-						<integer>2</integer>
+						<integer>0</integer>
 						<key>IC_REQUIREMENT_CPU_MINIMUM_CPU_CORES_COUNT</key>
-						<integer>1</integer>
+						<integer>0</integer>
 						<key>IC_REQUIREMENT_CPU_MINIMUM_FREQUENCY</key>
 						<integer>866666</integer>
 						<key>IC_REQUIREMENT_CPU_POWERPC_ARCHITECTURE_TYPE</key>
Index: TXM/trunk/org.txm.setups/shared/mac/Applications/TXM.app/Contents/MacOS/TXM
===================================================================
--- TXM/trunk/org.txm.setups/shared/mac/Applications/TXM.app/Contents/MacOS/TXM	(revision 3627)
+++ TXM/trunk/org.txm.setups/shared/mac/Applications/TXM.app/Contents/MacOS/TXM	(revision 3628)
@@ -104,7 +104,7 @@
 	fi
 
     echo "TXM: getting '/Applications/TXM-TXMVERSION.app/launcher.ini' and set write permission of '$DOTTXMHOME/launcher.ini'"
-    cp "/Applications/TXM-TXMVERSION.app/Contents/TXM/launcher.ini" "$DOTTXMHOME/launcher.ini" &&
+    cp "/Applications/TXM-TXMVERSION.app/Contents/Eclipse/launcher.ini" "$DOTTXMHOME/launcher.ini" &&
     chmod +w "$DOTTXMHOME/launcher.ini";
     
     if [ $? != 0 ]; then
@@ -152,6 +152,6 @@
 echo "TXM: Running TXM for Mac OS X $OSVERSION with the JAR launcher..."
 ) 1>&3 2>&4
 
-echo "Starting TXM with --launcher.ini '$DOTTXMHOME/launcher.ini' -configuration '$DOTTXMHOME/configuration' -user '$DOTTXMHOME/user' -install '/Applications/TXM-TXMVERSION.app/Contents/TXM'"
+echo "Starting TXM with --launcher.ini '$DOTTXMHOME/launcher.ini' -configuration '$DOTTXMHOME/configuration' -user '$DOTTXMHOME/user' -install '/Applications/TXM-TXMVERSION.app/Contents/Eclipse'"
  
-/Applications/TXM-TXMVERSION.app/Contents/MacOS/launcher -vm /Applications/TXM-TXMVERSION.app/Contents/TXM/jre/Contents/Home/bin -XX:MaxPermSize=256m -XstartOnFirstThread $TXMINIARGSVM -jar "$(echo /Applications/TXM-TXMVERSION.app/Contents/TXM/plugins/org.eclipse.equinox.launcher_*.jar)" -os macosx -ws cocoa -arch x86_64 -showsplash -run --launcher.ini "$DOTTXMHOME/launcher.ini" -configuration "$DOTTXMHOME/configuration" -user "$DOTTXMHOME/user" -install "/Applications/TXM-TXMVERSION.app/Contents/TXM"
+/Applications/TXM-TXMVERSION.app/Contents/MacOS/launcher $TXMINIARGSVM -configuration "$DOTTXMHOME/configuration" -user "$DOTTXMHOME/user" -install "/Applications/TXM-TXMVERSION.app/Contents/Eclipse"
Index: TXM/trunk/org.txm.setups/shared/mac/Applications/TXM.app/Contents/Eclipse/GetProxyConfiguration.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.setups/shared/mac/Applications/TXM.app/Contents/Eclipse/GetProxyConfiguration.jar
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.setups/shared/mac/Applications/TXM.app/Contents/Eclipse/TestPreInstall.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.setups/shared/mac/Applications/TXM.app/Contents/Eclipse/TestPreInstall.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.setups/shared/mac/Applications/TXM.app/Contents/Eclipse/YesNoDialog.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.setups/shared/mac/Applications/TXM.app/Contents/Eclipse/YesNoDialog.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.setups/pushTXMExtUpdateToGIT.sh
===================================================================
--- TXM/trunk/org.txm.setups/pushTXMExtUpdateToGIT.sh	(revision 3627)
+++ TXM/trunk/org.txm.setups/pushTXMExtUpdateToGIT.sh	(revision 3628)
@@ -3,7 +3,7 @@
 if [ ! $# -eq 2 ]
   then
     echo "** Error: called with $# args. usage: 'pushTXMExtUpdateToGIT.sh VERSION LEVEL'"
-    echo "** eg ./pushTXMExtUpdateToGIT.sh 0.8.2 alpha"
+    echo "** eg ./pushTXMExtUpdateToGIT.sh 0.8.3 alpha"
     exit 1
 fi
 
Index: TXM/trunk/org.txm.setups/BuildMacOSXIntel.sh
===================================================================
--- TXM/trunk/org.txm.setups/BuildMacOSXIntel.sh	(revision 3627)
+++ TXM/trunk/org.txm.setups/BuildMacOSXIntel.sh	(revision 3628)
@@ -1,113 +1,102 @@
-VERSION=`cat ../org.txm.rcp/VERSION`
-SUBVERSION=`cat ../org.txm.rcp/SUBVERSION`
+DIRNAME=`dirname $0`
+VERSION=`cat $DIRNAME/../bundles/org.txm.rcp/VERSION`
+SUBVERSION=`cat $DIRNAME/../bundles/org.txm.rcp/SUBVERSION`
 FULLVERSION=${VERSION}${SUBVERSION}
 STEP=$1
 TIMESTAMP=`date +"%Y-%m-%d"`
+APP="$DIRNAME/TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX"
+SHAREDMAC="$DIRNAME/shared/mac"
+SHAREDALL="$DIRNAME/shared/all"
 
-rm -f "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX.tar.gz"
-rm -rf "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX"
-mkdir "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX"
+rm -f "$APP.tar.gz"
+rm -rf "$APP"
+mkdir "$APP"
 
 # ensure INSTALL CLEAN file rights
-chmod 775 shared/mac/INSTALL shared/mac/CLEAN
+chmod 775 $SHAREDMAC/INSTALL $SHAREDMAC/CLEAN
 if [ $? != 0 ]; then
 	echo "** $APP: failed to set rights of INSTALL CLEAN files "
 	exit 1;
 fi
 
 echo " copy mac shared files: R"
-rsync -r  --exclude '.svn' shared/mac/* "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX"
+rsync -r  --exclude '.svn' $SHAREDMAC/* "$APP"
 if [ $? != 0 ]; then
 	echo "** MacOSXIntel.sh : failed to copy Mac shared files"
 	exit 1;
 fi
 
 echo " copy shared files: css, xsl, scripts, samples..."
-rsync -r  --exclude '.svn' shared/all/* "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM.app/Contents/TXM"
+rsync -r  --exclude '.svn' $SHAREDALL/* "$APP/Applications/TXM.app/Contents/Eclipse"
 if [ $? != 0 ]; then
 	echo "** MacOSXIntel.sh : failed to copy shared files"
 	exit 1;
 fi
 
 echo " convert licence files encoding to MacRoman"
-iconv -f utf8 -t MAC shared/all/license_agreement_fr.txt > "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM.app/Contents/TXM/license_agreement_fr.txt"
-iconv -f utf8 -t MAC shared/all/license_agreement.txt > "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM.app/Contents/TXM/license_agreement.txt"
-iconv -f utf8 -t MAC shared/all/LICENSE_FR.TXT > "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM.app/Contents/TXM/LICENSE_FR.TXT"
-iconv -f utf8 -t MAC shared/all/LICENSE.TXT > "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM.app/Contents/TXM/LICENSE.TXT"
+iconv -f utf8 -t MAC $SHAREDALL/license_agreement_fr.txt > "$APP/Applications/TXM.app/Contents/Eclipse/license_agreement_fr.txt"
+iconv -f utf8 -t MAC $SHAREDALL/license_agreement.txt > "$APP/Applications/TXM.app/Contents/Eclipse/license_agreement.txt"
+iconv -f utf8 -t MAC $SHAREDALL/LICENSE_FR.TXT > "$APP/Applications/TXM.app/Contents/Eclipse/LICENSE_FR.TXT"
+iconv -f utf8 -t MAC $SHAREDALL/LICENSE.TXT > "$APP/Applications/TXM.app/Contents/Eclipse/LICENSE.TXT"
 
 echo " remove parasite settings"
-rm -f "exportRCP/macosx.cocoa.x86_64/TXM/p2/org.eclipse.equinox.p2.engine/.settings/*" &&
-rm -f "exportRCP/macosx.cocoa.x86_64/TXM/p2/org.eclipse.equinox.p2.engine/profileRegistry/profile.profile/.data/.settings/*"
+rm -f "$DIRNAME/../products/org.txm.rcp.product/target/products/org.txm.rcp.app/macosx/cocoa/x86_64/TXM.app/Contents/Eclipse/p2/org.eclipse.equinox.p2.engine/.settings/*" &&
+rm -f "$DIRNAME/../products/org.txm.rcp.product/target/products/org.txm.rcp.app/macosx/cocoa/x86_64/TXM.app/Contents/Eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/profile.profile/.data/.settings/*"
 if [ $? != 0 ]; then
 	echo "** $APP: failed to remove p2 preferences"
 	exit 1;
 fi
 
 echo " copy eclipse arch dependent build"
-rsync -r  --exclude '.svn' "exportRCP/macosx.cocoa.x86_64/"* "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM.app/Contents"
+rsync -r  --exclude '.svn' "$DIRNAME/../products/org.txm.rcp.product/target/products/org.txm.rcp.app/macosx/cocoa/x86_64/"* "$APP/Applications/"
 if [ $? != 0 ]; then
 	echo "** MacOSXIntel.sh : failed to binaries files"
 	exit 1;
 fi
 
-chmod +x "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/INSTALL" &&
-chmod +x "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/CLEAN"
+chmod +x "$APP/INSTALL" &&
+chmod +x "$APP/CLEAN"
 if [ $? != 0 ]; then
 	echo "** MacOSXIntel.sh : failed to chmod +x INSTALL & CLEAN files"
 	exit 1;
 fi
 
 #echo "set LSUIElement to 1"
-#find ./TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM.app/.main.app/Contents/Info.plist -type f -exec sed -i 's/<dict>/<dict><key>LSUIElement<\/key><string>1<\/string>/g' {} \;
+#find ./$APP/Applications/TXM.app/.main.app/Contents/Info.plist -type f -exec sed -i 's/<dict>/<dict><key>LSUIElement<\/key><string>1<\/string>/g' {} \;
 #if [ $? != 0 ]; then
 #	echo "** MacOSXIntel.sh : failed to fix Info.plist"
 #	exit 1;
 #fi
 
 echo " clean"
-bash directoryCleaner.sh "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX"
+bash $DIRNAME/directoryCleaner.sh "$APP"
 if [ $? != 0 ]; then
-	echo "** $APP: failed to clean mac setup TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX"
+	echo "** $APP: failed to clean mac setup $APP"
 	exit 1;
 fi
 
 echo " search&replace in files TXMVERSION"
-find "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/CLEAN" -type f -exec sed -i "s/TXMVERSION/$FULLVERSION/g" {} \;
-find "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/finish_en.txt" -type f -exec sed -i "s/TXMVERSION/$FULLVERSION/g" {} \;
-find "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/INSTALL" -type f -exec sed -i "s/TXMVERSION/$FULLVERSION/g" {} \;
-find "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/BUILDPKG.pkgproj" -type f -exec sed -i "s/TXM_TXMVERSION_MacOSX_installer/TXM_${VERSION}_${TIMESTAMP}_MacOSX_installer/g" {} \;
-find "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/BUILDPKG.pkgproj" -type f -exec sed -i "s/TXMVERSION/$FULLVERSION/g" {} \;
-find "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/BUILDPKG.pkgproj" -type f -exec sed -i "s/TXMMAJORVERSION/$VERSION/g" {} \;
-find "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM.app/Contents/MacOS/TXM" -type f -exec sed -i "s/TXMMAJORVERSION/$VERSION/g" {} \;
-find "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM.app/Contents/MacOS/TXM" -type f -exec sed -i "s/TXMVERSION/$FULLVERSION/g" {} \;
-find "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM.app/Contents/Info.plist" -type f -exec sed -i "s/launcher/TXM/gi" {} \;
+find "$APP/CLEAN" -type f -exec sed -i "s/TXMVERSION/$FULLVERSION/g" {} \;
+find "$APP/finish_en.txt" -type f -exec sed -i "s/TXMVERSION/$FULLVERSION/g" {} \;
+find "$APP/INSTALL" -type f -exec sed -i "s/TXMVERSION/$FULLVERSION/g" {} \;
+find "$APP/BUILDPKG.pkgproj" -type f -exec sed -i "s/TXM_TXMVERSION_MacOSX_installer/TXM_${VERSION}_${TIMESTAMP}_MacOSX_installer/g" {} \;
+find "$APP/BUILDPKG.pkgproj" -type f -exec sed -i "s/TXMVERSION/$FULLVERSION/g" {} \;
+find "$APP/BUILDPKG.pkgproj" -type f -exec sed -i "s/TXMMAJORVERSION/$VERSION/g" {} \;
+find "$APP/Applications/TXM.app/Contents/MacOS/TXM" -type f -exec sed -i "s/TXMMAJORVERSION/$VERSION/g" {} \;
+find "$APP/Applications/TXM.app/Contents/MacOS/TXM" -type f -exec sed -i "s/TXMVERSION/$FULLVERSION/g" {} \;
+find "$APP/Applications/TXM.app/Contents/Info.plist" -type f -exec sed -i "s/launcher/TXM/gi" {} \;
 
 # +x the executable rights
-chmod +x "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM.app/Contents/MacOS/"*
+chmod +x "$APP/Applications/TXM.app/Contents/MacOS/"*
 
 echo " rename files to add VERSION=$VERSION"
-mv "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM.app" "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX/Applications/TXM-${FULLVERSION}.app"
+mv "$APP/Applications/TXM.app" "$APP/Applications/TXM-${FULLVERSION}.app"
 
-echo "Tar gz TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX"
-tar -zcf "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX.tar.gz" "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX"
+echo "Tar gz $APP"
+tar -zcf "$APP.tar.gz" "$APP"
 if [ $? != 0 ]; then
-	echo "** MacOSXIntel.sh : failed to tar gz TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX"
+	echo "** MacOSXIntel.sh : failed to tar gz $APP"
 	exit 1;
 fi
 
-if [ "$STEP" = "" ] ; then
-	echo "Local test: The archive is not sent to shared files."
-else
-	echo "Sending to ensldfs.ens-lyon.fr/services/labo_ana_corpus/PartageTemp"
-	smbclient -A auth.txt "//ensldfs.ens-lyon.fr/services" -c "cd \"/Laboratoires/labo_ana_corpus/Projets/Textométrie/Logiciel/TXM/$STEP\" ; put TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX.zip ; exit"
-	if [ $? != 0 ]; then
-		echo "** MacOSXIntel.sh : failed to send TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX to labo_ana_corpus"
-		exit 1;
-	fi
-fi
 
-#cp "TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX.tar.gz" /run/user/1001/gvfs/smb-share\:server\=ensldfs.ens-lyon.fr\,share\=services\,user\=$USER/Laboratoires/labo_ana_corpus/PartageTemp
-#if [ $? != 0 ]; then
-#	echo "** $APP: TXM_${FULLVERSION}_${TIMESTAMP}_MacOSX.tar.gz not copied PartageTemp"
-#	exit 1;
-#fi
Index: TXM/trunk/org.txm.setups/.project
===================================================================
--- TXM/trunk/org.txm.setups/.project	(revision 3627)
+++ TXM/trunk/org.txm.setups/.project	(revision 3628)
@@ -5,7 +5,26 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.statet.docmlet.resourceProjects.TexBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.statet.r.resourceProjects.RBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.statet.docmlet.resourceProjects.WikitextBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.statet.ide.resourceProjects.Statet</nature>
+		<nature>org.eclipse.statet.r.resourceProjects.R</nature>
+		<nature>org.eclipse.statet.docmlet.resourceProjects.Wikitext</nature>
+		<nature>org.eclipse.statet.docmlet.resourceProjects.Tex</nature>
 	</natures>
 </projectDescription>
Index: TXM/trunk/org.txm.setups/pushTXMUpdateToGIT.sh
===================================================================
--- TXM/trunk/org.txm.setups/pushTXMUpdateToGIT.sh	(revision 3627)
+++ TXM/trunk/org.txm.setups/pushTXMUpdateToGIT.sh	(revision 3628)
@@ -3,7 +3,7 @@
 if [ ! $# -eq 2 ]
   then
     echo "** Error: called with $# args. usage: 'pushTXMUpdateToGIT.sh VERSION LEVEL'"
-    echo "** eg ./pushTXMUpdateToGIT.sh 0.8.2 alpha"
+    echo "** eg ./pushTXMUpdateToGIT.sh 0.8.3 alpha"
     exit 1
 fi
 
Index: TXM/trunk/org.txm.setups/BuildWin64bit.sh
===================================================================
--- TXM/trunk/org.txm.setups/BuildWin64bit.sh	(revision 3627)
+++ TXM/trunk/org.txm.setups/BuildWin64bit.sh	(revision 3628)
@@ -1,19 +1,22 @@
-VERSION=`cat ../org.txm.rcp/VERSION`
-SUBVERSION=`cat ../org.txm.rcp/SUBVERSION`
+DIRNAME=`dirname $0`
+VERSION=`cat $DIRNAME/../bundles/org.txm.rcp/VERSION`
+SUBVERSION=`cat $DIRNAME/../bundles/org.txm.rcp/SUBVERSION`
 FULLVERSION=${VERSION}${SUBVERSION}
 STEP=$1
 ARCH="64"
 ARCHCODE="x86_64"
 TIMESTAMP=`date +"%Y-%m-%d"`
-APP="TXM_${FULLVERSION}_${TIMESTAMP}_Win${ARCH}_installer"
+APP="$DIRNAME/TXM_${FULLVERSION}_${TIMESTAMP}_Win${ARCH}_installer"
+BUILDDIR="$DIRNAME/../products/org.txm.rcp.product/target/products/org.txm.rcp.app/win32/win32/$ARCHCODE"
 
+
 echo "BUILDING $APP..."
 echo "Make dir"
 rm -rf "${APP}"
 mkdir "${APP}"
 
 echo "copy shared files: css, xsl, scripts, samples..."
-rsync -r  --exclude '.svn' "shared/all"/* "${APP}"
+rsync -r  --exclude '.svn' "$DIRNAME/shared/all"/* "${APP}"
 
 if [ $? != 0 ]; then
 	echo "** ${APP}: copy Win shared files failed"
@@ -21,34 +24,29 @@
 fi
 
 echo "convert licence files encoding to Windows-1252"
-iconv -f utf8 -t WINDOWS-1252 shared/all/license_agreement_fr.txt > "$APP/license_agreement_fr.txt"
-iconv -f utf8 -t WINDOWS-1252 shared/all/license_agreement.txt > "$APP/license_agreement.txt"
-iconv -f utf8 -t WINDOWS-1252 shared/all/LICENSE_FR.TXT > "$APP/LICENSE_FR.TXT"
-iconv -f utf8 -t WINDOWS-1252 shared/all/LICENSE.TXT > "$APP/LICENSE.TXT"
+iconv -f utf8 -t WINDOWS-1252 $DIRNAME/shared/all/license_agreement_fr.txt > "$APP/license_agreement_fr.txt"
+iconv -f utf8 -t WINDOWS-1252 $DIRNAME/shared/all/license_agreement.txt > "$APP/license_agreement.txt"
+iconv -f utf8 -t WINDOWS-1252 $DIRNAME/shared/all/LICENSE_FR.TXT > "$APP/LICENSE_FR.TXT"
+iconv -f utf8 -t WINDOWS-1252 $DIRNAME/shared/all/LICENSE.TXT > "$APP/LICENSE.TXT"
 
 echo "copy win shared files: *.ico, TestPreInstall.jar..."
-rsync -r  --exclude '.svn' "shared/win"/* "${APP}"
+rsync -r  --exclude '.svn' "$DIRNAME/shared/win"/* "${APP}"
 
 if [ $? != 0 ]; then
 	echo "** ${APP}: copy Win arch files failed"
 	exit 1;
 fi
 
-# ensure JRE files are here
-if [ ! -d "${APP}/jre/bin" ]; then
-	echo "** $APP: JRE files are missing."
-	exit 1;
-fi
 
-rm -f "exportRCP/win32.win32.${ARCHCODE}/TXM/p2/org.eclipse.equinox.p2.engine/.settings/*" &&
-rm -f "exportRCP/win32.win32.${ARCHCODE}/TXM/p2/org.eclipse.equinox.p2.engine/profileRegistry/profile.profile/.data/.settings/*"
+rm -f "$BUILDDIR/p2/org.eclipse.equinox.p2.engine/.settings/*" &&
+rm -f "$BUILDDIR/p2/org.eclipse.equinox.p2.engine/profileRegistry/profile.profile/.data/.settings/*"
 if [ $? != 0 ]; then
 	echo "** $APP: failed to remove p2 preferences"
 	exit 1;
 fi
 
 echo "copy eclipse arch dependent build"
-rsync -r  --exclude '.svn' "exportRCP/win32.win32.${ARCHCODE}/TXM/"* "${APP}"
+rsync -r --exclude '.svn' "$BUILDDIR/"* "${APP}"
 
 if [ $? != 0 ]; then
 	echo "** ${APP}: copy Win build files failed"
@@ -57,17 +55,16 @@
 
 #echo "copy cqp JNI libs near TXM executable"
 echo "copy CQP binary files"
-cp "../org.txm.libs.cqp.win32/res/win64"/*.dll "${APP}/" &&
-cp "../org.txm.libs.cqp.win32/res/win64"/*.dll "${APP}/TXM"
+cp "$DIRNAME/../bundles/org.txm.libs.cqp.win32/res/win64"/*.dll "${APP}/" &&
+cp "$DIRNAME/../bundles/org.txm.libs.cqp.win32/res/win64"/*.dll "${APP}/TXM"
 
 if [ $? != 0 ]; then
 	echo "** ${APP}: copy Win lib files failed"
 	exit 1;
 fi
 
-
 echo "clean"
-bash directoryCleaner.sh "$APP"
+bash $DIRNAME/directoryCleaner.sh "$APP"
 if [ $? != 0 ]; then
 	echo "** $APP: failed to clean win64 setup $APP"
 	exit 1;
@@ -79,7 +76,7 @@
 find "$APP/TXM.bat" -type f -exec sed -i "s/TXMVERSION/${VERSION}/g" {} \;
 
 echo "build executable"
-wine nsis/makensis.exe -V1 ${APP}/txm.nsi 2> logs64
+wine $DIRNAME/nsis/makensis.exe -V1 ${APP}/txm.nsi 2> logs64
 
 if [ ! -e "${APP}.exe" ]; then
 	echo "** ${APP}.exe : not builded"
Index: TXM/trunk/org.txm.treetagger.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.treetagger.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.treetagger.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:19 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.treetagger.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.treetagger.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.treetagger.feature/feature.xml	(revision 3628)
@@ -68,9 +68,9 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.core" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.txm.treetagger.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.txm.index.rcp" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 

Property changes on: TXM/trunk/org.txm.treetagger.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.dictionary.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.dictionary.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.dictionary.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,18 +5,23 @@
 Bundle-SymbolicName: org.txm.dictionary.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: %Bundle-Name
-Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexpor
- t,org.txm.libs.groovy-all;bundle-version="2.3.3";visibility:=reexport
- ,org.txm.core;bundle-version="0.7.0";visibility:=reexport,org.eclipse
- .ui;visibility:=reexport,org.eclipse.core.runtime;visibility:=reexpor
- t,org.txm.utils.core;visibility:=reexport,org.eclipse.persistence.jpa
- ;bundle-version="2.6.0";visibility:=reexport,org.txm.index.core;bundl
- e-version="1.0.0";visibility:=reexport,org.txm.index.rcp;bundle-versi
- on="1.0.0";visibility:=reexport,javax.persistence;visibility:=reexpor
- t
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3";visibility:=reexport,
+ org.txm.libs.groovy-all;bundle-version="2.3.3";visibility:=reexport,
+ org.txm.core;bundle-version="0.7.0";visibility:=reexport,
+ org.eclipse.ui;visibility:=reexport,
+ org.eclipse.core.runtime;visibility:=reexport,
+ org.txm.utils.core;visibility:=reexport,
+ org.txm.index.core;bundle-version="1.0.0";visibility:=reexport,
+ org.txm.index.rcp;bundle-version="1.0.0";visibility:=reexport,
+ org.eclipse.persistence.jpa;visibility:=reexport,
+ org.eclipse.persistence.asm,
+ org.eclipse.persistence.jpa.jpql,
+ org.eclipse.persistence.core,
+ org.eclipse.persistence.antlr,
+ jakarta.persistence
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.dictionary.rcp
 

Property changes on: TXM/trunk/org.txm.dictionary.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.svn.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.svn.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.svn.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -16,7 +16,7 @@
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-Activator: svnenvironement.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.svn.rcp
 

Property changes on: TXM/trunk/org.txm.svn.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.libs.colt/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.colt/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.colt/META-INF/MANIFEST.MF	(revision 3628)
@@ -11,7 +11,7 @@
 Bundle-Version: 1.2.0
 Bundle-ClassPath: .,lib/colt-1.2.0.jar
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: https://dst.lbl.gov/ACSSoftware/colt/
 Automatic-Module-Name: org.txm.libs.colt
 

Property changes on: TXM/trunk/org.txm.libs.colt
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.internalview.rcp/src/org/txm/internalview/rcp/adapters/InternalViewAdapterFactory.java
===================================================================
--- TXM/trunk/org.txm.internalview.rcp/src/org/txm/internalview/rcp/adapters/InternalViewAdapterFactory.java	(revision 3627)
+++ TXM/trunk/org.txm.internalview.rcp/src/org/txm/internalview/rcp/adapters/InternalViewAdapterFactory.java	(revision 3628)
@@ -19,15 +19,15 @@
 			"platform:/plugin/" + FrameworkUtil.getBundle(InternalViewAdapterFactory.class).getSymbolicName() + "/icons/application_form_magnify.png"); //$NON-NLS-1$ //$NON-NLS-2$
 	
 	@Override
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		if (this.canAdapt(adapterType) && adaptableObject instanceof InternalView) {
-			return new TXMResultAdapter() {
+			return adapterType.cast(new TXMResultAdapter() {
 				
 				@Override
 				public ImageDescriptor getImageDescriptor(Object object) {
 					return ICON;
 				}
-			};
+			});
 		}
 		return null;
 	}
Index: TXM/trunk/org.txm.internalview.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.internalview.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.internalview.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
  reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.internalview.rcp
 

Property changes on: TXM/trunk/org.txm.internalview.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.texts.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.texts.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.texts.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,8 +4,8 @@
 Bundle-SymbolicName: org.txm.texts.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.txm.texts.rcp
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.txm.rcp;bundle-version="0.8.2",
+Bundle-RequiredExecutionEnvironment: JavaSE-16
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3",
  org.txm.texts.core;bundle-version="1.0.0",
  org.txm.edition.rcp;bundle-version="1.0.0"
 Export-Package: org.txm.texts.rcp
Index: TXM/trunk/org.txm.texts.rcp/src/org/txm/texts/rcp/TextsViewEditor.java
===================================================================
--- TXM/trunk/org.txm.texts.rcp/src/org/txm/texts/rcp/TextsViewEditor.java	(revision 3627)
+++ TXM/trunk/org.txm.texts.rcp/src/org/txm/texts/rcp/TextsViewEditor.java	(revision 3628)
@@ -1,9 +1,7 @@
 package org.txm.texts.rcp;
 
 import java.util.ArrayList;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -75,7 +73,7 @@
 		gdata.minimumWidth = 300;
 		negativeFiltersText.setLayoutData(gdata);
 		
-		viewer = new TableViewer(this.getResultArea(), SWT.VIRTUAL);
+		viewer = new TableViewer(this.getResultArea(), SWT.MULTI|SWT.VIRTUAL);
 		viewer.getTable().setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, true));
 		viewer.getTable().setHeaderVisible(true);
 		viewer.getTable().setLinesVisible(true);
@@ -135,7 +133,7 @@
 			}
 			
 		});
-		
+
 	}
 
 	@Override
@@ -149,8 +147,7 @@
 		TextsView tv = getResult();
 		int currentDisplayedColumns = viewer.getTable().getColumns().length;
 		int numberOfColumnsToDisplay = (tv.getColumns().size() + 3);
-		if ( currentDisplayedColumns == 0 || 
-				currentDisplayedColumns != numberOfColumnsToDisplay) {
+		if ( currentDisplayedColumns == 0 || currentDisplayedColumns != numberOfColumnsToDisplay) {
 			
 			if (viewer.getTable().getColumns().length > 0) { // get rid of current columns
 				for (TableColumn column : viewer.getTable().getColumns()) {
@@ -221,6 +218,28 @@
 				nColumn++;
 			}
 			
+			TableLinesViewerComparator viewerComparator = new TableLinesViewerComparator(Toolbox.getCollator(this.getResult())) {
+				@Override
+				public int compare(Viewer viewer, Object e1, Object e2) {
+					
+					Text t1 = (Text) e1;
+					Text t2 = (Text) e2;
+					if (lastColumnIndex == 0) {
+						return super.compare(viewer, t1.getName(), t2.getName());
+					} else if (lastColumnIndex == 1) {
+						return super.compare(viewer, t1.getEditions().size(), t2.getEditions().size());
+					} else if (lastColumnIndex == 2) {
+						return 0;
+					} else { // get the Text info to compare
+						return super.compare(viewer, 
+								getResult().getLines().get(t1.getName()).get(lastColumnIndex - 3), 
+								getResult().getLines().get(t2.getName()).get(lastColumnIndex - 3));
+					}
+				}
+			};
+			viewer.setComparator(viewerComparator);
+			viewerComparator.addSelectionAdapters(viewer);
+			
 		}
 		//
 		ArrayList<Text> texts = new ArrayList<>();

Property changes on: TXM/trunk/org.txm.texts.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.rcp.product/plugin_customization.ini
===================================================================
--- TXM/trunk/org.txm.rcp.product/plugin_customization.ini	(revision 3627)
+++ TXM/trunk/org.txm.rcp.product/plugin_customization.ini	(revision 3628)
@@ -1 +1 @@
-org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = false
Index: TXM/trunk/org.txm.referencer.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.referencer.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.referencer.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -11,7 +11,7 @@
  xport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.referencer.rcp
 

Property changes on: TXM/trunk/org.txm.referencer.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.cooccurrence.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.cooccurrence.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.cooccurrence.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:08 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.cooccurrence.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.cooccurrence.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.cooccurrence.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Cooccurrences
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.cooccurrence.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.libs.javafx.linux/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.javafx.linux/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.javafx.linux/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.txm.libs.javafx.linux
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.txm.libs.javafx.linux
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-ClassPath: jfxswt.jar,
  jfxrt.jar
 Export-Package: com.sun.deploy.uitoolkit.impl.fx,

Property changes on: TXM/trunk/org.txm.libs.javafx.linux
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.chartsengine.svgbatik.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.chartsengine.svgbatik.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.svgbatik.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -7,7 +7,7 @@
 Require-Bundle: org.txm.chartsengine.rcp;bundle-version="1.0.0";visibi
  lity:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.chartsengine.svgbatik.rcp
 

Property changes on: TXM/trunk/org.txm.chartsengine.svgbatik.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.ruby.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.ruby.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.ruby.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,8 +5,8 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: textometrie.org
 Automatic-Module-Name: org.txm.ruby.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.txm.core;bundle-version="0.8.2";visibility:=reexport
+Bundle-RequiredExecutionEnvironment: JavaSE-16
+Require-Bundle: org.txm.core;bundle-version="0.8.3";visibility:=reexport
 Bundle-ClassPath: lib/jruby-complete-9.2.11.1.jar,
  .
 Export-Package: org.txm.ruby.core

Property changes on: TXM/trunk/org.txm.ruby.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.cqp.linux/res/linux64/cqpserver
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.cqp.linux/res/linux64/libcqpjni.so
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.cqp.linux/res/linux64/cwb-decode
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.cqp.linux/res/linux64/cwb-align-encode
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.cqp.linux/res/linux64/cwb-makeall
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.cqp.linux/res/linux64/cqp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.cqp.linux/res/linux64/cwb-align
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.cqp.linux/res/linux64/cwb-encode
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.libs.cqp.linux/build.properties
===================================================================
--- TXM/trunk/org.txm.libs.cqp.linux/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.libs.cqp.linux/build.properties	(revision 3628)
@@ -3,5 +3,6 @@
 bin.includes = META-INF/,\
                .,\
                res/,\
-               OSGI-INF/
+               OSGI-INF/,\
+               res/linux64/
 #qualifier=svn
Index: TXM/trunk/org.txm.libs.cqp.linux/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.cqp.linux/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.cqp.linux/META-INF/MANIFEST.MF	(revision 3628)
@@ -3,9 +3,12 @@
 Bundle-Name: CQP.linux
 Bundle-Version: 1.1.0.qualifier
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Eclipse-PlatformFilter: (osgi.os=linux)
 Bundle-Vendor: Textometrie.org
 Fragment-Host: org.txm.libs.cqp
 Automatic-Module-Name: org.txm.libs.cqp.linux
+Eclipse-BundleShape: dir
+Bundle-ClassPath: res/linux64/,
+ .
 

Property changes on: TXM/trunk/org.txm.libs.cqp.linux
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.specificities.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.specificities.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.specificities.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:17 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.specificities.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.specificities.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.specificities.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="Specificities"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Specificities
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.specificities.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.ahc.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.ahc.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.ahc.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -11,6 +11,6 @@
  lity:=reexport,org.txm.ahc.core;bundle-version="1.0.0";visibility:=re
  export,org.txm.ca.rcp;visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 
Index: TXM/trunk/org.txm.ahc.rcp/src/org/txm/ahc/rcp/adapters/AHCAdapterFactory.java
===================================================================
--- TXM/trunk/org.txm.ahc.rcp/src/org/txm/ahc/rcp/adapters/AHCAdapterFactory.java	(revision 3627)
+++ TXM/trunk/org.txm.ahc.rcp/src/org/txm/ahc/rcp/adapters/AHCAdapterFactory.java	(revision 3628)
@@ -2,7 +2,6 @@
 package org.txm.ahc.rcp.adapters;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.FrameworkUtil;
 import org.txm.ahc.core.functions.AHC;

Property changes on: TXM/trunk/org.txm.ahc.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.queryindex.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.queryindex.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.queryindex.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -13,13 +13,13 @@
  ;visibility:=reexport,org.txm.lexicaltable.rcp;bundle-version="1.0.0"
  ;visibility:=reexport,org.txm.index.core;bundle-version="1.0.0";visib
  ility:=reexport,org.txm.index.rcp;bundle-version="1.0.0";visibility:=
- reexport,org.txm.rcp;bundle-version="0.8.0";visibility:=reexport,org.
+ reexport,org.txm.rcp;bundle-version="0.8.3";visibility:=reexport,org.
  txm.lexicaltable.core;visibility:=reexport,org.txm.statsengine.r.core
  ;visibility:=reexport,org.txm.statsengine.r.rcp;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-Activator: queryindexrcp.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.queryindex.rcp
 
Index: TXM/trunk/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/QueryIndex.java
===================================================================
--- TXM/trunk/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/QueryIndex.java	(revision 3627)
+++ TXM/trunk/org.txm.queryindex.rcp/src/org/txm/queryindex/core/functions/QueryIndex.java	(revision 3628)
@@ -17,7 +17,6 @@
 import java.util.Map;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.txm.core.messages.TXMCoreMessages;

Property changes on: TXM/trunk/org.txm.queryindex.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.chartsengine.jfreechart.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.chartsengine.jfreechart.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.jfreechart.feature/build.properties	(revision 3628)
@@ -1,3 +1,3 @@
 #Fri Jul 06 10:25:06 CEST 2018
-bin.includes=feature.xml
+bin.includes=feature.xml, build.properties
 #qualifier=svn
Index: TXM/trunk/org.txm.chartsengine.jfreechart.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.chartsengine.jfreechart.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.jfreechart.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="JFreeChart"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       JFreeChart chart engine for TXM
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -43,7 +43,7 @@
       <import plugin="org.txm.libs.jfreesvg" version="1.7.0" match="greaterOrEqual"/>
       <import plugin="org.txm.chartsengine.rcp" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.chartsengine.jfreechart.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
    </requires>
 
    <plugin

Property changes on: TXM/trunk/org.txm.chartsengine.jfreechart.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.treetagger.core/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- TXM/trunk/org.txm.treetagger.core/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3627)
+++ TXM/trunk/org.txm.treetagger.core/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3628)
@@ -1,3 +1,2 @@
 eclipse.preferences.version=1
-groovy.compiler.level=30
-groovy.script.filters=**/*.dsld,y,**/*.gradle,n
+groovy.compiler.level=40
Index: TXM/trunk/org.txm.treetagger.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.treetagger.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.treetagger.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -8,7 +8,7 @@
 Require-Bundle: org.txm.annotation.core;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.treetagger.core
 

Property changes on: TXM/trunk/org.txm.treetagger.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.searchengine.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.searchengine.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -8,7 +8,7 @@
  rt
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.searchengine.core
 

Property changes on: TXM/trunk/org.txm.searchengine.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.properties.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.properties.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.properties.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -8,7 +8,7 @@
 Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0";v
  isibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.properties.core
 
Index: TXM/trunk/org.txm.properties.core/src/org/txm/properties/core/functions/PartitionPropertiesComputer.java
===================================================================
--- TXM/trunk/org.txm.properties.core/src/org/txm/properties/core/functions/PartitionPropertiesComputer.java	(revision 3627)
+++ TXM/trunk/org.txm.properties.core/src/org/txm/properties/core/functions/PartitionPropertiesComputer.java	(revision 3628)
@@ -51,7 +51,7 @@
 	
 	@Override
 	public String getInformationHTML(String info) {
-		return dump();
+		return htmlDump();
 	}
 
 	@Override
@@ -68,13 +68,49 @@
 	public String dump() {
 		StringBuffer buff = new StringBuffer();
 		
-		buff.append(PropertiesCoreMessages.generalStatistics);
-		buff.append(result.getDetails()+"\n"); //$NON-NLS-1$
+		List<Part> parts = result.getParts();
+		buff.append(""+parts.size()+" parts:");
+		int n = 0;
+		for (Part p : parts) {
+			
+			if (n >= props.pMaxPropertiesToDisplay) {
+				buff.append("\n\t...");
+				break;
+			}
+			
+			try {
+				buff.append("\n\t"+p.getName()+": "+p.getSize());
+			} catch (CqiClientException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
 		
-		buff.append("Parts:");
-		for (Part p : result.getParts()) {
-			buff.append("\n\t");
+		return buff.toString();
+	}
+	
+	public String htmlDump() {
+		StringBuffer buff = new StringBuffer();
+		List<Part> parts = result.getParts();
+		buff.append("<h3>"+parts.size()+" parts:"+"</h3>");
+		buff.append("<ul>");
+		int n = 0;
+		for (Part p : parts) {
+			
+			if (n >= props.pMaxPropertiesToDisplay) {
+				buff.append("<li>...</li>");
+				break;
+			}
+			
+			try {
+				buff.append("<li>"+p.getName()+" ("+p.getSize()+")</li>");
+			} catch (CqiClientException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			n++;
 		}
+		buff.append("</ul>");
 		
 		return buff.toString();
 	}
Index: TXM/trunk/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java
===================================================================
--- TXM/trunk/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java	(revision 3627)
+++ TXM/trunk/org.txm.properties.core/src/org/txm/properties/core/functions/Properties.java	(revision 3628)
@@ -40,10 +40,10 @@
 import org.txm.core.results.Parameter;
 import org.txm.core.results.TXMParameters;
 import org.txm.core.results.TXMResult;
-import org.txm.objects.Partition;
 import org.txm.properties.core.messages.PropertiesCoreMessages;
 import org.txm.properties.core.preferences.PropertiesPreferences;
 import org.txm.searchengine.cqp.corpus.CQPCorpus;
+import org.txm.searchengine.cqp.corpus.Partition;
 import org.txm.utils.AsciiUtils;
 import org.txm.utils.TXMProgressMonitor;
 import org.txm.utils.io.IOUtils;
@@ -95,6 +95,8 @@
 		
 		if (this.parent instanceof CQPCorpus) {
 			computer = new CorpusPropertiesComputer(this, (CQPCorpus) this.parent);
+		} else if (this.parent instanceof Partition) {
+			computer = new PartitionPropertiesComputer(this, (Partition) this.parent);
 		}
 		else {
 			computer = new PropertiesComputer<TXMResult>(this, this.parent) {

Property changes on: TXM/trunk/org.txm.properties.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.tmp.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.tmp.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.tmp.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,7 +4,7 @@
 Bundle-Version: 1.0.0.qualifier
 Require-Bundle: org.eclipse.ui;visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.tmp.rcp
 

Property changes on: TXM/trunk/org.txm.tmp.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.properties.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.properties.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.properties.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:14 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.properties.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.properties.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.properties.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="Properties"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Corpus Properties
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -38,7 +38,7 @@
 
    <requires>
       <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.txm.properties.core" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 

Property changes on: TXM/trunk/org.txm.properties.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.translate.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.translate.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.translate.feature/build.properties	(revision 3628)
@@ -1 +1 @@
-bin.includes = feature.xml
\ No newline at end of file
+bin.includes = feature.xml, build.properties
Index: TXM/trunk/org.txm.translate.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.translate.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.translate.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Translate TXM
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -37,4 +37,15 @@
       [Enter License Description here.]
    </license>
 
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui.workbench.texteditor"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views"/>
+   </requires>
+
 </feature>

Property changes on: TXM/trunk/org.txm.translate.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.practically.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.practically.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.practically.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -15,6 +15,6 @@
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-Activator: practicallymacro.editormacros.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Automatic-Module-Name: org.txm.practically.rcp
 

Property changes on: TXM/trunk/org.txm.practically.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.treetaggerinstaller.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.treetaggerinstaller.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.treetaggerinstaller.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,7 +4,7 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: TreeTaggerInstaller
 Bundle-ClassPath: TreeTagger/,.
-Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexpor
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3";visibility:=reexpor
  t,org.txm.core;bundle-version="0.7.0";visibility:=reexport,org.txm.tr
  eetagger.core;bundle-version="1.0.0";visibility:=reexport,org.eclipse
  .osgi;visibility:=reexport,org.eclipse.core.runtime;bundle-version="3
@@ -12,7 +12,7 @@
  visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.treetaggerinstaller.rcp
 

Property changes on: TXM/trunk/org.txm.treetaggerinstaller.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.perl.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.perl.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.perl.feature/build.properties	(revision 3628)
@@ -1 +1 @@
-bin.includes = feature.xml
+bin.includes = feature.xml, build.properties
Index: TXM/trunk/org.txm.perl.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.perl.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.perl.feature/feature.xml	(revision 3628)
@@ -4,7 +4,7 @@
       label="org.txm.perl.feature"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Be able to run Perl script from TXM File and Macro views
@@ -19,8 +19,8 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.core" version="0.8.3" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.txm.perl.core" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 

Property changes on: TXM/trunk/org.txm.perl.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.cooccurrence.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.cooccurrence.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.cooccurrence.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
  reexport,org.txm.cooccurrence.core;bundle-version="1.0.0";visibility:
  =reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.cooccurrence.rcp
 
Index: TXM/trunk/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java
===================================================================
--- TXM/trunk/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java	(revision 3627)
+++ TXM/trunk/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java	(revision 3628)
@@ -29,6 +29,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -36,6 +37,7 @@
 import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
@@ -61,6 +63,7 @@
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.txm.cooccurrence.core.functions.Cooccurrence;
+import org.txm.cooccurrence.core.functions.Cooccurrence.CLine;
 import org.txm.cooccurrence.core.functions.comparators.CLineComparator;
 import org.txm.cooccurrence.core.functions.comparators.DistComparator;
 import org.txm.cooccurrence.core.functions.comparators.FreqComparator;
@@ -73,6 +76,7 @@
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.core.results.Parameter;
 import org.txm.core.results.TXMParameters;
+import org.txm.index.core.functions.Line;
 import org.txm.rcp.editors.TXMEditor;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.editors.TableKeyListener;
@@ -103,7 +107,6 @@
 	/** The cooc. */
 	Cooccurrence cooc;
 	
-	
 	/** The empant panel. */
 	EmpantWidget empantPanel;
 	
@@ -590,9 +593,16 @@
 	 * Sort.
 	 */
 	public void sort() {
+		
 		if (cooc != null && !cooc.isDirty() && currentComparator != null) {
 			
 			try {
+				List<CLine> sel = viewer.getStructuredSelection().toList();
+				HashSet<String> lineNames = new HashSet<String>();
+				for (CLine l : sel) {
+					lineNames.add(l.occ);
+				}
+				
 				Log.fine(NLS.bind(CooccurrenceUIMessages.sortByColonP0, currentComparator.getName()));
 				
 				PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
@@ -608,13 +618,27 @@
 						}
 					}
 				});
+				
+				TXMEditor.refreshColumns(this.viewer);
+				
+				viewer.getTable().deselectAll();
+				if (lineNames.size() > 0) {
+					List<CLine> newLines = (List<CLine>) viewer.getInput();
+					for (int i = 0 ; i < newLines.size() ; i++) {
+						
+						if (lineNames.remove(newLines.get(i).occ)) {
+							viewer.getTable().select(i);
+						}
+					}
+					// FIXME setSelection dont work, is it because the table is virtual ?
+					//viewer.setSelection(new StructuredSelection(new ArrayList()));
+					
+				}
 			}
 			catch (Exception e) {
 				Log.severe(TXMCoreMessages.error_errorWhileSortingResult);
 				org.txm.utils.logger.Log.printStackTrace(e);
 			}
-			TXMEditor.refreshColumns(this.viewer);
-			//TXMEditor.packColumns(this.viewer);
 		}
 	}
 	
Index: TXM/trunk/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/adapters/CooccurrenceAdapterFactory.java
===================================================================
--- TXM/trunk/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/adapters/CooccurrenceAdapterFactory.java	(revision 3627)
+++ TXM/trunk/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/adapters/CooccurrenceAdapterFactory.java	(revision 3628)
@@ -2,7 +2,6 @@
 package org.txm.cooccurrence.rcp.adapters;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.FrameworkUtil;
 import org.txm.cooccurrence.core.functions.Cooccurrence;

Property changes on: TXM/trunk/org.txm.cooccurrence.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.index.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.index.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.index.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
  ;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.index.core
 

Property changes on: TXM/trunk/org.txm.index.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.rserve/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.rserve/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.rserve/META-INF/MANIFEST.MF	(revision 3628)
@@ -3,10 +3,10 @@
 Export-Package: org.rosuda.REngine,org.rosuda.REngine.Rserve,org.rosud
  a.REngine.Rserve.protocol
 Bundle-Name: Rserve
-Bundle-Version: 1.4
+Bundle-Version: 1.4.0
 Bundle-ClassPath: .,lib/REngine.jar,lib/RserveEngine.jar
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: https://rforge.net/Rserve/index.html
 Automatic-Module-Name: org.txm.libs.rserve
 

Property changes on: TXM/trunk/org.txm.libs.rserve
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.treetagger.core.models/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.treetagger.core.models/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.treetagger.core.models/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,6 +4,6 @@
 Bundle-SymbolicName: org.txm.treetagger.core.models
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.txm.treetagger.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.treetagger.core.models

Property changes on: TXM/trunk/org.txm.treetagger.core.models
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.jfreesvg/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.jfreesvg/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.jfreesvg/META-INF/MANIFEST.MF	(revision 3628)
@@ -3,10 +3,10 @@
 Export-Package: org.jfree.graphics2d,org.jfree.graphics2d.canvas,org.j
  free.graphics2d.svg
 Bundle-Name: JFreeSVG
-Bundle-Version: 1.7
+Bundle-Version: 1.7.0
 Bundle-ClassPath: .,lib/jfreesvg-1.7.jar
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: www.jfree.org
 Automatic-Module-Name: org.txm.libs.jfreesvg
 

Property changes on: TXM/trunk/org.txm.libs.jfreesvg
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.partition.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.partition.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.partition.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:12 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.partition.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.partition.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.partition.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Partition
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.partition.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.libs.jfreechart/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.jfreechart/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.jfreechart/META-INF/MANIFEST.MF	(revision 3628)
@@ -43,7 +43,7 @@
  org.jfree.data.time.ohlc,
  org.jfree.data.xml,
  org.jfree.data.xy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: www.jfree.org
 Bundle-ClassPath: .,
  lib/jfreechart-1.5.0.jar

Property changes on: TXM/trunk/org.txm.libs.jfreechart
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.javafx/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.javafx/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.javafx/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.txm.libs.javafx
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.txm.libs.javafx
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-ClassPath: jfxswt.jar
 Export-Package: com.sun.deploy.uitoolkit.impl.fx,
  com.sun.deploy.uitoolkit.impl.fx.ui,

Property changes on: TXM/trunk/org.txm.libs.javafx
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.treesearch.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.treesearch.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.treesearch.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,8 +4,8 @@
 Bundle-SymbolicName: org.txm.treesearch.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.txm.treesearch.rcp
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.txm.rcp;bundle-version="0.8.2";visibility:=reexport,
+Bundle-RequiredExecutionEnvironment: JavaSE-16
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3";visibility:=reexport,
  org.txm.treesearch.core;visibility:=reexport,
  org.txm.edition.rcp;bundle-version="1.0.0";visibility:=reexport
 Export-Package: org.txm.treesearch.command,

Property changes on: TXM/trunk/org.txm.treesearch.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.imports.metopes/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.imports.metopes/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.imports.metopes/META-INF/MANIFEST.MF	(revision 3628)
@@ -1,14 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Metopes
-Bundle-SymbolicName: org.txm.imports.metopes;singleton:=true
+Bundle-Name: org.txm.imports.metopes.core
+Bundle-SymbolicName: org.txm.imports.metopes.core;singleton:=true
 Bundle-Version: 1.0.1.qualifier
 Bundle-Activator: org.txm.imports.metopes.Activator
-Require-Bundle: org.txm.core;bundle-version="0.7.0",
- org.txm.rcp;bundle-version="0.8.0",
- org.eclipse.ui,
- org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.txm.core;bundle-version="0.7.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-ActivationPolicy: lazy
 Export-Package: org.txm.importer.metopes,
  org.txm.importer.metopes.preferences,
Index: TXM/trunk/org.txm.imports.metopes/.project
===================================================================
--- TXM/trunk/org.txm.imports.metopes/.project	(revision 3627)
+++ TXM/trunk/org.txm.imports.metopes/.project	(revision 3628)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.txm.imports.metopes</name>
+	<name>org.txm.imports.metopes.core</name>
 	<comment></comment>
 	<projects>
 	</projects>

Property changes on: TXM/trunk/org.txm.imports.metopes
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.treetagger.core.macosx/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.treetagger.core.macosx/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.treetagger.core.macosx/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,5 +5,5 @@
 Bundle-Vendor: Textometrie.org
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.txm.treetagger.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Automatic-Module-Name: org.txm.treetagger.core.macosx

Property changes on: TXM/trunk/org.txm.treetagger.core.macosx
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.deptreeviz/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- TXM/trunk/org.txm.libs.deptreeviz/.settings/org.eclipse.jdt.core.prefs	(revision 3627)
+++ TXM/trunk/org.txm.libs.deptreeviz/.settings/org.eclipse.jdt.core.prefs	(revision 3628)
@@ -1,13 +0,0 @@
-eclipse.preferences.version=1
-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.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-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.release=disabled
-org.eclipse.jdt.core.compiler.source=1.8
Index: TXM/trunk/org.txm.libs.deptreeviz/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.deptreeviz/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.deptreeviz/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,7 +4,7 @@
 Bundle-SymbolicName: org.txm.libs.deptreeviz
 Bundle-Version: 0.3.0.qualifier
 Automatic-Module-Name: org.txm.libs.deptreeviz
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-ClassPath: .,
  deptreeviz-0.3.0.jar,
  dom4j-1.6.1.jar,

Property changes on: TXM/trunk/org.txm.libs.deptreeviz
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.chartsengine.jfreechart.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.chartsengine.jfreechart.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.jfreechart.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -15,7 +15,7 @@
  lity:=reexport,org.txm.chartsengine.jfreechart.core;bundle-version="1
  .0.0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.chartsengine.jfreechart.rcp
 
Index: TXM/trunk/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/themes/highcharts/swing/CustomChartPanel.java
===================================================================
--- TXM/trunk/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/themes/highcharts/swing/CustomChartPanel.java	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.jfreechart.rcp/src/org/txm/chartsengine/jfreechart/rcp/themes/highcharts/swing/CustomChartPanel.java	(revision 3628)
@@ -89,7 +89,7 @@
 		this.setInitialDelay(500);
 		
 		// FIXME MD: for #3082 disable tooltips in Ubuntu -> tooltips make the SWT interface flick/blink
-		this.setDisplayToolTips(!OSDetector.isFamilyUnix());
+		this.setDisplayToolTips(true);
 		
 		// Disable the Swing original pop up menu
 		this.setPopupMenu(null);

Property changes on: TXM/trunk/org.txm.chartsengine.jfreechart.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.cqp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.cqp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.cqp/META-INF/MANIFEST.MF	(revision 3628)
@@ -6,7 +6,7 @@
 Require-Bundle: org.txm.utils.core;bundle-version="1.0.0";visibility:=
  reexport,org.txm.core;visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.libs.cqp
Index: TXM/trunk/org.txm.libs.cqp/src/org/txm/libs/cqp/CQPLibPreferences.java
===================================================================
--- TXM/trunk/org.txm.libs.cqp/src/org/txm/libs/cqp/CQPLibPreferences.java	(revision 3627)
+++ TXM/trunk/org.txm.libs.cqp/src/org/txm/libs/cqp/CQPLibPreferences.java	(revision 3628)
@@ -51,6 +51,7 @@
 	/** The Constant CQI_SERVER_MODE. */
 	public static final String CQI_NETWORK_MODE = "cqi_server_mode"; //$NON-NLS-1$
 	
+	public static String QUERY_FIX_TOKENIZE = "query_fix_tokenize_string"; //$NON-NLS-1$
 	
 	@Override
 	public void initializeDefaultPreferences() {
@@ -145,7 +146,8 @@
 		preferences.put(CQI_SERVER_LOGIN, "anonymous"); //$NON-NLS-1$
 		preferences.put(CQI_SERVER_PASSWORD, ""); //$NON-NLS-1$
 		preferences.putBoolean(CQI_SERVER_IS_REMOTE, false);
-		preferences.putBoolean(CQI_NETWORK_MODE, false); // $NON-NLS-1$
+		preferences.putBoolean(CQI_NETWORK_MODE, false);
+		preferences.putBoolean(QUERY_FIX_TOKENIZE, true);
 		
 		if (saved != null && saved.length() > 0) {
 			Version savedVersion = new Version(saved);

Property changes on: TXM/trunk/org.txm.libs.cqp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.python.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.python.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.python.feature/feature.xml	(revision 3628)
@@ -19,9 +19,9 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.core" version="0.8.0" match="greaterOrEqual"/>
+      <import plugin="org.txm.core" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.txm.python.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
    </requires>
 
    <plugin
Index: TXM/trunk/org.txm.oriflamms.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.oriflamms.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.oriflamms.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-Activator: oriflamms.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.oriflamms.rcp
 

Property changes on: TXM/trunk/org.txm.oriflamms.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.treesearch.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.treesearch.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.treesearch.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,8 +4,8 @@
 Bundle-SymbolicName: org.txm.treesearch.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.txm.treesearch.rcp
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Export-Package: org.txm.treesearch.function,
  org.txm.treesearch.preferences
-Require-Bundle: org.txm.core;bundle-version="0.8.2";visibility:=reexport,
+Require-Bundle: org.txm.core;bundle-version="0.8.3";visibility:=reexport,
  org.txm.searchengine.cqp.core;bundle-version="1.1.0";visibility:=reexport

Property changes on: TXM/trunk/org.txm.treesearch.core
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.rcp.feature/feature.properties
===================================================================
--- TXM/trunk/org.txm.rcp.feature/feature.properties	(revision 3627)
+++ TXM/trunk/org.txm.rcp.feature/feature.properties	(revision 3628)
@@ -1,2 +1,2 @@
 description = \
-TXM 0.8.2 - main commands
\ No newline at end of file
+TXM 0.8.3 - main commands
\ No newline at end of file
Index: TXM/trunk/org.txm.rcp.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.rcp.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.rcp.feature/build.properties	(revision 3628)
@@ -1,14 +1,17 @@
 #Fri Jul 06 10:25:15 CEST 2018
-root.win32.win32.x86_64=win/,../org.txm.libs.cqp.win32/res/win64/dependencies/
-bin.includes=feature.xml
-root.folder.redist/xsl=../org.txm.core/res/org/txm/xml/xsl/
-root.folder.redist/schema=../org.txm.core/res/org/txm/xml/schema/
-root.folder.redist/css=../org.txm.core/res/org/txm/css/
 
-root=../org.txm.setups/shared/all
+bin.includes = feature.xml, build.properties
+               
+root.folder.redist/xsl=../../bundles/org.txm.core/res/org/txm/xml/xsl/
+root.folder.redist/schema=../../bundles/org.txm.core/res/org/txm/xml/schema/
+root.folder.redist/css=../../bundles/org.txm.core/res/org/txm/css/
 
-root.linux.gtk.x86_64.permissions.755=jre/bin/java,plugins/org.txm.libs.cqp.linux/res/linux32/,plugins/org.txm.libs.cqp.linux/res/linux64/,plugins/org.txm.statsengine.r.core.linux/res/linux64/bin/R,plugins/org.txm.statsengine.r.core.linux/res/linux64/bin/exec/R
+root=../../org.txm.setups/shared/all
+
+root.win32.win32.x86_64=win/,../../bundles/org.txm.libs.cqp.win32/res/win64/dependencies/
+
+root.linux.gtk.x86_64.permissions.755=plugins/org.txm.libs.cqp.linux/res/linux32/, plugins/org.txm.libs.cqp.linux/res/linux64/, plugins/org.txm.statsengine.r.core.linux/res/linux64/bin/R, plugins/org.txm.statsengine.r.core.linux/res/linux64/bin/exec/R
 root.linux.gtk.x86_64=linux/
 
-root.macosx.cocoa.x86_64.permissions.755=jre/bin/java,plugins/org.txm.libs.cqp.macosx/res/macosx/,plugins/org.txm.statsengine.r.core.macosx/res/macosx/bin/R,plugins/org.txm.statsengine.r.core.macosx/res/macosx/bin/exec/R
-root.macosx.cocoa.x86_64=mac/
\ No newline at end of file
+root.macosx.cocoa.x86_64.permissions.755=plugins/org.txm.libs.cqp.macosx/res/macosx/, plugins/org.txm.statsengine.r.core.macosx/res/macosx/bin/R, plugins/org.txm.statsengine.r.core.macosx/res/macosx/bin/exec/R
+root.macosx.cocoa.x86_64=mac/
Index: TXM/trunk/org.txm.rcp.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.rcp.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.rcp.feature/feature.xml	(revision 3628)
@@ -2,17 +2,17 @@
 <feature
       id="org.txm.rcp.feature"
       label="TXM RCP"
-      version="0.8.2.qualifier"
+      version="0.8.3.qualifier"
       provider-name="Textometrie.org"
       plugin="org.txm.rcp">
 
-   <description url="https://txm.gitpages.huma-num.fr/textometrie/files/software/TXM/0.8.2/welcome/">
+   <description url="https://txm.gitpages.huma-num.fr/textometrie/files/software/TXM/0.8.3/welcome/">
       %description
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2021 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -103,164 +103,60 @@
 End of TXM User Agreement
    </license>
 
-   <includes
-         id="org.eclipse.rcp"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.equinox.p2.user.ui"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.statsengine.r.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.annotation.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.ca.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.edition.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.groovy.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.internalview.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.lexicaltable.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.partition.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.progression.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.properties.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.referencer.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.searchengine.cqp.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.specificities.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.treetagger.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.chartsengine.jfreechart.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.chartsengine.r.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.annotation.kr.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.index.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.concordance.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.cooccurrence.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.ahc.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.babel.nls_eclipse_fr"
-         version="0.0.0"
-         optional="true"/>
-
-   <includes
-         id="org.txm.xmleditor.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.txm.perl.feature"
-         version="0.0.0"/>
-
    <requires>
       <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.filesystem" version="1.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.filesystem"/>
       <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.console" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.console"/>
       <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.browser" version="3.2.300" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.browser"/>
       <import plugin="org.eclipse.ui.forms"/>
       <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.equinox.p2.ui" version="2.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.p2.ui.sdk" version="1.0.300" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.p2.ui.sdk.scheduler" version="1.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.css.swt.theme" version="0.9.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.equinox.p2.ui"/>
+      <import plugin="org.eclipse.equinox.p2.ui.sdk"/>
+      <import plugin="org.eclipse.equinox.p2.ui.sdk.scheduler"/>
+      <import plugin="org.eclipse.e4.ui.css.swt.theme"/>
       <import plugin="org.eclipse.equinox.p2.operations"/>
-      <import plugin="org.eclipse.equinox.p2.ui.discovery" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.p2.metadata" version="2.2.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.p2.discovery" version="1.0.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.p2.repository" version="2.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.p2.core" version="2.3.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.p2.engine" version="2.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.equinox.p2.ui.discovery"/>
+      <import plugin="org.eclipse.equinox.p2.metadata"/>
+      <import plugin="org.eclipse.equinox.p2.discovery"/>
+      <import plugin="org.eclipse.equinox.p2.repository"/>
+      <import plugin="org.eclipse.equinox.p2.core"/>
+      <import plugin="org.eclipse.equinox.p2.engine"/>
       <import plugin="org.eclipse.e4.ui.model.workbench"/>
-      <import plugin="org.eclipse.e4.ui.workbench" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.ui.workbench"/>
       <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.e4.core.contexts" version="1.6.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi" version="3.12.100" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.ds" version="1.5.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.util" version="1.0.500" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.event" version="1.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.themes" version="1.2.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.core.contexts"/>
+      <import plugin="org.eclipse.osgi"/>
+      <import plugin="org.eclipse.equinox.event"/>
+      <import plugin="org.eclipse.ui.themes"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.equinox.p2.discovery.compatibility"/>
+      <import plugin="org.eclipse.e4.ui.workbench.renderers.swt"/>
+      <import plugin="org.eclipse.ui.net"/>
       <import plugin="org.txm.libs.batik"/>
       <import plugin="org.txm.libs.args4j" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.tokenizer.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.statsengine.core"/>
       <import plugin="org.txm.annotation.core"/>
-      <import plugin="org.eclipse.ui.views" version="3.9.0" match="greaterOrEqual"/>
       <import plugin="org.txm.groovy.core"/>
+      <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.txm.statsengine.core"/>
+      <import plugin="org.txm.tokenizer.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.treetagger.core"/>
-      <import plugin="org.eclipse.equinox.p2.discovery.compatibility" version="1.0.201" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.workbench.renderers.swt"/>
       <import plugin="javax.annotation" version="1.2.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.searchengine.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
-      <import plugin="org.txm.core"/>
-      <import plugin="org.eclipse.ui.net" version="1.3.300" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.net" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.navigator"/>
+      <import plugin="org.apache.felix.scr" version="2.2.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.equinox.simpleconfigurator" version="1.4.100" match="greaterOrEqual"/>
+      <import plugin="org.osgi.service.cm" version="1.6.1" match="greaterOrEqual"/>
+      <import plugin="org.osgi.service.metatype" version="1.4.1" match="greaterOrEqual"/>
+      <import plugin="org.osgi.service.component" version="1.5.0" match="greaterOrEqual"/>
+      <import plugin="org.osgi.service.component.annotations" version="1.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.equinox.simpleconfigurator.manipulator" version="2.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.ui.widgets" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.ui.workbench.addons.swt" version="1.4.400" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.ui.workbench.swt" version="0.16.600" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.debug.core" version="3.20.0" match="greaterOrEqual"/>
+      <import plugin="org.txm.core" version="0.8.3" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -289,11 +185,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.ui.net"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
Index: TXM/trunk/org.txm.rcp.feature/feature_fr.properties
===================================================================
--- TXM/trunk/org.txm.rcp.feature/feature_fr.properties	(revision 3627)
+++ TXM/trunk/org.txm.rcp.feature/feature_fr.properties	(revision 3628)
@@ -1,2 +1,2 @@
 description = \
-TXM 0.8.2 - commandes principales
\ No newline at end of file
+TXM 0.8.3 - commandes principales
\ No newline at end of file

Property changes on: TXM/trunk/org.txm.rcp.feature
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.properties.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.properties.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.properties.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -8,10 +8,10 @@
  org.txm.properties.rcp.preferences
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: %Bundle-Name
-Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexpor
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3";visibility:=reexpor
  t,org.txm.properties.core;bundle-version="1.0.0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.properties.rcp
 

Property changes on: TXM/trunk/org.txm.properties.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.perl.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.perl.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.perl.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,7 +5,7 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: textometrie.org
 Automatic-Module-Name: org.txm.perl.rcp
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.txm.rcp;bundle-version="0.8.2",
+Bundle-RequiredExecutionEnvironment: JavaSE-16
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3",
  org.txm.perl.core;bundle-version="1.0.0"
 Export-Package: org.txm.perl.rcp.preferences

Property changes on: TXM/trunk/org.txm.perl.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.tests.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.tests.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.tests.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -3,9 +3,16 @@
 Bundle-SymbolicName: org.txm.tests.rcp;singleton:=true
 Bundle-Name: Tests
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexpor
- t,org.txm.tests.core;bundle-version="1.0.0";visibility:=reexport
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3";visibility:=reexport,
+ org.txm.tests.core;bundle-version="1.0.0";visibility:=reexport,
+ org.polarion.eclipse.team.svn.connector;bundle-version="6.0.4",
+ org.eclipse.team.svn;bundle-version="4.0.5",
+ org.eclipse.team.svn.ui;bundle-version="4.0.5",
+ org.polarion.eclipse.team.svn.connector.javahl18;bundle-version="6.0.0",
+ org.polarion.eclipse.team.svn.connector.javahl19;bundle-version="6.0.0",
+ org.polarion.eclipse.team.svn.connector.svnkit18;bundle-version="6.0.4",
+ org.txm.svn.rcp;bundle-version="1.0.0"
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 
Index: TXM/trunk/org.txm.tests.rcp/src/org/txm/tests/rcp/command/TestImports.java
===================================================================
--- TXM/trunk/org.txm.tests.rcp/src/org/txm/tests/rcp/command/TestImports.java	(revision 0)
+++ TXM/trunk/org.txm.tests.rcp/src/org/txm/tests/rcp/command/TestImports.java	(revision 3628)
@@ -0,0 +1,219 @@
+// Copyright © 2010-2020 ENS de Lyon., University of Franche-Comté
+// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
+// Lyon 2, University of Franche-Comté, University of Nice
+// Sophia Antipolis, University of Paris 3.
+// 
+// The TXM platform is free software: you can redistribute it
+// and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation,
+// either version 2 of the License, or (at your option) any
+// later version.
+// 
+// The TXM platform is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+// PURPOSE. See the GNU General Public License for more
+// details.
+// 
+// You should have received a copy of the GNU General
+// Public License along with the TXM platform. If not, see
+// http://www.gnu.org/licenses.
+// 
+// 
+// 
+// $LastChangedDate:$
+// $LastChangedRevision:$
+// $LastChangedBy:$ 
+//
+package org.txm.tests.rcp.command;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.txm.Toolbox;
+import org.txm.objects.Project;
+import org.txm.rcp.JobsTimer;
+import org.txm.rcp.handlers.scripts.ExecuteImportScript;
+import org.txm.rcp.swt.dialog.LastOpened;
+import org.txm.rcp.utils.JobHandler;
+import org.txm.utils.zip.Zip;
+
+public class TestImports extends AbstractHandler {
+
+	public static String ID = "org.txm.rcp.commands.tests.TestImports";
+
+	static HashMap<String, String> scripts = new HashMap<String, String>();
+	static {
+		scripts.clear();
+		scripts.put("cnr", "discoursLoader.groovy"); // cnr +csv
+		scripts.put("hyperbase", "hyperbaseLoader.groovy"); // old hyperbase
+		scripts.put("alceste", "alcesteLoader.groovy"); // alceste
+		scripts.put("alceste2", "alcesteLoader.groovy"); // alceste
+		scripts.put("bfm", "bfmLoader.groovy"); // xml-tei-bfm
+		scripts.put("frantext", "frantextLoader.groovy"); // xml-tei-bfm
+		scripts.put("xml", "xmlLoader.groovy"); // xml
+		scripts.put("factiva", "factivaLoader.groovy"); // factiva
+		scripts.put("xml", "xmlLoader.groovy"); // <w attr="" atrt2="">
+		scripts.put("xmlws", "xmlLoader.groovy"); // <w attr="" atrt2="">
+		scripts.put("txt", "txtLoader.groovy"); // txt + csv
+		scripts.put("transcriber", "transcriberLoader.groovy"); // echant EVS +
+																// csv
+		scripts.put("xmltxm", "xmltxmLoader.groovy"); // domi
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands
+	 * .ExecutionEvent)
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		String txmhome = Toolbox.getTxmHomePath();
+		final File scriptsdir = new File(txmhome, "scripts/import");
+		// final File sourcesdir = new
+		// File(System.getProperty("user.home"),"xml/TESTS");
+		final int delta = 100 / scripts.size();
+
+		System.out
+				.println("Please select the directory containing source directories for the following import modules :");
+		System.out.println(scripts.toString());
+
+		Shell shell = HandlerUtil.getActiveWorkbenchWindowChecked(event)
+				.getShell();
+		DirectoryDialog dialog = new DirectoryDialog(shell, SWT.OPEN);
+
+		if (LastOpened.getFile(ID) != null) {
+			dialog.setFilterPath(LastOpened.getFolder(ID));
+		} else {
+			dialog.setFilterPath(System.getProperty("user.home"));
+		}
+		String path = dialog.open();
+
+		if (path == null)
+			return null;
+
+		final File sourcesdir = new File(path);
+
+		if (!scriptsdir.exists()) {
+			System.out.println("Error: TXM is not well installed.");
+			System.out.println("Cannot find TXM import scripts directory: "
+					+ scriptsdir);
+			return null;
+		}
+
+		if (!sourcesdir.exists()) {
+			System.out.println("Cannot find test sources directory: "
+					+ sourcesdir);
+			return null;
+		}
+
+		System.out
+				.println("Select the directory containing the source directories : "
+						+ scripts.keySet());
+		JobHandler jobhandler = new JobHandler(
+				"Testing TXM - select the directory containing the source dierctories") {
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				this.runInit(monitor);
+				try {
+					String txmhome = Toolbox.getTxmHomePath();
+					File outDir = new File(txmhome, "results/TESTS-imports");
+					outDir.mkdirs();
+					ArrayList<File> missings = new ArrayList<File>();
+					try {
+						monitor.beginTask("Testing imports", 100);
+						JobsTimer.start();
+
+						for (String filename : scripts.keySet()) {
+							final File source = new File(sourcesdir, filename);
+							final File script = new File(scriptsdir,
+									scripts.get(filename));
+
+							if (source.exists()) {
+								
+								Project project = new Project(Toolbox.workspace, "TEST-"+source.getName().substring(0, 3).toUpperCase());
+								project.setSourceDirectory(source.getAbsolutePath());
+								project.setImportModuleName(filename);//$NON-NLS-1$
+								System.out.println("USING ROOT DIR : "
+										+ project.getSrcdir());
+								this.syncExec(new Runnable() {
+									public void run() {
+										
+										try {
+											project.compute();
+											
+											ExecuteImportScript.executeScript(project);
+										} catch (Exception e) {
+											// TODO Auto-generated catch block
+											e.printStackTrace();
+										}
+									}
+								});
+							} else {
+								System.out.println("Warning: Missing source directory: " + source);
+								missings.add(source);
+							}
+							monitor.worked(delta);
+							if (monitor.isCanceled())
+								return Status.CANCEL_STATUS;
+						}
+					} catch (Exception e) {
+						org.txm.utils.logger.Log.printStackTrace(e);
+						return Status.CANCEL_STATUS;
+					}
+
+					String date = Toolbox.dateformat.format(new java.util.Date());
+					File zipFile = new File(outDir.getParentFile(),
+							"TESTS_imports_" + date + ".zip");
+					File zipFile2 = new File(outDir.getParentFile(),
+							"TESTS_imports_.odt");
+					this.acquireSemaphore();
+					zipFile.delete();
+					zipFile2.delete();
+					this.releaseSemaphore();
+					if (missings.size() > 0)
+						System.out.println("Missing sources directories: "
+								+ missings);
+					monitor.beginTask(
+							"Testing imports: results will be compressed in "
+									+ zipFile.getAbsolutePath(), 100);
+					System.out
+							.println("Testing imports: results will be compressed in "
+									+ zipFile.getAbsolutePath());
+					try {
+						this.acquireSemaphore();
+						Zip.compress(outDir, zipFile2);
+						zipFile2.renameTo(zipFile);
+						this.releaseSemaphore();
+					} catch (IOException e) {
+						org.txm.utils.logger.Log.printStackTrace(e);
+						return Status.CANCEL_STATUS;
+					}
+				} catch (ThreadDeath td) {
+					return Status.CANCEL_STATUS;
+				} finally {
+					monitor.done();
+					JobsTimer.stopAndPrint();
+				}
+				return Status.OK_STATUS;
+			}
+		};
+
+		jobhandler.startJob();
+		return null;
+	}
+}

Property changes on: TXM/trunk/org.txm.tests.rcp/src/org/txm/tests/rcp/command/TestImports.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: TXM/trunk/org.txm.tests.rcp/src/org/txm/tests/rcp/command/TestImportLangs.java
===================================================================
--- TXM/trunk/org.txm.tests.rcp/src/org/txm/tests/rcp/command/TestImportLangs.java	(revision 0)
+++ TXM/trunk/org.txm.tests.rcp/src/org/txm/tests/rcp/command/TestImportLangs.java	(revision 3628)
@@ -0,0 +1,168 @@
+// Copyright © 2010-2020 ENS de Lyon., University of Franche-Comté
+package org.txm.tests.rcp.command;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.txm.Toolbox;
+import org.txm.core.preferences.TBXPreferences;
+import org.txm.objects.Project;
+import org.txm.rcp.JobsTimer;
+import org.txm.rcp.handlers.scripts.ExecuteImportScript;
+import org.txm.rcp.utils.JobHandler;
+import org.txm.utils.io.IOUtils;
+import org.xml.sax.SAXException;
+
+public class TestImportLangs extends AbstractHandler {
+
+	public static String ID = "org.txm.rcp.commands.tests.TestImports";
+
+	static HashMap<String, String> scripts = new HashMap<String, String>();
+	static {
+		scripts.clear();
+		scripts.put("xml", "xmlLoader.groovy"); // xml	
+		scripts.put("txt", "txtLoader.groovy"); // txt + csv
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands
+	 * .ExecutionEvent)
+	 */
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		String txmhome = Toolbox.getTxmHomePath();
+		final File scriptsdir = new File(txmhome, "scripts/import");
+
+		System.out.println("Select the directory containing the source directories : "
+				+ scripts.keySet());
+		JobHandler jobhandler = new JobHandler(
+				"Testing TXM - langs") {
+			@Override
+			protected IStatus run(IProgressMonitor monitor) {
+				this.runInit(monitor);
+				try {
+					try {
+						final File sourcesdir = new File("/tmp/test-langs");
+						sourcesdir.mkdirs();
+
+						if (!scriptsdir.exists()) {
+							System.out.println("Error: TXM is not well installed.");
+							System.out.println("Cannot find TXM import scripts directory: "
+									+ scriptsdir);
+							return null;
+						}
+
+						if (!sourcesdir.exists()) {
+							System.out.println("Cannot find test sources directory: "
+									+ sourcesdir);
+							return null;
+						}
+
+						monitor.beginTask("Testing imports", 100);
+						JobsTimer.start();
+
+						importXMLCorpus(this, sourcesdir, scriptsdir);
+						importTXTCorpus(this, sourcesdir, scriptsdir);
+
+					} catch (Exception e) {
+						org.txm.utils.logger.Log.printStackTrace(e);
+						return Status.CANCEL_STATUS;
+					}
+
+				} catch (ThreadDeath td) {
+					return Status.CANCEL_STATUS;
+				} finally {
+					monitor.done();
+					JobsTimer.stopAndPrint();
+				}
+				return Status.OK_STATUS;
+			}
+
+
+		};
+
+		jobhandler.startJob();
+		return null;
+	}
+
+	protected boolean importXMLCorpus(JobHandler jobhandler, File sourcesdir, File scriptsdir) throws Exception {
+		final File source = new File(sourcesdir, "XMLLANGTEST");
+		source.mkdirs();
+		File oneTextFile = new File(source, "file.xml");
+		IOUtils.write(oneTextFile, "<text>This corpus works fine. That's all.</text>");
+		final File script = new File(scriptsdir, scripts.get("xml"));
+
+		final Project project = new Project(Toolbox.workspace, "TESTXML");
+		project.setSourceDirectory(source.getAbsolutePath());
+		project.setLang("en");
+		project.setAnnotate(true); //$NON-NLS-1$
+		project.setImportModuleName("xml");//$NON-NLS-1$
+		project.compute();
+
+		System.out.println("USING ROOT DIR : "+ project.getSrcdir());
+		jobhandler.syncExec(new Runnable() {
+			public void run() {
+				new ExecuteImportScript();
+				JobHandler job = ExecuteImportScript
+						.executeScript(project);
+				try {
+					job.join();
+				} catch (InterruptedException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		});
+		return true;	}
+
+	protected boolean importTXTCorpus(JobHandler jobhandler, File sourcesdir, File scriptsdir) throws Exception {
+		final File source = new File(sourcesdir, "TXTLANGTEST");
+		source.mkdirs();
+		File oneTextFile = new File(source, "file.txt");
+		IOUtils.write(oneTextFile, "<text>C'est !C'est encore une phrase qui ne s'tokenize pas bien. Mais c'est pas drave.");
+		
+		final File script = new File(scriptsdir, scripts.get("txt"));
+
+		final Project project = new Project(Toolbox.workspace, "TESTTXT");
+		project.setSourceDirectory(source.getAbsolutePath());
+		project.setLang("fr");
+		project.setAnnotate(true); //$NON-NLS-1$
+		project.setImportModuleName("txt");//$NON-NLS-1$
+		project.compute();
+		
+		System.out.println("USING ROOT DIR : "+ project.getSrcdir());
+		jobhandler.syncExec(new Runnable() {
+			public void run() {
+				new ExecuteImportScript();
+				JobHandler job = ExecuteImportScript
+						.executeScript(project);
+				try {
+					job.join();
+				} catch (InterruptedException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+			}
+		});
+		return true;
+	}
+}

Property changes on: TXM/trunk/org.txm.tests.rcp/src/org/txm/tests/rcp/command/TestImportLangs.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain


Property changes on: TXM/trunk/org.txm.tests.rcp/src/org/txm/tests/rcp/command
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.tests.rcp/src/org/txm/tests/rcp/editor/TestsEditor.java
===================================================================
--- TXM/trunk/org.txm.tests.rcp/src/org/txm/tests/rcp/editor/TestsEditor.java	(revision 3627)
+++ TXM/trunk/org.txm.tests.rcp/src/org/txm/tests/rcp/editor/TestsEditor.java	(revision 3628)
@@ -22,9 +22,9 @@
 import org.eclipse.ui.part.EditorPart;
 import org.txm.Toolbox;
 import org.txm.rcp.IImageKeys;
-import org.txm.rcp.commands.tests.Test;
-import org.txm.rcp.commands.tests.TestBench;
 import org.txm.rcp.handlers.files.EditFile;
+import org.txm.scripts.macro.tests.Test;
+import org.txm.scripts.macro.tests.TestBench;
 
 public class TestsEditor extends EditorPart {
 
Index: TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/ResetAllTestsMacro.groovy
===================================================================
--- TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/ResetAllTestsMacro.groovy	(revision 0)
+++ TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/ResetAllTestsMacro.groovy	(revision 3628)
@@ -0,0 +1,22 @@
+package org.txm.scripts.macro.tests
+
+import java.io.File
+import org.kohsuke.args4j.*
+import groovy.transform.Field
+import org.txm.rcp.swt.widget.parameters.*
+import org.txm.Toolbox
+import org.txm.rcp.commands.tests.*
+
+@Field @Option(name="step", usage="step to execute, 0=all 1=export&test 2=test", widget="Integer", required=true, def="0")
+int step
+
+// Open the parameters input dialog box
+if (!ParametersDialog.open(this)) return;
+
+if (step < 0) step = 0;
+if (step > 3) step = 2;
+
+TestBench bench = GroovyTestBench.getTests();
+for (Test test : bench.getTests().values()) {
+	test.reset();
+}
\ No newline at end of file
Index: TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/RunAllTestsMacro.groovy
===================================================================
--- TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/RunAllTestsMacro.groovy	(revision 0)
+++ TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/RunAllTestsMacro.groovy	(revision 3628)
@@ -0,0 +1,27 @@
+package org.txm.scripts.macro.tests
+
+import java.io.File
+import org.kohsuke.args4j.*
+import groovy.transform.Field
+import org.txm.rcp.swt.widget.parameters.*
+import org.txm.Toolbox
+import org.txm.rcp.commands.tests.*
+
+@Field @Option(name="step", usage="step to execute, 0=all 1=export&test 2=test", widget="Integer", required=true, def="0")
+int step
+
+// Open the parameters input dialog box
+if (!ParametersDialog.open(this)) return;
+
+if (step < 0) step = 0;
+if (step > 3) step = 2;
+
+TestBench bench = GroovyTestBench.getTests();
+for (Test test : bench.getTests().values()) {
+	String name = test.getName()
+	if (test.run(step)) {
+		println "$name -> OK"
+	} else {
+		println "$name -> KO"
+	}
+}
\ No newline at end of file
Index: TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/DeleteTestMacro.groovy
===================================================================
--- TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/DeleteTestMacro.groovy	(revision 0)
+++ TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/DeleteTestMacro.groovy	(revision 3628)
@@ -0,0 +1,23 @@
+package org.txm.scripts.macro.tests
+
+import java.io.File
+import org.kohsuke.args4j.*
+import groovy.transform.Field
+import org.txm.rcp.swt.widget.parameters.*
+import org.txm.Toolbox
+import org.txm.rcp.commands.tests.*
+
+@Field @Option(name="name", usage="The test name to delete", widget="String", required=true, def="test1")
+String name
+
+// Open the parameters input dialog box
+if (!ParametersDialog.open(this)) return;
+
+TestBench bench = GroovyTestBench.getTests();
+Test test = bench.getTest(name)
+
+if (test != null) {
+	bench.deleteTest(test.getName())
+} else {
+	println "No test with name=$name to delete."
+}
\ No newline at end of file
Index: TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/GroovyTestBench.groovy
===================================================================
--- TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/GroovyTestBench.groovy	(revision 0)
+++ TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/GroovyTestBench.groovy	(revision 3628)
@@ -0,0 +1,24 @@
+package org.txm.scripts.macro.tests
+
+import org.txm.Toolbox
+
+/**
+ * Stores the Tests results
+ * 
+ * @author mdecorde
+ *
+ */
+public class GroovyTestBench {
+	
+	private static TestBench bench = null;
+	
+	public TestBench getTests() {
+		if (bench != null) return bench;
+		
+		File dir = new File(Toolbox.getTxmHomePath(), "scripts/groovy/user/org/txm/scripts/tests");
+		dir.mkdirs();
+		bench = new TestBench(dir);
+		
+		return bench;
+	}
+}
Index: TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/RunTestMacro.groovy
===================================================================
--- TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/RunTestMacro.groovy	(revision 0)
+++ TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/RunTestMacro.groovy	(revision 3628)
@@ -0,0 +1,29 @@
+package org.txm.scripts.macro.tests
+
+import java.io.File
+import org.kohsuke.args4j.*
+import groovy.transform.Field
+import org.txm.rcp.swt.widget.parameters.*
+import org.txm.Toolbox
+import org.txm.rcp.commands.tests.*
+
+@Field @Option(name="name", usage="The test name to run", widget="String", required=true, def="test1")
+String name
+
+@Field @Option(name="step", usage="step to execute, 0=all 1=export&test 2=test", widget="Integer", required=true, def="0")
+int step
+
+// Open the parameters input dialog box
+if (!ParametersDialog.open(this)) return;
+
+if (step < 0) step = 0;
+if (step > 3) step = 2;
+
+TestBench bench = GroovyTestBench.getTests();
+Test test = bench.getTest(name)
+
+if (test.run(step)) {
+	println "$name -> OK see "+test.getLogs()
+} else {
+	println "$name -> KO see "+test.getLogs()
+}
\ No newline at end of file
Index: TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/WriteQualifierInBuildPropertiesFromSVN.java
===================================================================
--- TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/WriteQualifierInBuildPropertiesFromSVN.java	(revision 0)
+++ TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/WriteQualifierInBuildPropertiesFromSVN.java	(revision 3628)
@@ -0,0 +1,138 @@
+package org.txm.scripts.macro.tests;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileOutputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Properties;
+
+import org.tmatesoft.svn.core.SVNDirEntry;
+import org.tmatesoft.svn.core.SVNURL;
+import org.tmatesoft.svn.core.io.SVNRepository;
+import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
+import org.tmatesoft.svn.core.wc.SVNClientManager;
+import org.tmatesoft.svn.core.wc.SVNInfo;
+import org.tmatesoft.svn.core.wc.SVNRevision;
+import org.tmatesoft.svn.core.wc.SVNWCClient;
+import org.txm.utils.io.IOUtils;
+
+/**
+ * Write the qualifier in build.properties of all plugins from the SVN revision.
+ * @author sjacquot
+ *
+ */
+public class WriteQualifierInBuildPropertiesFromSVN {
+
+	public static File workspace = new File("../"); // SJ
+
+	public static int updatedFilesCount = 0;
+	
+	/**
+	 * fetch  the org.txm projects that ends with core or rcp
+	 * @return
+	 */
+	protected static ArrayList<File> getProjects() {
+		ArrayList<File> ret = new ArrayList<File>();
+		if (!workspace.exists()) {
+			System.err.println("ERROR: "+workspace+" does not exists. Set it in TXMPluginTest.java.");
+			return ret;
+		} 
+
+		ret.addAll(Arrays.asList(workspace.listFiles(new FileFilter() {
+			@Override
+			public boolean accept(File pathName) {
+				return pathName.isDirectory() &&
+						(pathName.getName().endsWith(".rcp")
+								|| pathName.getName().endsWith(".core")
+								|| pathName.getName().endsWith(".feature")
+								);
+			}
+		})));
+
+		Collections.sort(ret);
+		return ret;
+	}
+	
+	public static void main(String[] args) {
+		ArrayList<File> projectsList = getProjects();
+		for (int i = 0; i < projectsList.size(); i++) {
+			writeQualifierInBuildProperties(projectsList.get(i));
+		}
+		
+		System.out.println("Done. " + updatedFilesCount + " build.properties files have been updated.");
+	}
+
+	
+	
+	public static void writeQualifierInBuildProperties(File projectDirectory) {
+
+		try {
+			SVNWCClient client = SVNClientManager.newInstance().getWCClient();
+			SVNInfo info = client.doInfo(projectDirectory, SVNRevision.WORKING);
+			SVNURL location = info.getURL();
+			SVNRepository repository = SVNRepositoryFactory.create(location);
+			
+//			long latestRevision = repository.getLatestRevision();
+//			System.out.println("[" + location.toString() + "] latest revision: " + latestRevision); 
+
+
+			SVNDirEntry entry = repository.info(".", -1);
+//			System.out.println("[" + location.toString() + "] latest revision: " + entry.getRevision());
+//			System.out.println("[" + location.toString() + "] latest date: " + entry.getDate());
+			
+			SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd-HHmm");
+			//SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMddHHmm");
+			String date = formatter.format(entry.getDate());
+			System.out.println("[" + location.toString() + " / " + projectDirectory + "] latest date: " + date);
+//			System.err.println("formatted date: " + format);
+			
+//			SvnOperationFactory operationFactory = new SvnOperationFactory();
+//			SvnLog logOperation = operationFactory.createLog();
+//			logOperation.setSingleTarget(SvnTarget.fromFile( projectDirectory )			);
+//			logOperation.setRevisionRanges( Collections.singleton(
+//			        SvnRevisionRange.create(
+//			                SVNRevision.create( 1 ),
+//			                SVNRevision.HEAD
+//			        )
+//			) );
+//			Collection<SVNLogEntry> logEntries = logOperation.run( null );
+//			System.out.println( "logEntries = " + logEntries );
+			
+			
+			File buildFile = new File(projectDirectory, "build.properties");
+			
+			if (!buildFile.exists()) {
+				System.err.println("No build.properties file in: " + projectDirectory);
+				return;
+			}
+			
+			Properties props = new Properties();
+			props.load(IOUtils.getReader(buildFile));
+
+			// Debug: deleting all qualifiers
+//			props.remove("qualifier");
+//			props.store(new FileOutputStream(buildFile), null);
+			
+			// Write qualifier
+			String oldDate = props.getProperty("qualifier");
+			if(oldDate == null || !oldDate.equals(date))	{
+				
+				if(oldDate == null)	{
+					oldDate = "none";
+				}
+				
+				updatedFilesCount++;
+				System.out.println("Setting qualifier from " + oldDate + " to " + date);
+				props.setProperty("qualifier", date);
+				props.store(new FileOutputStream(buildFile), null);
+			}
+		}
+		catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+}
\ No newline at end of file

Property changes on: TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/WriteQualifierInBuildPropertiesFromSVN.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/NewTestMacro.groovy
===================================================================
--- TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/NewTestMacro.groovy	(revision 0)
+++ TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/NewTestMacro.groovy	(revision 3628)
@@ -0,0 +1,23 @@
+package org.txm.scripts.macro.tests
+
+import java.io.File
+import org.kohsuke.args4j.*
+import groovy.transform.Field
+import org.txm.rcp.swt.widget.parameters.*
+import org.txm.Toolbox
+import org.txm.rcp.commands.tests.*
+
+@Field @Option(name="name", usage="The test name to create", widget="String", required=true, def="test1")
+String name
+
+// Open the parameters input dialog box
+if (!ParametersDialog.open(this)) return;
+
+TestBench bench = GroovyTestBench.getTests();
+Test test = bench.getTest(name)
+
+if (test != null) {
+	println "Already created."
+} else {
+	bench.newTest(name)
+}
\ No newline at end of file
Index: TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/Test.java
===================================================================
--- TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/Test.java	(revision 0)
+++ TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/Test.java	(revision 3628)
@@ -0,0 +1,177 @@
+package org.txm.scripts.macro.tests;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.txm.groovy.core.GSERunner;
+
+import groovy.lang.Binding;
+
+public class Test {
+
+	String name;
+	File directory;
+	File create, export, test;
+	File create_ok, export_ok, test_ok;
+	File create_error, export_error, test_error;
+	File[] all = {create_ok, export_ok, test_ok, create_error, export_error, test_error};
+	
+	private Binding binding;
+
+	public Test(File scriptDir, String name) {
+		this.name = name;
+		//File scriptDir = new File(Toolbox.getTxmHomePath(), "scripts/groovy/user/org/txm/tests");
+		scriptDir.mkdirs();
+
+		this.directory = new File(scriptDir, name);
+		this.directory.mkdirs();
+		
+		create = new File(directory, "create.groovy");
+		export = new File(directory, "export.groovy");
+		test = new File(directory, "test.groovy");
+
+		create_ok = new File(directory, "create.ok");
+		export_ok = new File(directory, "export.ok");
+		test_ok = new File(directory, "test.ok");
+
+		create_error = new File(directory, "create.error");
+		export_error = new File(directory, "export.error");
+		test_error = new File(directory, "test.error");
+	}
+	
+	public void reset() {
+		create_ok.delete();
+		export_ok.delete();
+		test_ok.delete();
+
+		create_error.delete();
+		export_error.delete();
+		test_error.delete();
+	}
+	
+	public List<File> getLogs() {
+		ArrayList<File> logs = new ArrayList<File>();
+		for (File f : all) {
+			if (f.exists()) {
+				logs.add(f);
+			}
+		}
+	
+		return logs;
+	}
+
+	/**
+	 * 
+	 * @param start_step 0 starting step : all=create&export&test export=export&test test=step
+	 * @return
+	 */
+	public boolean run(int start_step) {
+		GSERunner gse = GSERunner.buildDefaultGSE();
+		System.out.println("Run "+name+" from "+start_step);
+		this.binding = new Binding();
+		try {
+			if (start_step <= 0) {
+				create_ok.delete();
+				create_error.delete();
+				Object ret_create = gse.run(create, binding);
+
+				if (ret_create != null && Boolean.FALSE != ret_create) {
+					binding.setProperty("results", ret_create);
+					create_ok.createNewFile();
+				} else {
+					create_error.createNewFile();
+					return false;
+				}
+			}
+
+			if (export.exists() && start_step <= 1) {
+				export_ok.delete();
+				export_error.delete();
+				Object ret_export = gse.run(export, binding);
+				if (ret_export != null && Boolean.FALSE != ret_export) {
+					export_ok.createNewFile();
+				} else {
+					create_error.createNewFile();
+					return false;
+				}
+
+				if (test.exists() && start_step <= 2) {
+					test_ok.delete();
+					test_error.delete();
+					Object ret_test = gse.run(test, binding);
+					if (ret_test != null && Boolean.FALSE != ret_test) {
+						test_ok.createNewFile();
+					} else {
+						test_error.createNewFile();
+						return false;
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+		
+		return true;
+	}
+
+	public boolean hasCreateStep() {
+		return create.exists();
+	}
+
+	public boolean hasExportStep() {
+		return export.exists();
+	}
+
+	public boolean hasTestStep() {
+		return test.exists();
+	}
+
+	public boolean isCreateStepOK() {
+		return create_ok.exists();
+	}
+
+	public boolean isExportStepOK() {
+		return export_ok.exists();
+	}
+
+	public boolean isTestStepOK() {
+		return test_ok.exists();
+	}
+
+	public File getCreateStepScript() {
+		return create;
+	}
+
+	public File getCreateStepLog() {
+		if (isCreateStepOK()) return create_ok;
+		return create_error;
+	}
+
+	public File getExportStepScript() {
+		return export;
+	}
+
+	public File getExportStepLog() {
+		if (isExportStepOK()) return export_ok;
+		return export_error;
+	}
+	
+	public File getTestStepScript() {
+		return test;
+	}
+
+	public File getTestStepLog() {
+		if (isTestStepOK()) return test_ok;
+		return test_error;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public File getDirectory() {
+		return directory;
+	}
+}

Property changes on: TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/Test.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/TestBench.java
===================================================================
--- TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/TestBench.java	(revision 0)
+++ TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/TestBench.java	(revision 3628)
@@ -0,0 +1,57 @@
+package org.txm.scripts.macro.tests;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+
+import org.txm.utils.DeleteDir;
+
+public class TestBench {
+	HashMap<String, Test> tests = new HashMap<String, Test>();
+	
+	private File dir;
+	
+	public TestBench(File dir) {
+		this.dir = dir;
+		if (dir.exists()) {
+			for (File testDir : dir.listFiles()) {
+				if (new File(testDir, "create.groovy").exists()) {
+					String name = testDir.getName();
+					tests.put(name, new Test(dir, name));
+				}
+			}
+		}
+	}
+	
+	public HashMap<String, Test> getTests() {
+		return tests;
+	}
+	
+	public Test getTest(String name) {
+		return tests.get(name);
+	}
+	
+	public Test newTest(String name) {
+		
+		File testDir = new File(dir, name);
+		testDir.mkdir();
+		File create = new File(testDir, "create.groovy");
+		try {
+			create.createNewFile();
+		} catch (IOException e) {
+			e.printStackTrace();
+			return null;
+		}
+		
+		tests.put(name, new Test(dir, name));
+		return tests.get(name);
+	}
+	
+	public Test deleteTest(String name) {
+		
+		File testDir = new File(dir, name);
+		DeleteDir.deleteDirectory(testDir);
+		
+		return tests.remove(name);
+	}
+}

Property changes on: TXM/trunk/org.txm.tests.rcp/src/org/txm/scripts/macro/tests/TestBench.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain


Property changes on: TXM/trunk/org.txm.tests.rcp/src/org/txm
___________________________________________________________________
Added: svn:ignore
   + target



Property changes on: TXM/trunk/org.txm.tests.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.libs.itext/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.libs.itext/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.libs.itext/META-INF/MANIFEST.MF	(revision 3628)
@@ -13,7 +13,7 @@
 Bundle-Version: 2.1.5
 Bundle-ClassPath: .,lib/iText-2.1.5.jar
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: itextpdf.com
 Automatic-Module-Name: org.txm.libs.itext
 

Property changes on: TXM/trunk/org.txm.libs.itext
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/player/SimpleMediaExample.java
===================================================================
--- TXM/trunk/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/player/SimpleMediaExample.java	(revision 3627)
+++ TXM/trunk/org.txm.backtomedia.rcp/src/org/txm/backtomedia/editors/player/SimpleMediaExample.java	(revision 3628)
@@ -1,67 +0,0 @@
-package org.txm.backtomedia.editors.player;
-import javafx.application.Application;
-import javafx.geometry.Insets;
-import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
-import javafx.scene.media.Media;
-import javafx.scene.media.MediaPlayer;
-import javafx.scene.media.MediaView;
-import javafx.stage.Stage;
-  
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
-  
-public class SimpleMediaExample extends Application {
-
-	@Override
-    public void start(Stage primaryStage) throws Exception {
-        // Set up the audio
-        Path mediaPath = FileSystems.getDefault().getPath("/HDD800GB/HDD/Vidéos/MOV_0656.mp4");
-        Media media = new Media(mediaPath.toUri().toURL().toExternalForm());
-        MediaPlayer mediaPlayer = new MediaPlayer(media);
-        MediaView view = new MediaView(mediaPlayer);
-        String name = mediaPath.getFileName().toString();
-        Label playingStatus = new Label("Now Playing: ");
-  
-        // Set the play and stop button
-        Button playButton = new Button("Play");
-        playButton.setPrefWidth(60);
-        Button stopButton = new Button("Stop");
-        stopButton.setPrefWidth(60);
-  
-        playButton.setOnAction(e -> {
-            if (mediaPlayer.getStatus() == MediaPlayer.Status.PLAYING) {
-                mediaPlayer.stop();
-                mediaPlayer.play();
-                playingStatus.setText("Now replaying: " + name);
-            } else {
-                mediaPlayer.play();
-                playingStatus.setText("Now playing: " + name);
-            }
-        });
-  
-        stopButton.setOnAction(e -> {
-            mediaPlayer.stop();
-            playingStatus.setText("Audio stopped");
-        });
-  
-        HBox buttonSection = new HBox(playButton, stopButton, view);
-        buttonSection.setSpacing(10);
-        buttonSection.setPadding(new Insets(15));
-  
-        VBox root = new VBox(playingStatus, buttonSection);
-        root.setPadding(new Insets(50));
-  
-        primaryStage.setTitle("Simple Media Example");
-        primaryStage.setScene(new Scene(root, 300, 300));
-        primaryStage.show();
-    }
-  
-    public static void main(String[] args) {
-        launch(args);
-    }
-  
-}
\ No newline at end of file
Index: TXM/trunk/org.txm.backtomedia.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.backtomedia.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.backtomedia.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -9,15 +9,16 @@
  vlcj-4.1.0/vlcj-natives-4.1.0.jar,
  opal-0.9.5.2.jar
 Require-Bundle: org.txm.core;bundle-version="0.7.0";visibility:=reexport,
- org.txm.rcp;bundle-version="0.8.0";visibility:=reexport,
+ org.txm.rcp;bundle-version="0.8.3";visibility:=reexport,
  org.eclipse.core.runtime;visibility:=reexport,
  org.eclipse.ui;visibility:=reexport,
  org.eclipse.core.expressions;bundle-version="3.4.500";visibility:=reexport,
  org.txm.concordance.core;bundle-version="1.0.0";visibility:=reexport,
  org.txm.concordance.rcp;bundle-version="1.0.0";visibility:=reexport,
- org.txm.edition.rcp;bundle-version="1.0.0";visibility:=reexport
+ org.txm.edition.rcp;bundle-version="1.0.0";visibility:=reexport,
+ org.txm.libs.javafx
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.txm.backtomedia.commands.function,
  org.txm.backtomedia.editors.input,

Property changes on: TXM/trunk/org.txm.backtomedia.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.core/src/java/org/txm/scripts/importer/EncodeTEIQuotes.groovy
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/scripts/importer/EncodeTEIQuotes.groovy	(revision 3627)
+++ TXM/trunk/org.txm.core/src/java/org/txm/scripts/importer/EncodeTEIQuotes.groovy	(revision 3628)
@@ -27,6 +27,8 @@
 // $LastChangedBy: mdecorde $ 
 //
 
+import groovy.xml.XmlNodePrinter
+import groovy.xml.XmlParser
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -407,7 +409,7 @@
 		this.quote= quote_value;
 		this.quote_type= quote_type;
 		println "process "+nodesToInspect.size()+" elements with containers "+containers
-		for(groovy.util.slurpersupport.Node root : nodesToInspect)//.body)
+		for(Node root : nodesToInspect)//.body)
 		{
 			println(" root : "+root.children().size())
 			processContainers(root, containers)
Index: TXM/trunk/org.txm.core/src/java/org/txm/scripts/importer/CleanFile.groovy
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/scripts/importer/CleanFile.groovy	(revision 3627)
+++ TXM/trunk/org.txm.core/src/java/org/txm/scripts/importer/CleanFile.groovy	(revision 3628)
@@ -51,7 +51,6 @@
 
 import org.txm.utils.io.IOUtils;
 
-// TODO: Auto-generated Javadoc
 /**
  * remove all ctrl char and replace \t by ' '.
  *
@@ -77,12 +76,12 @@
 
 	def static ctrl_reg = /[\p{Cntrl}&&[^\n\t]]/ // all ctrl but \n
 	
-	def static surrogate = "[^\\p{P}&&[^\\u0001-\\uFFFF]]"
-	def static surrogate_reg = /$surrogate/
-	def static surrogate_punct = "[\\p{P}&&[^\\u0001-\\uFFFF]]"
-	def static surrogate_punct_reg = /$surrogate_punct/
-	def static SURROGATE = "_"
-	def static SURROGATE_PUNCT = "☒"
+//	def static surrogate = "[^\\p{P}&&[^\\u0001-\\uFFFF]]"
+//	def static surrogate_reg = /$surrogate/
+//	def static surrogate_punct = "[\\p{P}&&[^\\u0001-\\uFFFF]]"
+//	def static surrogate_punct_reg = /$surrogate_punct/
+//	def static SURROGATE = "_"
+//	def static SURROGATE_PUNCT = "☒"
 	def static EMPTY = ""
 	def static SPACE = " "
 	def static TAB = "\t"
@@ -95,8 +94,8 @@
 	 */
 	public static String cleanAllButTabs(String str) {
 		str = str.replaceAll(ctrl_reg, EMPTY); // remove all ctrl chars
-		str = str.replaceAll(surrogate_reg, SURROGATE); // replace all surrogate chars
-		str = str.replaceAll(surrogate_punct_reg, SURROGATE_PUNCT); // replace all surrogate punct chars
+//		str = str.replaceAll(surrogate_reg, SURROGATE); // replace all surrogate chars
+//		str = str.replaceAll(surrogate_punct_reg, SURROGATE_PUNCT); // replace all surrogate punct chars
 		return str;
 	}
 	
@@ -109,8 +108,9 @@
 	public static String clean(String str) {
 		str = str.replace(TAB, SPACE); // replace \t by ' '
 		str = str.replaceAll(ctrl_reg, EMPTY); // remove all ctrl chars
-		str = str.replaceAll(surrogate_reg, SURROGATE); // replace all surrogate chars
-		str = str.replaceAll(surrogate_punct_reg, SURROGATE_PUNCT); // replace all surrogate punct chars
+		//println "!! THE SURROGATE CLEAN STEP IS COMMENTED" 
+	//	str = str.replaceAll(surrogate_reg, SURROGATE); // replace all surrogate chars
+	//	str = str.replaceAll(surrogate_punct_reg, SURROGATE_PUNCT); // replace all surrogate punct chars
 		return str;
 	}
 	
Index: TXM/trunk/org.txm.core/src/java/org/txm/core/results/TXMResult.java
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/core/results/TXMResult.java	(revision 3627)
+++ TXM/trunk/org.txm.core/src/java/org/txm/core/results/TXMResult.java	(revision 3628)
@@ -92,11 +92,6 @@
 	private static int next = 0;
 	
 	/**
-	 * Editor can use this to test if the result has been computed once.
-	 */
-	private boolean computedOnce = false;
-	
-	/**
 	 * The weight, essentially used for sorting purpose.
 	 */
 	protected int weight;
@@ -147,7 +142,7 @@
 	 * To keep track of the parameters used for the last computing and to determine if the result is dirty.
 	 * Also permits to optimize computing by testing if a specific parameter value has changed since last computing and skip or not some computing steps.
 	 */
-	protected ArrayList<HashMap<String, Object>> parametersHistory = new ArrayList<>();
+	protected ArrayList<HashMap<String, Object>> parametersHistory = null;
 	
 	/**
 	 * User persistable state.
@@ -506,6 +501,9 @@
 		// System.out.println("TXMResult.updateLastParameters() empty");
 		// }
 		
+		if (this.parametersHistory == null) { // 
+			this.parametersHistory = new ArrayList<HashMap<String,Object>>();
+		}
 		this.parametersHistory.add(lastParameters);
 		
 		// truncate the stack to the max count
@@ -546,6 +544,9 @@
 	 * @throws Exception
 	 */
 	protected void clearLastParameters(int parameterType) {
+		
+		if (parametersHistory == null) return; // nothing to do
+		
 		List<Field> fields = BeanParameters.getAllFields(this);
 		
 		for (Field f : fields) {
@@ -573,7 +574,7 @@
 		
 		
 		try {
-			if (this.getLastParametersFromHistory().isEmpty()) {
+			if (this.parametersHistory != null && !this.getLastParametersFromHistory().isEmpty()) {
 				this.parametersHistory.remove(this.parametersHistory.size() - 1);
 			}
 		}
@@ -591,6 +592,9 @@
 	 * @return
 	 */
 	public boolean hasParameterChanged(String key) {
+		
+		if (parametersHistory == null) return true;
+		
 		return this.hasParameterChanged(key, this.getLastParametersFromHistory());
 	}
 	
@@ -633,7 +637,7 @@
 	 * @param parameterType
 	 * @return
 	 */
-	public boolean hasParameterChanged(HashMap<String, Object> lastParameters, int parameterType) throws Exception {
+	public boolean hasParametersChanged(HashMap<String, Object> lastParameters, int parameterType) throws Exception {
 		
 		// result has never been computed
 		if (lastParameters == null) {
@@ -677,8 +681,10 @@
 	 * @return
 	 * @throws Exception
 	 */
-	public boolean hasParameterChanged() throws Exception {
-		return this.hasParameterChanged(this.getLastParametersFromHistory(), Parameter.COMPUTING);
+	public boolean hasParametersChanged() throws Exception {
+		if (parametersHistory == null) return true;
+		
+		return this.hasParametersChanged(this.getLastParametersFromHistory(), Parameter.COMPUTING);
 	}
 	
 	
@@ -845,7 +851,7 @@
 		// return this.hasParameterChanged();
 		// }
 		
-		if (this.hasParameterChanged()) {
+		if (this.hasParametersChanged()) {
 			this.dirty = true;
 		}
 	}
@@ -857,6 +863,7 @@
 	 */
 	public HashMap<String, Object> getLastParametersFromHistory() {
 		try {
+			if (parametersHistory == null) return null;
 			return this.parametersHistory.get(this.parametersHistory.size() - 1);
 		}
 		catch (Exception e) {
@@ -864,7 +871,25 @@
 		}
 	}
 	
+	/**
+	 * TODO seems to work but the TXMEditor.compute() method re-use the widgets values and the parametersHistory is appended with the 'new' parameters
+	 * 
+	 * @throws Exception
+	 */
+	public void revertParametersFromHistory() throws Exception {
+		ArrayList<HashMap<String, Object>> history = getParametersHistory();
+		if (history == null) return; // nothing to do
+		
+		if (history.size() < 2) return; // nothing to do
+		
+		history.remove(history.size() - 1);
+		
+		HashMap<String, Object> last = history.get(history.size() - 1);
+		
+		this.setParameters(last); // auto
+	}
 	
+	
 	/**
 	 * Dumps the parameters history stack to the specified StringBuffer.
 	 * 
@@ -1084,7 +1109,7 @@
 			this.saveParameter(TXMPreferences.PARENT_PARAMETERS_NODE_PATH, this.parent.getParametersNodePath());
 		}
 		
-		if (this.computedOnce) {
+		if (hasBeenComputedOnce()) {
 			this.lazyName = this.getSimpleName();
 		}
 		
@@ -1910,7 +1935,7 @@
 	 * 
 	 * @return a message indicating the start of computing
 	 */
-	// FIXME: SJ: this method must become abstract in TXM 0.8.2 and implemented by subclasses
+	// FIXME: SJ: this method must become abstract in TXM 0.8.3 and implemented by subclasses
 	public String getComputingStartMessage() {
 		return NLS.bind("Computing {0}...", this.getClass().getSimpleName());
 	}
@@ -1923,18 +1948,13 @@
 	 * 
 	 * @return a message indicating the computing is done
 	 */
-	// FIXME: SJ: this method must become abstract in TXM0.8.2 and implemented by subclasses
+	// FIXME: SJ: this method must become abstract in TXM-0.8.3+ and implemented by subclasses
 	public String getComputingDoneMessage() {
 		return TXMCoreMessages.common_done;
 	}
 	// public abstract String getComputingDoneMessage();
 	
-	
-	
-	
-	
-	
-	
+
 	/**
 	 * Gets the user name if exists otherwise, the simple name if not null, otherwise the lazy name.
 	 * 
@@ -2316,7 +2336,7 @@
 		// no changes to do
 		// FIXME: SJ: we need to do do some actions even if the object is locked, eg. updating parameters, saving parameters, etc.
 		// FIXME: MD: nope the parameters must not move and will be saved in the current state
-		if (this.computedOnce && this.locked) {
+		if (hasBeenComputedOnce() && this.locked) {
 			this.computing = false;
 			return true;
 		}
@@ -2354,7 +2374,7 @@
 			// this.updateDirtyFromHistory();
 			
 			// check if the result is dirty
-			if (!this.isDirty() && !hasParameterChanged()) {
+			if (!this.isDirty() && !hasParametersChanged()) {
 				Log.finest("--- TXMResult.compute(): " + this.getClass().getSimpleName() + ": result parameters have not changed since last computing, computing skipped.");
 				skipComputing = true;
 			}
@@ -2417,7 +2437,7 @@
 				
 				// store last used parameters
 				// this.updateLastParameters();
-				if (this.computedOnce// don't update the computing date if the object has been lazy loaded
+				if (hasBeenComputedOnce() // don't update the computing date if the object has been lazy loaded
 						|| this.lastComputingDate == null) { // set the update date if never computed once
 					this.lastComputingDate = Calendar.getInstance().getTime(); // update this internal parameter before saving parameters
 				}
@@ -2437,7 +2457,6 @@
 				}
 				
 				this.dirty = false; // the computing was successful, the result is no more dirty
-				this.computedOnce = true;
 				
 				if (this.altered) {
 					Log.info(NLS.bind("Warning {0} manual modifications have been lost.", this.getSimpleName()));
@@ -2547,7 +2566,6 @@
 			// set back to dirty
 			this.dirty = true;
 			this.computing = false;
-			this.computedOnce = false;
 			
 			// FIXME: SJ: old code, used when the monitor was stored in the TXMResult, need to check if we need a replacement for this
 			// this.monitorSetCanceled(true);
@@ -2773,7 +2791,7 @@
 	 * @return
 	 */
 	public boolean hasBeenComputedOnce() {
-		return computedOnce;
+		return parametersHistory != null;
 	}
 	
 	
Index: TXM/trunk/org.txm.core/src/java/org/txm/objects/BaseOldParameters.java
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/objects/BaseOldParameters.java	(revision 3627)
+++ TXM/trunk/org.txm.core/src/java/org/txm/objects/BaseOldParameters.java	(revision 3628)
@@ -20,11 +20,10 @@
 import org.txm.core.messages.TXMCoreMessages;
 import org.txm.utils.logger.Log;
 import org.txm.utils.xml.DomUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
+import org.w3c.dom.*;
 import org.xml.sax.SAXException;
 
+
 public class BaseOldParameters implements IParameters {
 	
 	public static final DateFormat dateformat = new SimpleDateFormat("yyyy-MM-dd"); //$NON-NLS-1$
@@ -1141,5 +1140,6 @@
 		project.setXslt(this.getXsltElement(this.getCorpusElement()).getAttribute("xsl")); //$NON-NLS-1$
 		project.setAnnotate("true".equals(this.getCorpusElement().getAttribute("annotate"))); //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
 		project.setCleanAfterBuild(this.getCleanTEMPDirectories(this.getCorpusElement()));
+		project.setImportModuleName(scriptFile);
 	}
 }
Index: TXM/trunk/org.txm.core/src/java/org/txm/objects/Workspace.java
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/objects/Workspace.java	(revision 3627)
+++ TXM/trunk/org.txm.core/src/java/org/txm/objects/Workspace.java	(revision 3628)
@@ -52,13 +52,13 @@
  * The Class Workspace: manages the TXM corpora in the $TXMHOME/corpora directory
  */
 public class Workspace extends TXMResult {
-	
+
 	private static final String NAME = "name";
-	
+
 	IWorkspace rcpWorkspace;
-	
+
 	IWorkspaceRoot root;
-	
+
 	IProject corporaProject;
 	// /** The xmlfile. */
 	// File xmlDefinitionFile;
@@ -68,8 +68,8 @@
 	//
 	// /** The projs. */
 	// Element projs;
-	
-	
+
+
 	// /**
 	// * Creates the empty workspace.
 	// *
@@ -108,7 +108,7 @@
 	// }
 	// return true;
 	// }
-	
+
 	/**
 	 * Instantiates a new workspace.
 	 *
@@ -117,12 +117,12 @@
 	 */
 	private Workspace() throws CoreException {
 		super("ROOT");
-		
+
 		rcpWorkspace = ResourcesPlugin.getWorkspace();
 		rcpWorkspace.getRoot().refreshLocal(org.eclipse.core.resources.IResource.DEPTH_INFINITE, null);
 		root = rcpWorkspace.getRoot();
 		corporaProject = root.getProject("corpora");
-		
+
 		if (!corporaProject.exists()) {
 			try {
 				corporaProject.create(null);
@@ -132,17 +132,17 @@
 				e.printStackTrace();
 			}
 		}
-		
+
 		this.setUserName(corporaProject.getName()); // corpora
 		// this.setPath("/"+pName);
 		// this.xmlDefinitionFile = xmlfile;
 	}
-	
+
 	@Override
 	public boolean isInternalPersistable() {
 		return true;
 	}
-	
+
 	public static Workspace getInstance() {
 		if (Toolbox.workspace == null) {
 			try {
@@ -153,10 +153,10 @@
 				return null;
 			}
 		}
-		
+
 		return Toolbox.workspace;
 	}
-	
+
 	/**
 	 * Gets the projects.
 	 *
@@ -166,7 +166,7 @@
 	public List<Project> getProjects() {
 		return getChildren(Project.class);
 	}
-	
+
 	/**
 	 * Gets the project.
 	 *
@@ -181,33 +181,58 @@
 		}
 		return null;
 	}
-	
+
 	@Override
 	public String getSimpleName() {
 		return getUserName();
 	}
-	
+
 	@Override
 	public String getDetails() {
 		return getUserName();
 	}
-	
+
 	@Override
 	public void clean() {
 		// TODO Auto-generated method stub
 	}
-	
+
 	@Override
 	@Deprecated
 	public boolean _toTxt(File arg0, String arg1, String arg2, String arg3) throws Exception {
 		return false;
 	}
-	
+
 	public File getLocation() {
 		return corporaProject.getLocation().toFile().getAbsoluteFile();
 	}
-	
+
 	/**
+	 * 
+	 * @param binCorpusDir the directory to scan
+	 * @return true if the directory contains the mandatory files of a TXM 0.8.0+ corpus
+	 */
+	public static boolean isCorpusBinarydirectoryValid(File binCorpusDir) {
+
+		// System.out.println(Messages.Project_5);
+		File HTMLs = new File(binCorpusDir, "HTML"); //$NON-NLS-1$
+		// File TXMs = new File(binCorpusDir, "txm"); //$NON-NLS-1$
+		File DATAs = new File(binCorpusDir, "data"); //$NON-NLS-1$
+		File REGISTRY = new File(binCorpusDir, "registry"); //$NON-NLS-1$
+		File PARAMS = new File(binCorpusDir, ".settings"); //$NON-NLS-1$
+		File PROJECT = new File(binCorpusDir, ".project"); //$NON-NLS-1$
+
+		return binCorpusDir.exists() 
+				&& HTMLs.exists() 
+				&& DATAs.exists()
+				&& DATAs.listFiles().length > 0
+				&& REGISTRY.exists() 
+				&& REGISTRY.listFiles().length > 0
+				&& PARAMS.exists() 
+				&& PROJECT.exists();// && correspfile.exists())
+	}
+
+	/**
 	 * Scan directory:
 	 * 1- check the binary corpus format
 	 * 2- register in the workspace
@@ -217,7 +242,7 @@
 	 * @throws Exception
 	 */
 	public Project scanDirectory(File binCorpusDir) throws Exception {
-		
+
 		// System.out.println(Messages.Project_5);
 		File HTMLs = new File(binCorpusDir, "HTML"); //$NON-NLS-1$
 		// File TXMs = new File(binCorpusDir, "txm"); //$NON-NLS-1$
@@ -226,11 +251,11 @@
 		File PARAMS = new File(binCorpusDir, ".settings"); //$NON-NLS-1$
 		File PROJECT = new File(binCorpusDir, ".project"); //$NON-NLS-1$
 		binCorpusDir = new File(this.getLocation(), binCorpusDir.getName()); // this is to ensure the project is in the workspace files
-		
+
 		if (binCorpusDir.exists() && HTMLs.exists() && DATAs.exists()
 				&& REGISTRY.exists() && PARAMS.exists() && PROJECT.exists())// && correspfile.exists())
 		{// minimal base data
-			
+
 			File[] maincorpusNames = DATAs.listFiles();
 			String maincorpusName = "";
 			if (maincorpusNames.length == 0) { // no CQP corpus
@@ -240,7 +265,7 @@
 			else {
 				maincorpusName = maincorpusNames[0].getName();
 			}
-			
+
 			Project p = getProject(binCorpusDir.getName());
 			if (p != null) {
 				p.delete(); // a project with the same name already exists
@@ -249,24 +274,24 @@
 			if (p != null) {
 				p.delete(); // a project with the same name already exists
 			}
-			
+
 			// System.out.println(parameters.toString());
-			
+
 			// load the project from the project .settings directory
 			IWorkspace rcpWorkspace = ResourcesPlugin.getWorkspace();
 			// rcpWorkspace.getRoot().refreshLocal(1, new LogMonitor());
-			
+
 			IProjectDescription description = rcpWorkspace.loadProjectDescription(new Path(binCorpusDir.getAbsolutePath() + "/.project"));
 			description.setLocation(new Path(binCorpusDir.getAbsolutePath()));
 			IProject rcpProject = rcpWorkspace.getRoot().getProject(description.getName());
-			
+
 			if (!rcpProject.exists()) {
 				rcpProject.create(description, new LogMonitor());
 			}
 			if (!rcpProject.isOpen()) {
 				rcpProject.open(new LogMonitor());
 			}
-			
+
 			Project b = Project.loadProjectFromProjectScope(rcpProject);
 			if (b != null) {
 				return b;
@@ -282,8 +307,30 @@
 		}
 		return null;
 	}
-	
+
 	/**
+	 * 
+	 * @param binCorpusDir the directory to scan
+	 * @return true if the directory contains the mandatory files of a TXM 0.7.X corpus
+	 */
+	public static boolean isCorpus079DirectoryValid(File binCorpusDir) {
+		// System.out.println(Messages.Project_5);
+		File HTMLs = new File(binCorpusDir, "HTML"); //$NON-NLS-1$
+		// File TXMs = new File(binCorpusDir, "txm"); //$NON-NLS-1$
+		File DATAs = new File(binCorpusDir, "data"); //$NON-NLS-1$
+		File REGISTRY = new File(binCorpusDir, "registry"); //$NON-NLS-1$
+		File PARAMS = new File(binCorpusDir, "import.xml"); //$NON-NLS-1$
+
+		return binCorpusDir.exists()
+				&& HTMLs.exists() 
+				&& DATAs.exists()
+				&& DATAs.listFiles().length > 0
+				&& REGISTRY.exists() 
+				&& REGISTRY.listFiles().length > 0
+				&& PARAMS.exists();// && correspfile.exists())
+	}
+
+	/**
 	 * Scan directory:
 	 * 1- check the binary corpus format
 	 * 2- register in the workspace
@@ -293,16 +340,15 @@
 	 * @throws Exception
 	 */
 	public Project scanDirectory079(File binCorpusDir) throws Exception {
-		
+
 		// System.out.println(Messages.Project_5);
 		File HTMLs = new File(binCorpusDir, "HTML"); //$NON-NLS-1$
 		// File TXMs = new File(binCorpusDir, "txm"); //$NON-NLS-1$
 		File DATAs = new File(binCorpusDir, "data"); //$NON-NLS-1$
 		File REGISTRY = new File(binCorpusDir, "registry"); //$NON-NLS-1$
 		File PARAMS = new File(binCorpusDir, "import.xml"); //$NON-NLS-1$
-		
-		if (HTMLs.exists() && DATAs.exists()
-				&& REGISTRY.exists() && PARAMS.exists())// && correspfile.exists())
+
+		if (isCorpus079DirectoryValid(binCorpusDir))// && correspfile.exists())
 		{// minimal base data
 			BaseOldParameters parameters = new BaseOldParameters(PARAMS);
 			if (!parameters.load()) {
@@ -310,7 +356,7 @@
 				Log.severe(NLS.bind(TXMCoreMessages.failedToLoadBaseParametersFromTheP0File, PARAMS));
 				return null;
 			}
-			
+
 			// if (parameters.version == null || parameters.version.length() == 0) {
 			// System.out.println(TXMCoreMessages.Project_14);
 			// return null;
@@ -319,11 +365,11 @@
 			// System.out.println(CURRENTCORPUSVERSION+" > "+parameters.version); //$NON-NLS-1$
 			// return null;
 			// }
-			
+
 			// System.out.println(parameters.toString());
-			
+
 			// Creates a new project that doesn't need to build
-			
+
 			// FIXME: SJ: old version where there is a bug if the name or path are not in same case
 			// Project project = new Project(this, parameters.name, false);
 			// FIXME: SJ: new version that fix the bug but whe may want to not modify the case of the name?
@@ -332,7 +378,7 @@
 			// IPath destination = new Path(project.getRCPProject().getParent().getLocation(), parameters.name);
 			// project.getRCPProject().move(destination, true, project);
 			// }
-			
+
 			project._load(parameters);
 			project.pCorpusVersion = "0.7.9 -> 0.8.0";
 			// b._compute();
@@ -343,7 +389,7 @@
 				File HTMLc = new File(HTMLs, corpusname);
 				File REGISTRYc = new File(REGISTRY, corpusname.toLowerCase());
 				File DATAc = new File(DATAs, corpusname);
-				
+
 				if (!(PARAMS.exists() && HTMLc.exists() && REGISTRYc.exists() && DATAc.exists())) {
 					System.out.println(NLS.bind(TXMCoreMessages.errorColonSkippingTheLoadingOfTheP0Corpus, corpusname));
 					System.out.println(NLS.bind(TXMCoreMessages.pARAMSColonP0, PARAMS));
@@ -353,7 +399,7 @@
 					continue;
 				}
 			}
-			
+
 			return project;
 		}
 		else {
@@ -362,63 +408,63 @@
 		}
 		return null;
 	}
-	
-	
+
+
 	@Override
 	public boolean saveParameters() throws Exception {
 		return true;
 	}
-	
+
 	@Override
 	public boolean loadParameters() throws Exception {
 		return true;
 	}
-	
+
 	@Override
 	public boolean setParameters(TXMParameters parameters) throws Exception {
 		return true;
 	}
-	
+
 	@Override
 	public String getName() {
 		return getUserName();
 	}
-	
+
 	@Override
 	public boolean canCompute() throws Exception {
 		return true;
 	}
-	
+
 	@Override
 	protected boolean _compute(TXMProgressMonitor monitor) throws Exception {
 		// TODO should ensure its files are up to date
 		return true;
 	}
-	
+
 	@Override
 	public String getResultType() {
 		return "Workspace";
 	}
-	
+
 	/**
 	 * Loads and recreates the existing projects.
 	 * 
 	 * @throws CoreException
 	 */
 	public void loadProjectsFromProjectScopes(IProgressMonitor monitor) throws CoreException {
-		
+
 		Log.fine("Toolbox.initialize(): reloading projects...");
-		
+
 		IWorkspace rcpWorkspace = ResourcesPlugin.getWorkspace();
 		rcpWorkspace.getRoot().refreshLocal(org.eclipse.core.resources.IResource.DEPTH_INFINITE, null);
 		IProject corporaDirectory = rcpWorkspace.getRoot().getProject("corpora");
-		
+
 		if (!corporaDirectory.exists()) {
 			Log.severe("Can't load corpora projects: 'corpora' not found in workspace.");
 			return;
 		}
 		IProject projects[] = rcpWorkspace.getRoot().getProjects();
-		
+
 		Log.fine("Toolbox.initialize(): " + projects.length + " project(s) found in workspace.");
 		if (monitor != null) monitor.setTaskName(NLS.bind(TXMCoreMessages.initializingCorpora, 0, projects.length));
 		int c = 0;
@@ -430,7 +476,7 @@
 				project.delete(true, null);
 				continue;
 			}
-			
+
 			// project.open(monitor);
 			// String[] natures = project.getDescription().getNatureIds();
 			// if (Arrays.binarySearch(natures, Project.TXMCORPUSNATURE) < 0) continue;
@@ -438,7 +484,7 @@
 				Project.loadProjectFromProjectScope(project); // !!!
 			}
 		}
-		
+
 		// force the initialization of CorpusBuilds
 		for (TXMResult r : this.getChildren(Project.class)) {
 			Project project = (Project) r;
Index: TXM/trunk/org.txm.core/src/java/org/txm/objects/Project.java
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/objects/Project.java	(revision 3627)
+++ TXM/trunk/org.txm.core/src/java/org/txm/objects/Project.java	(revision 3628)
@@ -857,7 +857,8 @@
 			}
 			binaryDir = newBinDirectory; // switch the binaryDirectory to work
 		}
-		if (binaryDir.exists() && exportzip.getParentFile().exists()) {
+		if (binaryDir.exists() 
+				&& exportzip.getParentFile().exists()) {
 			this.save();
 			
 			if ("0.7.9".equals(version)) {
Index: TXM/trunk/org.txm.core/src/java/org/txm/utils/NameSpaceXmlNodePrinter.java
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/utils/NameSpaceXmlNodePrinter.java	(revision 3627)
+++ TXM/trunk/org.txm.core/src/java/org/txm/utils/NameSpaceXmlNodePrinter.java	(revision 3628)
@@ -16,7 +16,6 @@
  */
 
 import groovy.util.*;
-import groovy.xml.QName;
 import org.codehaus.groovy.runtime.InvokerHelper;
 
 import java.io.OutputStreamWriter;
@@ -25,6 +24,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.namespace.QName;
+
 /**
  * Prints a <code>groovy.util.Node</code> (as used with <code>XmlParser</code>) including all children in XML format.
  * Typical usage:
@@ -367,7 +368,7 @@
             if (!namespaceAware) {
                 return qname.getLocalPart();
             }
-            return qname.getQualifiedName();
+            return qname.getNamespaceURI();
         } else if (object instanceof Node) {
             Object name = ((Node) object).name();
             return getName(name);
Index: TXM/trunk/org.txm.core/src/java/org/txm/importer/ValidateXml.java
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/importer/ValidateXml.java	(revision 3627)
+++ TXM/trunk/org.txm.core/src/java/org/txm/importer/ValidateXml.java	(revision 3628)
@@ -28,7 +28,7 @@
 package org.txm.importer;
 
 import groovy.util.Node;
-import groovy.util.XmlParser;
+import groovy.xml.XmlParser;
 
 import java.io.File;
 import java.io.IOException;
@@ -112,7 +112,7 @@
 	 */
 	public static String testAndGetError(String xmldata) {
 		try {
-			new XmlParser().parseText(xmldata);
+			Node doc = new XmlParser().parseText(xmldata);
 			return "";
 		}
 		catch (IOException | ParserConfigurationException e) {
Index: TXM/trunk/org.txm.core/src/java/org/txm/importer/ImportPreferencesManager.java
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/importer/ImportPreferencesManager.java	(revision 3627)
+++ TXM/trunk/org.txm.core/src/java/org/txm/importer/ImportPreferencesManager.java	(revision 3628)
@@ -54,7 +54,7 @@
 		if ("0.8.0".equals(version)) {
 			loadFrom080();
 		}
-		else if ("0.8.2".equals(version)) {
+		else if ("0.8.3".equals(version)) {
 			genericLoad();
 		}
 		else {
@@ -82,11 +82,11 @@
 			Preferences section = sectionList.node(sectionNames[i]);
 			String name = section.name();
 			if (name == null || name.length() == 0) {
-				Log.warning("Load import 0.8.2 parameters: section with no name");
+				Log.warning("Load import 0.8.3 parameters: section with no name");
 				continue;
 			}
 			if (sections.containsKey(name)) {
-				Log.warning("Load import 0.8.2 parameters: duplicated section with name:" + name);
+				Log.warning("Load import 0.8.3 parameters: duplicated section with name:" + name);
 				continue;
 			}
 			
@@ -96,7 +96,7 @@
 				String parameter = section.get(name2, "");
 				
 				if (sectionParameters.containsKey(name2)) {
-					Log.warning("Load import 0.8.2 parameters: duplicated parameter with name:" + name2 + " in section: " + name);
+					Log.warning("Load import 0.8.3 parameters: duplicated parameter with name:" + name2 + " in section: " + name);
 					continue;
 				}
 				
@@ -110,7 +110,7 @@
 		if ("0.8.0".equals(version)) {
 			saveFrom080();
 		}
-		else if ("0.8.2".equals(version)) {
+		else if ("0.8.3".equals(version)) {
 			genericSave();
 		}
 		else {
Index: TXM/trunk/org.txm.core/src/java/org/txm/importer/ApplyXsl2.java
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/importer/ApplyXsl2.java	(revision 3627)
+++ TXM/trunk/org.txm.core/src/java/org/txm/importer/ApplyXsl2.java	(revision 3628)
@@ -72,7 +72,6 @@
 import org.txm.utils.io.FileCopy;
 import org.txm.utils.io.IOUtils;
 import org.txm.utils.logger.Log;
-import org.txm.utils.saxon.SaxonNodeSet;
 
 import net.sf.saxon.TransformerFactoryImpl;
 
@@ -147,7 +146,7 @@
 		
 		tFactory = new net.sf.saxon.TransformerFactoryImpl();
 		// Log.info("new tFactory: "+tFactory);
-		tFactory.getConfiguration().registerExtensionFunction(new SaxonNodeSet());
+		//tFactory.getConfiguration().registerExtensionFunction(new SaxonNodeSet());
 		Log.fine(NLS.bind("ApplyXsl2 with the {0} stylesheet.", xsltfile));
 		reload();
 		// Log.info("new transformer: "+transformer);
Index: TXM/trunk/org.txm.core/src/java/org/txm/importer/ImportFileManager.java
===================================================================
--- TXM/trunk/org.txm.core/src/java/org/txm/importer/ImportFileManager.java	(revision 3627)
+++ TXM/trunk/org.txm.core/src/java/org/txm/importer/ImportFileManager.java	(revision 3628)
@@ -59,7 +59,7 @@
 			if ("0.7.9".equals(version)) {
 				loadFrom079();
 			}
-			else if ("0.8.2".equals(version)) {
+			else if ("0.8.3".equals(version)) {
 				genericLoad();
 			}
 			else {
@@ -84,11 +84,11 @@
 			Element section = (Element) sectionList.item(i);
 			String name = section.getAttribute("name");
 			if (name == null || name.length() == 0) {
-				Log.warning("Load import 0.8.2 parameters: section with no name");
+				Log.warning("Load import 0.8.3 parameters: section with no name");
 				continue;
 			}
 			if (sections.containsKey(name)) {
-				Log.warning("Load import 0.8.2 parameters: duplicated section with name:" + name);
+				Log.warning("Load import 0.8.3 parameters: duplicated section with name:" + name);
 				continue;
 			}
 			
@@ -99,11 +99,11 @@
 				Element parameter = (Element) parameterList.item(j);
 				String name2 = parameter.getAttribute("name");
 				if (name2 == null || name2.length() == 0) {
-					Log.warning("Load import 0.8.2 parameters: parameter with no name in section: " + name);
+					Log.warning("Load import 0.8.3 parameters: parameter with no name in section: " + name);
 					continue;
 				}
 				if (sectionParameters.containsKey(name2)) {
-					Log.warning("Load import 0.8.2 parameters: duplicated parameter with name:" + name2 + " in section: " + name);
+					Log.warning("Load import 0.8.3 parameters: duplicated parameter with name:" + name2 + " in section: " + name);
 					continue;
 				}
 				
Index: TXM/trunk/org.txm.core/build.properties
===================================================================
--- TXM/trunk/org.txm.core/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.core/build.properties	(revision 3628)
@@ -1,41 +1,12 @@
 #Fri Jul 06 10:25:09 CEST 2018
 bin.includes = META-INF/,\
-               lib/ant-1.7.1.jar,\
-               lib/ant-launcher.jar,\
-               lib/ant.jar,\
-               lib/antlr-2.7.7.jar,\
-               lib/asm-analysis-2.2.3.jar,\
-               lib/asm-tree-2.2.3.jar,\
-               lib/concurrent-1.3.4.jar,\
-               lib/dom4j-1.6.1.jar,\
-               lib/forms-1.0.7.jar,\
-               lib/jline-0.9.94.jar,\
-               lib/junit-4.5.jar,\
-               lib/jvectClipboard-1.2.jar,\
-               lib/liquidlnf.jar,\
-               lib/log4j-1.2.12.jar,\
-               lib/looks-2.0.1.jar,\
-               lib/macSpecific.jar,\
-               lib/quaqua.jar,\
-               lib/rtfCleaner.jar,\
-               lib/swing-layout-1.0.3.jar,\
                .,\
-               lib/juniversalchardet-1.0.3.jar,\
-               lib/textcat-1.0.1.jar,\
-               lib/json-20090211.jar,\
-               lib/juh-3.2.1.jar,\
-               lib/jurt-3.2.1.jar,\
-               lib/ridl-3.2.1.jar,\
-               lib/unoil-3.2.1.jar,\
                plugin.xml,\
-               lib/sqlite-jdbc-3.8.11.2.jar,\
-               lib/postgresql-9.4.1207.jre6.jar,\
-               lib/jodconverter-core-3.1-beta.jar,\
                log4j.properties,\
-               res/org/,\
                schema/,\
                OSGI-INF/,\
-               lib/jsoup-1.11.3.jar
+               lib/,\
+               res/
 output..=bin/
 source..=src/java/,res/,test/
 bin.excludes=META-INF/TSTMANIFEST.MF
Index: TXM/trunk/org.txm.core/.classpath
===================================================================
--- TXM/trunk/org.txm.core/.classpath	(revision 3627)
+++ TXM/trunk/org.txm.core/.classpath	(revision 3628)
@@ -1,34 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/jsoup-1.11.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ant-1.7.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ant-launcher.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-analysis-2.2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-tree-2.2.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/concurrent-1.3.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/forms-1.0.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jline-0.9.94.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/junit-4.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jvectClipboard-1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/liquidlnf.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.12.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/looks-2.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/macSpecific.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/quaqua.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/rtfCleaner.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/swing-layout-1.0.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/juniversalchardet-1.0.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/textcat-1.0.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/json-20090211.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ridl-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/unoil-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/sqlite-jdbc-3.8.11.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/postgresql-9.4.1207.jre6.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins">
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="src" path="test"/>
+	<classpathentry kind="src" path="res"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<accessrules>
+			<accessrule kind="accessible" pattern="**"/>
+		</accessrules>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/jsoup-1.11.3.jar"/>
+	<classpathentry kind="lib" path="lib/ant-1.7.1.jar"/>
+	<classpathentry kind="lib" path="lib/ant-launcher.jar"/>
+	<classpathentry kind="lib" path="lib/ant.jar"/>
+	<classpathentry kind="lib" path="lib/antlr-2.7.7.jar"/>
+	<classpathentry kind="lib" path="lib/asm-analysis-2.2.3.jar"/>
+	<classpathentry kind="lib" path="lib/asm-tree-2.2.3.jar"/>
+	<classpathentry kind="lib" path="lib/concurrent-1.3.4.jar"/>
+	<classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/forms-1.0.7.jar"/>
+	<classpathentry kind="lib" path="lib/jline-0.9.94.jar"/>
+	<classpathentry kind="lib" path="lib/junit-4.5.jar"/>
+	<classpathentry kind="lib" path="lib/jvectClipboard-1.2.jar"/>
+	<classpathentry kind="lib" path="lib/liquidlnf.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2.12.jar"/>
+	<classpathentry kind="lib" path="lib/looks-2.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/macSpecific.jar"/>
+	<classpathentry kind="lib" path="lib/quaqua.jar"/>
+	<classpathentry kind="lib" path="lib/rtfCleaner.jar"/>
+	<classpathentry kind="lib" path="lib/swing-layout-1.0.3.jar"/>
+	<classpathentry kind="lib" path="lib/juniversalchardet-1.0.3.jar"/>
+	<classpathentry kind="lib" path="lib/textcat-1.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/json-20090211.jar"/>
+	<classpathentry kind="lib" path="lib/ridl-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/unoil-3.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/sqlite-jdbc-3.8.11.2.jar"/>
+	<classpathentry kind="lib" path="lib/postgresql-9.4.1207.jre6.jar"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<attributes>
 			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="org.txm.toolbox/native"/>
 		</attributes>
@@ -36,10 +43,7 @@
 			<accessrule kind="accessible" pattern="**"/>
 		</accessrules>
 	</classpathentry>
-	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="src" path="res"/>
-	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
-	<classpathentry exported="true" kind="lib" path="lib/jodconverter-core-3.1-beta.jar"/>
+	<classpathentry kind="con" path="GROOVY_DSL_SUPPORT"/>
+	<classpathentry kind="lib" path="lib/jodconverter-core-3.1-beta.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: TXM/trunk/org.txm.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -437,7 +437,7 @@
  src.main.assembly,
  target
 Bundle-SymbolicName: org.txm.core;singleton:=true
-Bundle-Version: 0.8.2.qualifier
+Bundle-Version: 0.8.3.qualifier
 Bundle-Name: TXM Core Toolbox
 Bundle-ClassPath: .,
  lib/ant-1.7.1.jar,
@@ -446,7 +446,6 @@
  lib/antlr-2.7.7.jar,
  lib/asm-analysis-2.2.3.jar,
  lib/asm-tree-2.2.3.jar,
- lib/colt-1.2.0.jar,
  lib/concurrent-1.3.4.jar,
  lib/dom4j-1.6.1.jar,
  lib/forms-1.0.7.jar,
@@ -458,14 +457,10 @@
  lib/looks-2.0.1.jar,
  lib/macSpecific.jar,
  lib/quaqua.jar,
- lib/REngine.jar,
- lib/RserveEngine.jar,
  lib/rtfCleaner.jar,
  lib/swing-layout-1.0.3.jar,
  lib/juniversalchardet-1.0.3.jar,
  lib/textcat-1.0.1.jar,
- lib/saxon9he.jar,
- lib/jtidy-r938.jar,
  lib/json-20090211.jar,
  lib/juh-3.2.1.jar,
  lib/jurt-3.2.1.jar,
@@ -475,15 +470,15 @@
  lib/postgresql-9.4.1207.jre6.jar,
  lib/jodconverter-core-3.1-beta.jar,
  lib/jsoup-1.11.3.jar
-Require-Bundle: org.txm.utils.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.libs.groovy-all;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="3.10.0";visibility:=reexport,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0";visibility:=reexport,
  org.eclipse.osgi.util;bundle-version="3.2.0";visibility:=reexport,
  org.eclipse.core.net;visibility:=reexport,
  org.eclipse.osgi;visibility:=reexport,
  org.eclipse.ui.workbench;visibility:=reexport,
  org.eclipse.core.commands;visibility:=reexport,
  org.eclipse.core.resources;visibility:=reexport,
+ org.txm.utils.core;bundle-version="1.0.0";visibility:=reexport,
+ org.txm.libs.groovy-all;bundle-version="1.0.0";visibility:=reexport,
  org.txm.libs.office;bundle-version="0.0.0";visibility:=reexport,
  org.txm.libs.msoffice;bundle-version="0.0.0";visibility:=reexport,
  org.txm.libs.hsqldb;bundle-version="1.0.0";visibility:=reexport,
@@ -491,7 +486,8 @@
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-Activator: org.txm.core.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.core
+Eclipse-BundleShape: dir
 
Index: TXM/trunk/org.txm.core/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- TXM/trunk/org.txm.core/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3627)
+++ TXM/trunk/org.txm.core/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3628)
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-groovy.compiler.level=30
+groovy.compiler.level=40
 groovy.script.filters=scripts/**/*.groovy,y,src/main/resources/**/*.groovy,y,src/test/resources/**/*.groovy,y
Index: TXM/trunk/org.txm.tigersearch.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.tigersearch.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.tigersearch.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:18 CEST 2018
-bin.includes=feature.xml
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.tigersearch.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.tigersearch.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.tigersearch.feature/feature.xml	(revision 3628)
@@ -4,14 +4,14 @@
       label="Syntatic Annotation"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Enable TIGERSearch &amp; CONLL-U search, indexes and concordances within TXM
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
+      TXM 0.8.3
 Copyright © 2013-2021 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
@@ -43,11 +43,10 @@
       <import plugin="org.txm.libs.deptreeviz" version="0.3.0" match="greaterOrEqual"/>
       <import plugin="org.txm.tigersearch.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.txm.treesearch.rcp" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.core"/>
       <import plugin="org.txm.treesearch.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.core" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
       <import plugin="org.txm.edition.rcp" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.apache.xerces" version="2.9.0" match="greaterOrEqual"/>
    </requires>

Property changes on: TXM/trunk/org.txm.tigersearch.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.jodconverter.core/pom.xml
===================================================================
--- TXM/trunk/org.txm.jodconverter.core/pom.xml	(revision 3627)
+++ TXM/trunk/org.txm.jodconverter.core/pom.xml	(revision 3628)
@@ -118,8 +118,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 					<encoding>UTF-8</encoding>
 				</configuration>
 			</plugin>
Index: TXM/trunk/org.txm.cql2lsa.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.cql2lsa.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.cql2lsa.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:09 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.cql2lsa.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.cql2lsa.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.cql2lsa.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="CQL2LSA"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Commands for LSA computations
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice
@@ -37,7 +37,7 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.3" match="greaterOrEqual"/>
    </requires>
 
    <plugin

Property changes on: TXM/trunk/org.txm.cql2lsa.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.internalview.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.internalview.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.internalview.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -7,7 +7,7 @@
 Require-Bundle: org.txm.searchengine.cqp.core;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.internalview.core
 

Property changes on: TXM/trunk/org.txm.internalview.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.texts.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.texts.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.texts.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,8 +4,8 @@
 Bundle-SymbolicName: org.txm.texts.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.txm.texts.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.txm.core;bundle-version="0.8.2";visibility:=reexport,
+Bundle-RequiredExecutionEnvironment: JavaSE-16
+Require-Bundle: org.txm.core;bundle-version="0.8.3";visibility:=reexport,
  org.txm.searchengine.core;bundle-version="1.0.0";visibility:=reexport,
  org.txm.utils.core;visibility:=reexport,
  org.txm.searchengine.cqp.core;visibility:=reexport
Index: TXM/trunk/org.txm.texts.core/src/org/txm/texts/core/TextsView.java
===================================================================
--- TXM/trunk/org.txm.texts.core/src/org/txm/texts/core/TextsView.java	(revision 3627)
+++ TXM/trunk/org.txm.texts.core/src/org/txm/texts/core/TextsView.java	(revision 3628)
@@ -13,52 +13,55 @@
 import org.txm.core.results.TXMResult;
 import org.txm.searchengine.cqp.CQPSearchEngine;
 import org.txm.searchengine.cqp.corpus.CQPCorpus;
+import org.txm.searchengine.cqp.corpus.MainCorpus;
 import org.txm.searchengine.cqp.corpus.Property;
+import org.txm.searchengine.cqp.corpus.QueryResult;
 import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
+import org.txm.searchengine.cqp.corpus.query.CQLQuery;
 import org.txm.utils.TXMProgressMonitor;
 import org.txm.utils.logger.Log;
 
 public class TextsView extends TXMResult {
-	
+
 	@Parameter(key = "columns")
 	ArrayList<StructuralUnitProperty> pColumns;
-	
-//	@Parameter(key = "positiveFilters")
-//	ArrayList<String> positiveFilters;
-	
+
+	//	@Parameter(key = "positiveFilters")
+	//	ArrayList<String> positiveFilters;
+
 	@Parameter(key = "negativeFilters")
 	String negativeFilters;
-	
+
 	private LinkedHashMap<String, ArrayList<String>> result;
-	
+
 	public CQPCorpus getCorpus() {
 		return (CQPCorpus)parent;
 	}
-	
+
 	public TextsView(CQPCorpus corpus) {
-		
+
 		super(corpus);
 	}
-	
+
 	public TextsView(String parametersNodePath) {
-		
+
 		super(parametersNodePath);
 	}
-	
-	
-	
+
+
+
 	@Override
 	public boolean saveParameters() throws Exception {
-		
+
 		this.saveParameter("columns", StringUtils.join(pColumns, "\t"));
-//		this.saveParameter("positiveFilters", StringUtils.join(positiveFilters, "\t"));
+		//		this.saveParameter("positiveFilters", StringUtils.join(positiveFilters, "\t"));
 		this.saveParameter("negativeFilters", negativeFilters);
 		return true;
 	}
-	
+
 	@Override
 	public boolean loadParameters() throws Exception {
-		
+
 		String v = this.getStringParameterValue("columns").toString();
 		if ("*".equals(v)) {
 			;
@@ -70,31 +73,31 @@
 				}
 			}
 		} else {
-			this.pColumns = new ArrayList(Property.stringToProperties(getCorpus(), v));
+			this.pColumns = new ArrayList(StructuralUnitProperty.stringToProperties(getCorpus(), v));
 		}
-		
+
 		v = this.getStringParameterValue("negativeFilters").toString();
 		if (v.contains("=")) {
 			this.negativeFilters = v;
 		} else {
 			this.negativeFilters = "";
 		}
-		
-//		v = this.getStringParameterValue("positiveFilters").toString();
-//		if (v.contains("=")) {
-//			this.positiveFilters = new ArrayList<>(Arrays.asList(v.split("\t")));
-//		} else {
-//			this.positiveFilters = new ArrayList<>();
-//		}
-		
+
+		//		v = this.getStringParameterValue("positiveFilters").toString();
+		//		if (v.contains("=")) {
+		//			this.positiveFilters = new ArrayList<>(Arrays.asList(v.split("\t")));
+		//		} else {
+		//			this.positiveFilters = new ArrayList<>();
+		//		}
+
 		return pColumns != null;
 	}
-	
+
 	@Override
 	public boolean setParameters(TXMParameters parameters) throws Exception {
-		
+
 		if (parameters.get("columns") != null) {
-			
+
 			Object o = parameters.get("columns");
 			if (o instanceof List) {
 				pColumns = new ArrayList((List)o);
@@ -110,79 +113,99 @@
 		}
 		return false;
 	}
-	
+
 	@Override
 	public String getName() {
-		
+
 		return "Texts ("+pColumns+")";
 	}
-	
+
 	@Override
 	public String getSimpleName() {
-		
+
 		return "Texts";
 	}
-	
+
 	@Override
 	public String getDetails() {
-		
+
 		return getName();
 	}
-	
+
 	@Override
 	public void clean() {
-		
+
 	}
-	
+
 	@Override
 	public boolean canCompute() throws Exception {
-		
+
 		return pColumns != null;
 	}
-	
+
 	@Override
 	protected boolean _compute(TXMProgressMonitor monitor) throws Exception {
-		
+
 		result = new LinkedHashMap<String, ArrayList<String>>();
-		
+
 		// preset arrays
 		String[] texts = getCorpus().getCorpusTextIdsList();
 		for (String t : texts) {
-			
+
 			ArrayList<String> values = new ArrayList<String>();
 			result.put(t, values);
-			
+
 			if (getCorpus().getProject().getText(t) == null) {
 				Log.warning(NLS.bind("The {0} Corpus has no text named ''{1}''.", getCorpus(), t));
 				return false;
 			}
 		}
+
+		// optimization: get values property per property then set the Text property value arrays
 		
-		// optimization: get values property per property then set the Text property value arrays
-		int positions [] = new int[texts.length];
-		for (int i = 0 ; i < texts.length ; i++) {
-			positions[i] = i;
-		}
-		for (int icol = 0 ; icol < pColumns.size() ; icol++) {
-			StructuralUnitProperty col = pColumns.get(icol);
+		if (getCorpus() instanceof MainCorpus) {
+			int[] idx = new int[texts.length];
+			for (int i = 0 ; i < texts.length ; i++) {
+				idx[i] = i;
+			}
 			
-			String[] values = CQPSearchEngine.getCqiClient().struc2Str(col.getQualifiedName(), positions);
+			for (int icol = 0 ; icol < pColumns.size() ; icol++) {
+				StructuralUnitProperty col = pColumns.get(icol);
+
+				String[] values = CQPSearchEngine.getCqiClient().struc2Str(col.getQualifiedName(), idx); // idx
+
+				for (int i = 0 ; i < texts.length ; i++) {
+					result.get(texts[i]).add( values[i]);
+				}
+			}
 			
-			for (int i = 0 ; i < texts.length ; i++) {
-				result.get(texts[i]).add( values[i]);
+		} else {
+			int[] positions = getCorpus().getTextStartLimits();
+			
+			for (int icol = 0 ; icol < pColumns.size() ; icol++) {
+				StructuralUnitProperty col = pColumns.get(icol);
+
+				int[] idx = CQPSearchEngine.getCqiClient().cpos2Struc(col.getQualifiedName(), positions);
+				String[] values = CQPSearchEngine.getCqiClient().struc2Str(col.getQualifiedName(), idx);
+
+				for (int i = 0 ; i < texts.length ; i++) {
+					result.get(texts[i]).add( values[i]);
+				}
 			}
 		}
 		
+		
+
 		if (negativeFilters.length() > 0 && pColumns.size() > 0) {
-			
+
 			ArrayList<String> columnNames = new ArrayList<>(pColumns.size());
 			for (StructuralUnitProperty p : pColumns) columnNames.add(p.getName());
-			
+
 			String[] filters = negativeFilters.split(";");
-			
+
 			ArrayList<String> keys = new ArrayList<>(result.keySet());
 			for (String text : keys) {
-				
+
 				for (String negativeFilter : filters) {
 					String[] split = negativeFilter.split("=", 2);
 					if (split.length == 2 
@@ -195,37 +218,37 @@
 				}
 			}
 		}
-		
+
 		return true;
 	}
-	
+
 	@Override
 	protected boolean _toTxt(File outfile, String encoding, String colseparator, String txtseparator) throws Exception {
-		
+
 		PrintWriter writer = org.txm.utils.io.IOUtils.getWriter(outfile, encoding);
-		
+
 		writer.println("text"+colseparator+StringUtils.join(pColumns, colseparator));
-		
+
 		for (String text : result.keySet()) {
 			writer.println(text+colseparator+StringUtils.join(result.get(text), colseparator));
 		}
-		
+
 		writer.close();
 		return false;
 	}
-	
+
 	@Override
 	public String getResultType() {
 		return "TextView";
 	}
-	
+
 	public LinkedHashMap<String, ArrayList<String>> getLines() {
 		return result;
 	}
-	
+
 	public List<StructuralUnitProperty> getColumns() {
-		
+
 		return pColumns;
 	}
-	
+
 }

Property changes on: TXM/trunk/org.txm.texts.core
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.rcp.about.fragment/src/org/eclipse/ui/internal/about/InstallationDialog.java
===================================================================
--- TXM/trunk/org.txm.rcp.about.fragment/src/org/eclipse/ui/internal/about/InstallationDialog.java	(revision 3627)
+++ TXM/trunk/org.txm.rcp.about.fragment/src/org/eclipse/ui/internal/about/InstallationDialog.java	(revision 3628)
@@ -60,7 +60,7 @@
 	class ButtonManager {
 
 		private Composite composite;
-		HashMap buttonMap = new HashMap(); // page id->Collection of page
+		HashMap<String, List<Button>> buttonMap = new HashMap<>(); // page id->Collection of page
 
 		// buttons
 
@@ -73,12 +73,14 @@
 		}
 
 		public void update(String currentPageId) {
-			if (composite == null || composite.isDisposed())
+			
+			if (composite == null || composite.isDisposed()) {
 				return;
+			}
 			GC metricsGC = new GC(composite);
 			FontMetrics metrics = metricsGC.getFontMetrics();
 			metricsGC.dispose();
-			List buttons = (List) buttonMap.get(currentPageId);
+			List<?> buttons = (List<?>) buttonMap.get(currentPageId);
 			Control[] children = composite.getChildren();
 
 			int visibleChildren = 0;
@@ -93,6 +95,7 @@
 					setButtonLayoutData(metrics, control, false);
 				}
 			}
+			
 			if (buttons != null) {
 				for (int i = 0; i < buttons.size(); i++) {
 					Button button = (Button) buttons.get(i);
@@ -121,16 +124,16 @@
 		}
 
 		public void addPageButton(String id, Button button) {
-			List list = (List) buttonMap.get(id);
+			List<Button> list = (List<Button>) buttonMap.get(id);
 			if (list == null) {
-				list = new ArrayList(1);
+				list = new ArrayList<>(1);
 				buttonMap.put(id, list);
 			}
 			list.add(button);
 		}
 
 		public void clear() {
-			buttonMap = new HashMap();
+			buttonMap = new HashMap<>();
 		}
 	}
 
@@ -143,7 +146,7 @@
 	private TabFolder folder;
 	IServiceLocator serviceLocator;
 	private ButtonManager buttonManager;
-	private Map pageToId = new HashMap();
+	private Map<InstallationPage, String> pageToId = new HashMap<>();
 	private Dialog modalParent;
 
 	/**
@@ -167,10 +170,10 @@
 		super.configureShell(newShell);
 		String productName = ""; //$NON-NLS-1$
 		IProduct product = Platform.getProduct();
-		if (product != null && product.getName() != null)
+		if (product != null && product.getName() != null) {
 			productName = product.getName();
-		newShell.setText(NLS.bind(
-				WorkbenchMessages.InstallationDialog_ShellTitle, productName));
+		}
+		newShell.setText(NLS.bind(WorkbenchMessages.InstallationDialog_ShellTitle, productName));
 	}
 
 	/*
@@ -223,19 +226,15 @@
 		for (int i = 0; i < elements.length; i++) {
 			IConfigurationElement element = elements[i];
 			TabItem item = new TabItem(folder, SWT.NONE);
-			item.setText(element
-					.getAttribute(IWorkbenchRegistryConstants.ATT_NAME));
+			item.setText(element.getAttribute(IWorkbenchRegistryConstants.ATT_NAME));
 			item.setData(element);
-			item.setData(ID, element
-					.getAttribute(IWorkbenchRegistryConstants.ATT_ID));
+			item.setData(ID, element.getAttribute(IWorkbenchRegistryConstants.ATT_ID));
 
 			Composite control = new Composite(folder, SWT.NONE);
 			control.setLayout(new GridLayout());
 			item.setControl(control);
 		}
 
-
-
 	}
 
 	protected Control createContents(Composite parent) {
@@ -244,16 +243,18 @@
 		if (folder.getItemCount() > 0) {
 			if (lastSelectedTabId != null) {
 				TabItem[] items = folder.getItems();
-				for (int i = 0; i < items.length; i++)
+				for (int i = 0; i < items.length; i++) {
 					if (items[i].getData(ID).equals(lastSelectedTabId)) {
 						folder.setSelection(i);
 						tabSelected(items[i]);
 						selected = true;
 						break;
 					}
+				}
 			}
-			if (!selected)
+			if (!selected) {
 				tabSelected(folder.getItem(0));
+			}
 		}
 		// need to reapply the dialog font now that we've created new
 		// tab items
@@ -275,13 +276,11 @@
 	 */
 	private void tabSelected(TabItem item) {
 		if (item.getData() instanceof IConfigurationElement) {
-			final IConfigurationElement element = (IConfigurationElement) item
-					.getData();
+			final IConfigurationElement element = (IConfigurationElement) item.getData();
 
 			Composite pageComposite = (Composite) item.getControl();
 			try {
-				final InstallationPage page = (InstallationPage) element
-						.createExecutableExtension(IWorkbenchRegistryConstants.ATT_CLASS);
+				final InstallationPage page = (InstallationPage) element.createExecutableExtension(IWorkbenchRegistryConstants.ATT_CLASS);
 				page.createControl(pageComposite);
 				// new controls created since the dialog font was applied, so
 				// apply again.
@@ -290,8 +289,7 @@
 				// Must be done before creating the buttons because the control
 				// button creation methods
 				// use this map.
-				pageToId.put(page, element
-						.getAttribute(IWorkbenchRegistryConstants.ATT_ID));
+				pageToId.put(page, element.getAttribute(IWorkbenchRegistryConstants.ATT_ID));
 				createButtons(page);
 				item.setData(page);
 				item.addDisposeListener(new DisposeListener() {
@@ -312,8 +310,7 @@
 		String id = (String) item.getData(ID);
 		rememberSelectedTab(id);
 		buttonManager.update(id);
-		Button button = createButton(buttonManager.getParent(),
-				IDialogConstants.CLOSE_ID, IDialogConstants.CLOSE_LABEL, true);
+		Button button = createButton(buttonManager.getParent(), IDialogConstants.CLOSE_ID, IDialogConstants.CLOSE_LABEL, true);
 		GridData gd = (GridData) button.getLayoutData();
 		gd.horizontalAlignment = SWT.BEGINNING;
 		gd.horizontalIndent = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH) / 2;
Index: TXM/trunk/org.txm.rcp.about.fragment/library.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.rcp.about.fragment/library.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.rcp.about.fragment/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.rcp.about.fragment/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.rcp.about.fragment/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,7 +5,7 @@
 Bundle-Version: 1.0.0.qualifier
 Fragment-Host: org.eclipse.ui.workbench;bundle-version="3.110.1.v20170704-1208"
 Eclipse-PatchFragment: true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-ClassPath: library.jar,
  .
 Export-Package: org.eclipse.ui.internal.about

Property changes on: TXM/trunk/org.txm.rcp.about.fragment
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.textsbalance.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.textsbalance.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.textsbalance.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -9,7 +9,7 @@
  ility:=reexport,org.txm.chartsengine.rcp;bundle-version="1.0.0";visib
  ility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.textsbalance.rcp
 

Property changes on: TXM/trunk/org.txm.textsbalance.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.utils/src/org/txm/utils/processbuilder/ProcessBuilder.groovy
===================================================================
--- TXM/trunk/org.txm.utils/src/org/txm/utils/processbuilder/ProcessBuilder.groovy	(revision 3627)
+++ TXM/trunk/org.txm.utils/src/org/txm/utils/processbuilder/ProcessBuilder.groovy	(revision 3628)
@@ -1,73 +0,0 @@
-// Copyright © 2010-2013 ENS de Lyon.
-// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
-// Lyon 2, University of Franche-Comté, University of Nice
-// Sophia Antipolis, University of Paris 3.
-// 
-// The TXM platform is free software: you can redistribute it
-// and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation,
-// either version 2 of the License, or (at your option) any
-// later version.
-// 
-// The TXM platform is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE. See the GNU General Public License for more
-// details.
-// 
-// You should have received a copy of the GNU General
-// Public License along with the TXM platform. If not, see
-// http://www.gnu.org/licenses.
-// 
-// 
-// 
-// $LastChangedDate: 2013-05-06 17:38:43 +0200 (lun., 06 mai 2013) $
-// $LastChangedRevision: 2386 $
-// $LastChangedBy: mdecorde $ 
-//
-package org.txm.utils.processbuilder;
-
-import groovy.lang.GroovyClassLoader;
-
-import java.io.File;
-
-import org.txm.utils.ProcessBuilderBuilder;
-
-// TODO: Auto-generated Javadoc
-/**
- * creates a wrapper of a program.
- *
- * @param definitionFile
- *            the definition file
- * @param classFile
- *            the class file
- * @param binariesDirectory
- *            the binaries directory
- * @return the object
- * @author H
- */
-public class ProcessBuilder {
-	public static Object wrapProgram(File definitionFile, File classFile, File binariesDirectory) {
-		try {
-			ProcessBuilderBuilder.build(definitionFile, classFile);
-			// Application app = new Application(definitionFile);
-			// app.build(classFile);
-		} catch (Exception e) {
-			System.err.println(e);
-			return null;
-		}
-
-		GroovyClassLoader gcl = new GroovyClassLoader();
-		Object aProgram;
-
-		try {
-			gcl.addClasspath("."); //$NON-NLS-1$
-			Class clazz = gcl.parseClass(classFile);
-			aProgram = clazz.newInstance(binariesDirectory.getAbsolutePath()); // path to the directory containing binaries //$NON-NLS-1$
-		} catch (Exception e) {
-			System.err.println(e);
-			return null;
-		}
-		return aProgram;
-	}
-}
Index: TXM/trunk/org.txm.utils/src/org/txm/utils/processbuilder/ProcessBuilder.java
===================================================================
--- TXM/trunk/org.txm.utils/src/org/txm/utils/processbuilder/ProcessBuilder.java	(revision 0)
+++ TXM/trunk/org.txm.utils/src/org/txm/utils/processbuilder/ProcessBuilder.java	(revision 3628)
@@ -0,0 +1,70 @@
+// Copyright © 2010-2013 ENS de Lyon.
+// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
+// Lyon 2, University of Franche-Comté, University of Nice
+// Sophia Antipolis, University of Paris 3.
+// 
+// The TXM platform is free software: you can redistribute it
+// and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation,
+// either version 2 of the License, or (at your option) any
+// later version.
+// 
+// The TXM platform is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+// PURPOSE. See the GNU General Public License for more
+// details.
+// 
+// You should have received a copy of the GNU General
+// Public License along with the TXM platform. If not, see
+// http://www.gnu.org/licenses.
+// 
+// 
+// 
+// $LastChangedDate: 2013-05-06 17:38:43 +0200 (lun., 06 mai 2013) $
+// $LastChangedRevision: 2386 $
+// $LastChangedBy: mdecorde $ 
+//
+package org.txm.utils.processbuilder;
+
+import java.io.File;
+
+import org.txm.utils.ProcessBuilderBuilder;
+
+import groovy.lang.GroovyClassLoader;
+
+/**
+ * creates a wrapper of a program.
+ *
+ * @param definitionFile the definition file
+ * @param classFile the class file
+ * @param binariesDirectory the binaries directory
+ * @return the object
+ * @author H
+ */
+public class ProcessBuilder {
+	public static Object wrapProgram(File definitionFile, File classFile, File binariesDirectory) {
+		try {
+			ProcessBuilderBuilder.build(definitionFile, classFile);
+			// Application app = new Application(definitionFile);
+			// app.build(classFile);
+		} catch (Exception e) {
+			System.err.println(e);
+			return null;
+		}
+
+		GroovyClassLoader gcl = new GroovyClassLoader();
+		Object aProgram;
+
+		try {
+			gcl.addClasspath("."); //$NON-NLS-1$
+			Class clazz = gcl.parseClass(classFile);
+			aProgram = clazz.getConstructor(String.class).newInstance(binariesDirectory.getAbsolutePath()); // path to the directory containing binaries //$NON-NLS-1$
+
+		} catch (Exception e) {
+			System.err.println(e);
+			return null;
+		}
+		return aProgram;
+	}
+}

Property changes on: TXM/trunk/org.txm.utils/src/org/txm/utils/processbuilder/ProcessBuilder.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain


Property changes on: TXM/trunk/org.txm.utils/src/org/txm/utils/processbuilder
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.utils/src/org/txm/utils/saxon/SaxonNodeSet.java
===================================================================
--- TXM/trunk/org.txm.utils/src/org/txm/utils/saxon/SaxonNodeSet.java	(revision 3627)
+++ TXM/trunk/org.txm.utils/src/org/txm/utils/saxon/SaxonNodeSet.java	(revision 3628)
@@ -1,54 +0,0 @@
-package org.txm.utils.saxon;
-//The implementation of exslt node-set() function for Saxon-HE processor
-
-//Usage:
-//final TransformerFactory factory = new net.sf.saxon.TransformerFactoryImpl();
-//((TransformerFactoryImpl) factory).getConfiguration().registerExtensionFunction(new SaxonNodeSet());
-//
-
-import net.sf.saxon.expr.XPathContext;
-import net.sf.saxon.lib.ExtensionFunctionCall;
-import net.sf.saxon.lib.ExtensionFunctionDefinition;
-import net.sf.saxon.om.Sequence;
-import net.sf.saxon.om.StructuredQName;
-import net.sf.saxon.trans.XPathException;
-import net.sf.saxon.value.SequenceType;
-
-@SuppressWarnings("serial") //$NON-NLS-1$
-public class SaxonNodeSet extends ExtensionFunctionDefinition {
-	@Override
-	public SequenceType[] getArgumentTypes() {
-		return new SequenceType[] { SequenceType.NODE_SEQUENCE };
-	}
-
-	@Override
-	public StructuredQName getFunctionQName() {
-		return new StructuredQName("", "http://exslt.org/common", "node-set"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	@Override
-	public SequenceType getResultType(final SequenceType[] suppliedArgumentTypes) {
-		return SequenceType.NODE_SEQUENCE;
-	}
-
-	@Override
-	public boolean trustResultType() {
-		return true;
-	}
-
-	@Override
-	public ExtensionFunctionCall makeCallExpression() {
-		return new ExtensionFunctionCall() {
-//			@Override
-//			public SequenceIterator call(final SequenceIterator[] arguments, final XPathContext context) throws XPathException {
-//				return arguments[0];
-//			}
-
-			@Override
-			public Sequence call(XPathContext arg0, Sequence[] arg1) throws XPathException {
-				return arg1[0];
-			}
-		};
-	}
-
-}
Index: TXM/trunk/org.txm.utils/src/org/txm/utils/Pair.java
===================================================================
--- TXM/trunk/org.txm.utils/src/org/txm/utils/Pair.java	(revision 3627)
+++ TXM/trunk/org.txm.utils/src/org/txm/utils/Pair.java	(revision 3628)
@@ -121,7 +121,7 @@
 	public boolean equals(Object obj) {
 		if (!(obj instanceof Pair))
 			return false;
-		Pair p = (Pair) obj;
+		Pair<?,?> p = (Pair<?,?>) obj;
 		return same(p.o1, this.o1) && same(p.o2, this.o2);
 	}
 
Index: TXM/trunk/org.txm.utils/src/org/txm/utils/image/BMPUtils.java
===================================================================
--- TXM/trunk/org.txm.utils/src/org/txm/utils/image/BMPUtils.java	(revision 0)
+++ TXM/trunk/org.txm.utils/src/org/txm/utils/image/BMPUtils.java	(revision 3628)
@@ -0,0 +1,75 @@
+package org.txm.utils.image;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.FileImageOutputStream;
+
+public class BMPUtils {
+
+	public static void toRLE8(File inputFile, File outputFile) throws Exception {
+		fromTo(inputFile, outputFile, "BI_RLE8");
+	}
+	
+	public static void toRLE4(File inputFile, File outputFile) throws Exception {
+		fromTo(inputFile, outputFile, "BI_RLE4");
+	}
+	
+	public static void emptySquare(File outputFile, int size, String comp) throws Exception {
+		
+		BufferedImage bi = new BufferedImage(size, size, BufferedImage.TYPE_BYTE_INDEXED);
+		
+		ImageWriter writer = ImageIO.getImageWritersByFormatName("bmp").next();
+		ImageWriteParam param = writer.getDefaultWriteParam();
+
+		param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+		param.setCompressionType(comp);
+
+		writer.setOutput(new FileImageOutputStream(outputFile));
+		writer.write(null, new IIOImage(bi, null, null), param);
+		writer.dispose();
+	}
+	
+	public static void fromTo(File inputFile, File outputFile, String comp) throws Exception {
+		
+		BufferedImage bi = ImageIO.read(inputFile); //new BufferedImage(size, size, BufferedImage.TYPE_BYTE_INDEXED);
+		
+		ImageWriter writer = ImageIO.getImageWritersByFormatName("bmp").next();
+		ImageWriteParam param = writer.getDefaultWriteParam();
+
+		param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+		param.setCompressionType(comp);
+
+		writer.setOutput(new FileImageOutputStream(outputFile));
+		writer.write(null, new IIOImage(bi, null, null), param);
+		writer.dispose();
+	}
+
+	public static void main(String[] args) throws Exception {
+		
+//		toRLE4(new File("/home/mdecorde/eclipse-tycho2022-09/bundles/org.txm.rcp/icons/logo/TXM logo 16x16 8-bit.bmp"), 
+//				new File("/home/mdecorde/eclipse-tycho2022-09/bundles/org.txm.rcp/icons/logo/TXM logo 16x16 8-bit RLE8.bmp"));
+//		
+//		toRLE4(new File("/home/mdecorde/eclipse-tycho2022-09/bundles/org.txm.rcp/icons/logo/TXM logo 48x48 8-bit.bmp"), 
+//				new File("/home/mdecorde/eclipse-tycho2022-09/bundles/org.txm.rcp/icons/logo/TXM logo 48x48 8-bit RLE8.bmp"));
+//		
+//		toRLE4(new File("/home/mdecorde/eclipse-tycho2022-09/bundles/org.txm.rcp/icons/logo/TXM logo 256x256 32-bit.bmp"), 
+//				new File("/home/mdecorde/eclipse-tycho2022-09/bundles/org.txm.rcp/icons/logo/TXM logo 256x256 32-bit RLE8.bmp"));
+		
+		emptySquare( 
+				new File("/home/mdecorde/eclipse-tycho2022-09/bundles/org.txm.rcp/icons/logo/TXM logo 32x32 8-bit RLE8.bmp"),
+				32, "BI_RLE8");
+		
+//		emptySquare(
+//				new File("/home/mdecorde/eclipse-tycho2022-09/bundles/org.txm.rcp/icons/logo/TXM logo 48x48 8-bit RLE8.bmp"),
+//				48, "BI_RLE8");
+//		
+//		emptySquare(
+//				new File("/home/mdecorde/eclipse-tycho2022-09/bundles/org.txm.rcp/icons/logo/TXM logo 256x256 32-bit RLE8.bmp"),
+//				256, "BI_RLE8");
+	}
+}

Property changes on: TXM/trunk/org.txm.utils/src/org/txm/utils/image/BMPUtils.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: TXM/trunk/org.txm.utils/src/org/txm/utils/io/IOUtils.java
===================================================================
--- TXM/trunk/org.txm.utils/src/org/txm/utils/io/IOUtils.java	(revision 3627)
+++ TXM/trunk/org.txm.utils/src/org/txm/utils/io/IOUtils.java	(revision 3628)
@@ -18,8 +18,6 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
Index: TXM/trunk/org.txm.utils/build.properties
===================================================================
--- TXM/trunk/org.txm.utils/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.utils/build.properties	(revision 3628)
@@ -2,7 +2,6 @@
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               saxon9he.jar,\
                commons-cli-1.2.jar,\
                commons-io-1.4.jar,\
                commons-lang-2.4.jar,\
Index: TXM/trunk/org.txm.utils/test.bmp
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.utils/test.bmp
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: TXM/trunk/org.txm.utils/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.utils/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.utils/META-INF/MANIFEST.MF	(revision 3628)
@@ -82,18 +82,19 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .,commons-cli-1.2.jar,commons-io-1.4.jar,commons-lan
  g-2.4.jar,juniversalchardet-1.0.3.jar,ant-1.7.1.jar,textcat-1.0.1.jar
-Require-Bundle: org.txm.libs.saxon;bundle-version="9.0.0";visibility:=reexport,
+Require-Bundle: com.ibm.icu;visibility:=reexport,
  org.eclipse.osgi.util;bundle-version="3.3.0";visibility:=reexport,
  org.eclipse.core.runtime;visibility:=reexport,
  org.eclipse.core.net;bundle-version="1.2.200";visibility:=reexport,
+ org.txm.libs.saxon;bundle-version="9.0.0";visibility:=reexport,
  org.txm.libs.colt;bundle-version="1.2.0";visibility:=reexport,
  org.txm.libs.itext;bundle-version="2.1.5";visibility:=reexport,
  org.txm.libs.msoffice;bundle-version="1.0.0";visibility:=reexport,
  org.txm.libs.office;bundle-version="0.8.2";visibility:=reexport,
- com.ibm.icu;visibility:=reexport,
- org.txm.libs.gson;bundle-version="2.8.6";visibility:=reexport
+ org.txm.libs.gson;bundle-version="2.8.6";visibility:=reexport,
+ org.txm.libs.groovy-all;bundle-version="2.3.7";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.utils.core
 

Property changes on: TXM/trunk/org.txm.utils
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.partition.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.partition.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.partition.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -11,7 +11,7 @@
  ="1.0.0";visibility:=reexport,org.txm.lexicaltable.core;bundle-versio
  n="1.0.0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.partition.core
 

Property changes on: TXM/trunk/org.txm.partition.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/themes/highcharts/renderers/ProgressionItemSelectionRenderer.java
===================================================================
--- TXM/trunk/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/themes/highcharts/renderers/ProgressionItemSelectionRenderer.java	(revision 3627)
+++ TXM/trunk/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/themes/highcharts/renderers/ProgressionItemSelectionRenderer.java	(revision 3628)
@@ -28,6 +28,7 @@
  */
 public class ProgressionItemSelectionRenderer extends ItemSelectionXYStepRenderer {
 
+	private static final long serialVersionUID = -2180907160906491676L;
 
 	/**
 	 * Needed to get the Graphics2D object to use in getItemShape() to compute the label text bounds and draw a background rectangle.
@@ -37,7 +38,7 @@
 	/**
 	 * Stack to store selected items to draw at last, over others items.
 	 */
-	protected ArrayList itemsToDrawAtLast; 
+	protected ArrayList<?> itemsToDrawAtLast; 
 	
 	/**
 	 * additional series informations to show in tooltips
Index: TXM/trunk/org.txm.progression.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.progression.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.progression.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -13,7 +13,7 @@
  ="1.0.0";visibility:=reexport,org.txm.searchengine.cqp.core;bundle-ve
  rsion="1.1.0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.progression.core
 

Property changes on: TXM/trunk/org.txm.progression.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.index.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.index.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.index.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:10 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.index.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.index.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.index.feature/feature.xml	(revision 3628)
@@ -4,15 +4,15 @@
       label="Index"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Index
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.index.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.chartsengine.r.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.chartsengine.r.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.r.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -9,7 +9,7 @@
  bility:=reexport,org.txm.chartsengine.core;bundle-version="1.0.0";vis
  ibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.chartsengine.r.core
 

Property changes on: TXM/trunk/org.txm.chartsengine.r.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.links.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.links.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.links.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -3,10 +3,9 @@
 Bundle-SymbolicName: org.txm.links.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Name: %Bundle-Name
-Require-Bundle: org.txm.rcp;bundle-version="0.8.0";visibility:=reexpor
- t
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.links.rcp
 

Property changes on: TXM/trunk/org.txm.links.rcp
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.textsbalance.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.textsbalance.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.textsbalance.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -10,7 +10,7 @@
  on="1.0.0";visibility:=reexport,org.txm.chartsengine.r.core;bundle-ve
  rsion="1.0.0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.textsbalance.core
 

Property changes on: TXM/trunk/org.txm.textsbalance.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.analec.rcp/.settings/org.eclipse.jdt.groovy.core.prefs
===================================================================
--- TXM/trunk/org.txm.analec.rcp/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 0)
+++ TXM/trunk/org.txm.analec.rcp/.settings/org.eclipse.jdt.groovy.core.prefs	(revision 3628)
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+groovy.compiler.level=40
+groovy.script.filters=**/*.dsld,y,**/*.gradle,n

Property changes on: TXM/trunk/org.txm.analec.rcp/.settings/org.eclipse.jdt.groovy.core.prefs
___________________________________________________________________
Added: svn:mime-type
   + text/plain


Property changes on: TXM/trunk/org.txm.analec.rcp/.settings
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.analec.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.analec.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.analec.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -179,7 +179,7 @@
  untime;visibility:=reexport,org.eclipse.jface;visibility:=reexport,or
  g.eclipse.swt;visibility:=reexport,org.eclipse.core.expressions;bundl
  e-version="3.4.600";visibility:=reexport,org.txm.core;bundle-version=
- "0.8.0";visibility:=reexport,org.txm.rcp;bundle-version="0.8.0";visib
+ "0.8.3";visibility:=reexport,org.txm.rcp;bundle-version="0.8.3";visib
  ility:=reexport,org.txm.utils.core;visibility:=reexport,org.txm.conco
  rdance.rcp;bundle-version="1.0.0";visibility:=reexport,org.txm.progre
  ssion.rcp;bundle-version="1.0.0";visibility:=reexport,org.txm.lexical
@@ -189,7 +189,7 @@
 Bundle-ActivationPolicy: lazy
 Bundle-ManifestVersion: 2
 Bundle-Activator: analecrcp.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.txm.annotation.urs.rcp
 
Index: TXM/trunk/org.txm.analec.rcp/src/visuAnalec/donnees/VisuStructure.java
===================================================================
--- TXM/trunk/org.txm.analec.rcp/src/visuAnalec/donnees/VisuStructure.java	(revision 3627)
+++ TXM/trunk/org.txm.analec.rcp/src/visuAnalec/donnees/VisuStructure.java	(revision 3628)
@@ -314,8 +314,8 @@
 				if (newType!=null) {
 					DefaultMutableTreeNode ntypefusion = null;
 					noeud0 = (DefaultMutableTreeNode) item.getPathComponent(0);
-					for (Enumeration<DefaultMutableTreeNode> etype = noeud0.children(); etype.hasMoreElements();) {
-						DefaultMutableTreeNode ntype = etype.nextElement();
+					for (Enumeration<TreeNode> etype = noeud0.children(); etype.hasMoreElements();) {
+						DefaultMutableTreeNode ntype = (DefaultMutableTreeNode) etype.nextElement();
 						String type0 = (String) ntype.getUserObject();
 						if (newType.equals(type0)) {
 							ntypefusion = ntype;
@@ -336,8 +336,8 @@
 				String newProp = corpus.saisirRenommerProp(VisuStructure.this, classe, (String) noeud1.getUserObject(), (String) noeud.getUserObject());
 				if (newProp!=null) {
 					DefaultMutableTreeNode npropfusion = null;
-					for (Enumeration<DefaultMutableTreeNode> eprop = noeud1.children(); eprop.hasMoreElements();) {
-						DefaultMutableTreeNode nprop = eprop.nextElement();
+					for (Enumeration<TreeNode> eprop = noeud1.children(); eprop.hasMoreElements();) {
+						DefaultMutableTreeNode nprop = (DefaultMutableTreeNode) eprop.nextElement();
 						String prop0 = (String) nprop.getUserObject();
 						if (newProp.equals(prop0)) {
 							npropfusion = nprop;
@@ -362,8 +362,8 @@
 				String newVal = corpus.saisirRenommerVal(VisuStructure.this, classe,
 						(String) noeud1.getUserObject(), (String) noeud2.getUserObject(), val);
 				if (newVal!=null) {
-					for (Enumeration<DefaultMutableTreeNode> eval = noeud2.children(); eval.hasMoreElements();) {
-						DefaultMutableTreeNode nval = eval.nextElement();
+					for (Enumeration<TreeNode> eval = noeud2.children(); eval.hasMoreElements();) {
+						DefaultMutableTreeNode nval = (DefaultMutableTreeNode) eval.nextElement();
 						String val0 = (String) nval.getUserObject();
 						if (newVal.equals(isDefaut(val0) ? oteDefaut(val0) : val0)) {
 							isDefaut = isDefaut||isDefaut(val0);
@@ -483,22 +483,22 @@
 			DefaultMutableTreeNode noeudprop = (DefaultMutableTreeNode) item.getLastPathComponent();
 			int nbval = noeudprop.getChildCount();
 			String[] vals = new String[nbval];
-			Enumeration<DefaultMutableTreeNode> eval = noeudprop.children();
+			Enumeration<TreeNode> eval = noeudprop.children();
 			for (int i = 0; i<nbval; i++)
-				vals[i] = (String) eval.nextElement().getUserObject();
+				vals[i] = (String) ((DefaultMutableTreeNode)eval.nextElement()).getUserObject();
 			DefaultMutableTreeNode noeudtype = (DefaultMutableTreeNode) item.getPathComponent(1);
 			int nbprop = noeudtype.getChildCount();
 			String[] props = new String[nbprop-1];
 			String[][] propsvals = new String[nbprop-1][];
-			Enumeration<DefaultMutableTreeNode> eprop = noeudtype.children();
+			Enumeration<TreeNode> eprop = noeudtype.children();
 			for (int i = 0; eprop.hasMoreElements(); i++) {
-				DefaultMutableTreeNode nprop = eprop.nextElement();
+				DefaultMutableTreeNode nprop = (DefaultMutableTreeNode) eprop.nextElement();
 				if (nprop!=noeudprop) {
 					props[i] = (String) nprop.getUserObject();
 					propsvals[i] = new String[nprop.getChildCount()];
-					Enumeration<DefaultMutableTreeNode> epropval = nprop.children();
+					Enumeration<TreeNode> epropval = nprop.children();
 					for (int j = 0; epropval.hasMoreElements(); j++)
-						propsvals[i][j] = (String) epropval.nextElement().getUserObject();
+						propsvals[i][j] = (String) ((DefaultMutableTreeNode)epropval.nextElement()).getUserObject();
 				} else i--;
 			}
 			if (corpus.saisirDispatcherProp(VisuStructure.this, classe,
@@ -557,9 +557,9 @@
 		void insererNewProp(String type, String prop) {
 			DefaultMutableTreeNode racine = (DefaultMutableTreeNode) getRoot();
 			DefaultMutableTreeNode ntype = null;
-			for (Enumeration<DefaultMutableTreeNode> etype = racine.children();
+			for (Enumeration<TreeNode> etype = racine.children();
 					etype.hasMoreElements();) {
-				ntype = etype.nextElement();
+				ntype = (DefaultMutableTreeNode) etype.nextElement();
 				if (type.equals(ntype.getUserObject())) break;
 			}
 			insertNodeInto(new DefaultMutableTreeNode(prop, true), ntype, 0);
@@ -569,12 +569,12 @@
 			DefaultMutableTreeNode racine = (DefaultMutableTreeNode) getRoot();
 			DefaultMutableTreeNode ntype = null;
 			DefaultMutableTreeNode nprop = null;
-			for (Enumeration<DefaultMutableTreeNode> etype = racine.children();
+			for (Enumeration<TreeNode> etype = racine.children();
 					etype.hasMoreElements();) {
-				ntype = etype.nextElement();
+				ntype = (DefaultMutableTreeNode) etype.nextElement();
 				if (type.equals(ntype.getUserObject())) {
-					for (Enumeration<DefaultMutableTreeNode> eprop = ntype.children(); eprop.hasMoreElements();) {
-						nprop = eprop.nextElement();
+					for (Enumeration<TreeNode> eprop = ntype.children(); eprop.hasMoreElements();) {
+						nprop = (DefaultMutableTreeNode) eprop.nextElement();
 						if (prop.equals(nprop.getUserObject())) break;
 					}
 					break;
@@ -588,18 +588,18 @@
 			DefaultMutableTreeNode ntype = null;
 			DefaultMutableTreeNode nprop = null;
 			DefaultMutableTreeNode nval = null;
-			for (Enumeration<DefaultMutableTreeNode> etype = racine.children(); etype.hasMoreElements();) {
-				ntype = etype.nextElement();
+			for (Enumeration<TreeNode> etype = racine.children(); etype.hasMoreElements();) {
+				ntype = (DefaultMutableTreeNode) etype.nextElement();
 				if (type.equals(ntype.getUserObject())) {
-					for (Enumeration<DefaultMutableTreeNode> eprop = ntype.children(); eprop.hasMoreElements();) {
-						nprop = eprop.nextElement();
+					for (Enumeration<TreeNode> eprop = ntype.children(); eprop.hasMoreElements();) {
+						nprop = (DefaultMutableTreeNode) eprop.nextElement();
 						if (prop.equals(nprop.getUserObject())) break;
 					}
 					break;
 				}
 			}
-			for (Enumeration<DefaultMutableTreeNode> eval = nprop.children(); eval.hasMoreElements();) {
-				nval = eval.nextElement();
+			for (Enumeration<TreeNode> eval = nprop.children(); eval.hasMoreElements();) {
+				nval = (DefaultMutableTreeNode) eval.nextElement();
 				String val = (String) nval.getUserObject();
 				if (isDefaut(val)) {
 					nval.setUserObject(oteDefaut(val));
@@ -672,9 +672,9 @@
 		}
 		@SuppressWarnings("unchecked")
 		boolean hasForme(DefaultMutableTreeNode noeudtype) {
-			for (Enumeration<DefaultMutableTreeNode> eprop = noeudtype.children();
+			for (Enumeration<TreeNode> eprop = noeudtype.children();
 					eprop.hasMoreElements();) {
-				DefaultMutableTreeNode nprop = eprop.nextElement();
+				DefaultMutableTreeNode nprop = (DefaultMutableTreeNode) eprop.nextElement();
 				if (Structure.FORME.equals(nprop.getUserObject())) return true;
 			}
 

Property changes on: TXM/trunk/org.txm.analec.rcp
___________________________________________________________________
Modified: svn:ignore
   - doc

   + doc

target


Index: TXM/trunk/org.txm.python.core/lib/jython-standalone-2.7.0.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: TXM/trunk/org.txm.python.core/lib/jython-standalone-2.7.2.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: TXM/trunk/org.txm.python.core/lib/jython-standalone-2.7.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: TXM/trunk/org.txm.python.core/lib
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.python.core/build.properties
===================================================================
--- TXM/trunk/org.txm.python.core/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.python.core/build.properties	(revision 3628)
@@ -3,5 +3,5 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               lib/jython-standalone-2.7.0.jar
+               lib/jython-standalone-2.7.2.jar
 #qualifier=svn
Index: TXM/trunk/org.txm.python.core/.classpath
===================================================================
--- TXM/trunk/org.txm.python.core/.classpath	(revision 3627)
+++ TXM/trunk/org.txm.python.core/.classpath	(revision 3628)
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib"
-		path="lib/jython-standalone-2.7.0.jar" />
-	<classpathentry kind="con"
-		path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-	<classpathentry kind="con"
-		path="org.eclipse.pde.core.requiredPlugins">
+	<classpathentry exported="true" kind="lib" path="lib/jython-standalone-2.7.2.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
-			<accessrule kind="accessible" pattern="**" />
+			<accessrule kind="accessible" pattern="**"/>
 		</accessrules>
 	</classpathentry>
-	<classpathentry kind="src" path="src" />
-	<classpathentry kind="output" path="bin" />
-</classpath>
\ No newline at end of file
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
Index: TXM/trunk/org.txm.python.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.python.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.python.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -4,10 +4,11 @@
 Export-Package: org.txm.python.core
 Bundle-Name: Python
 Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: lib/jython-standalone-2.7.0.jar,.
-Require-Bundle: org.txm.core;bundle-version="0.8.0";visibility:=reexpo
+Bundle-ClassPath: .,
+ lib/jython-standalone-2.7.2.jar
+Require-Bundle: org.txm.core;bundle-version="0.8.3";visibility:=reexpo
  rt
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 

Property changes on: TXM/trunk/org.txm.python.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.ca.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.ca.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.ca.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:05 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.ca.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.ca.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.ca.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Correspondence Analysis
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.ca.feature
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.chartsengine.jfreechart.core/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.chartsengine.jfreechart.core/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.chartsengine.jfreechart.core/META-INF/MANIFEST.MF	(revision 3628)
@@ -15,7 +15,7 @@
  org.txm.libs.itext;visibility:=reexport,
  org.txm.libs.jfreesvg;bundle-version="1.7.0";visibility:=reexport
 Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-16
 Bundle-Vendor: Textometrie.org
 Automatic-Module-Name: org.txm.chartsengine.jfreechart.core
 

Property changes on: TXM/trunk/org.txm.chartsengine.jfreechart.core
___________________________________________________________________
Modified: svn:ignore
   - bin

   + bin

target


Index: TXM/trunk/org.txm.searchengine.rcp/META-INF/MANIFEST.MF
===================================================================
--- TXM/trunk/org.txm.searchengine.rcp/META-INF/MANIFEST.MF	(revision 3627)
+++ TXM/trunk/org.txm.searchengine.rcp/META-INF/MANIFEST.MF	(revision 3628)
@@ -5,5 +5,4 @@
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: org.txm.searchengine.rcp
 BBundle-RequiredExecutionEnvironment: JavaSE-10
-Require-Bundle: org.txm.searchengine.core;bundle-version="1.0.0",
- org.txm.rcp;bundle-version="0.8.2"
+Require-Bundle: org.txm.rcp;bundle-version="0.8.3"

Property changes on: TXM/trunk/org.txm.searchengine.rcp
___________________________________________________________________
Added: svn:ignore
   + target


Index: TXM/trunk/org.txm.annotation.kr.feature/build.properties
===================================================================
--- TXM/trunk/org.txm.annotation.kr.feature/build.properties	(revision 3627)
+++ TXM/trunk/org.txm.annotation.kr.feature/build.properties	(revision 3628)
@@ -1,2 +1,2 @@
 #Fri Jul 06 10:25:03 CEST 2018
-bin.includes=feature.xml
\ No newline at end of file
+bin.includes=feature.xml, build.properties
Index: TXM/trunk/org.txm.annotation.kr.feature/feature.xml
===================================================================
--- TXM/trunk/org.txm.annotation.kr.feature/feature.xml	(revision 3627)
+++ TXM/trunk/org.txm.annotation.kr.feature/feature.xml	(revision 3628)
@@ -5,15 +5,15 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.2.qualifier">
+      license-feature-version="0.8.3.qualifier">
 
    <description url="http://www.example.com/description">
       Typed+value annotation through concordances
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.2
-Copyright © 2013-2020 ENS de Lyon, University of Franche-Comté.
+      TXM 0.8.3
+Copyright © 2013-2023 ENS de Lyon, University of Franche-Comté.
 Copyright © 2010-2013 ENS de Lyon.
 Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
 Lyon 2, University of Franche-Comté, University of Nice

Property changes on: TXM/trunk/org.txm.annotation.kr.feature
___________________________________________________________________
Added: svn:ignore
   + target


