Index: tmp/org.txm.index.feature/feature.xml
===================================================================
--- tmp/org.txm.index.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.index.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="Index"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Index
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.analec.rcp/src/org/txm/annotation/urs/view/ElementSearchView.java
===================================================================
--- tmp/org.txm.analec.rcp/src/org/txm/annotation/urs/view/ElementSearchView.java	(revision 3078)
+++ tmp/org.txm.analec.rcp/src/org/txm/annotation/urs/view/ElementSearchView.java	(revision 3079)
@@ -104,7 +104,7 @@
 	
 	private Corpus analecCorpus;
 	
-	private Class clazzSearched;
+	private Class<? extends Element> clazzSearched;
 	
 	private String typeSearched;
 	
@@ -430,7 +430,7 @@
 	 * @param type the searched Element type
 	 * @param toolbar the annotation toolbar which called loadType
 	 */
-	public void loadType(org.txm.searchengine.cqp.corpus.CQPCorpus corpus, Corpus analecCorpus, Class clazz, String type, URSAnnotationToolbar toolbar) {
+	public void loadType(org.txm.searchengine.cqp.corpus.CQPCorpus corpus, Corpus analecCorpus, Class<? extends Element> clazz, String type, URSAnnotationToolbar toolbar) {
 		if (toolbar == null || toolbar.isDisposed()) return;
 		
 		this.searchButton.setEnabled(true);
@@ -667,7 +667,7 @@
 		}
 	}
 	
-	private void setItems(Combo t, Class clazz, String type, String prop) {
+	private void setItems(Combo t, Class<? extends Element> clazz, String type, String prop) {
 		String[] items = vue.getValeursChamp(clazz, type, prop);
 		t.setItems(items);
 		KeyStroke keys = KeyStroke.getInstance(SWT.CONTROL, SWT.SPACE);
Index: tmp/org.txm.ca.feature/feature.xml
===================================================================
--- tmp/org.txm.ca.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.ca.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Correspondence Analysis
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.annotation.kr.feature/feature.xml
===================================================================
--- tmp/org.txm.annotation.kr.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.annotation.kr.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Typed+value annotation through concordances
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.libs.office/build.properties
===================================================================
--- tmp/org.txm.libs.office/build.properties	(revision 3078)
+++ tmp/org.txm.libs.office/build.properties	(revision 3079)
@@ -4,7 +4,7 @@
                .,\
                lib/java-rdfa-0.4.2.jar,\
                lib/log4j-1.2.17.jar,\
-               lib/odfdom-java-0.8.11-incubating.jar,\
+               lib/odfdom-java-0.8.21-incubating.jar,\
                lib/simple-odf-0.8.2-incubating.jar,\
                lib/slf4j-api-1.7.25.jar,\
                lib/commons-beanutils-1.9.2.jar,\
@@ -18,7 +18,7 @@
                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/taglets-0.8.21-incubating.jar,\
                lib/xercesImpl-2.9.1.jar,\
                lib/xml-apis-1.3.04.jar,\
                OSGI-INF/
Index: tmp/org.txm.dictionary.feature/feature.xml
===================================================================
--- tmp/org.txm.dictionary.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.dictionary.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="Dictionary"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Dictionnary
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
@@ -37,7 +37,7 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.2" 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"/>
Index: tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java
===================================================================
--- tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java	(revision 3078)
+++ tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java	(revision 3079)
@@ -29,6 +29,7 @@
  * 
  * Provides methods to output the chart created by the ChartCreators
  * 
+ * @author mdecorde
  * @author sjacquot
  *
  */
@@ -300,14 +301,14 @@
 	 * 
 	 * @param chartsEngineName
 	 */
-	protected void registerChartCreatorExtensions(Class chartsEngineClass) {
+	protected void registerChartCreatorExtensions(Class<? extends ChartsEngine> chartsEngineClass) {
 		
 		IConfigurationElement[] contributions = Platform.getExtensionRegistry().getConfigurationElementsFor(ChartCreator.extensionPointId);
 		
 		for (int i = 0; i < contributions.length; i++) {
 			
 			try {
-				ChartCreator chartCreator = (ChartCreator) contributions[i].createExecutableExtension("class"); //$NON-NLS-1$
+				ChartCreator<?, ?> chartCreator = (ChartCreator<?, ?>) contributions[i].createExecutableExtension("class"); //$NON-NLS-1$
 				
 				if (chartsEngineClass.equals(chartCreator.getChartsEngineClass())) {
 					chartCreator.setFileNamePrefix(contributions[i].getAttribute("fileNamePrefix")); //$NON-NLS-1$
Index: tmp/org.txm.internalview.feature/feature.xml
===================================================================
--- tmp/org.txm.internalview.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.internalview.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Browse through the CQP indexes
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java	(revision 3078)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CQPCorpus.java	(revision 3079)
@@ -196,7 +196,7 @@
 	 * @param toCache
 	 * @return
 	 */
-	public static ArrayList<?> uncache(Class classToUnCache) {
+	public static ArrayList<?> uncache(Class<?> classToUnCache) {
 		if (classToUnCache == null) {
 			return null;
 		}
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiServer.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiServer.java	(revision 3078)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiServer.java	(revision 3079)
@@ -477,7 +477,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.1/corpora/DEMOCRATLYON5/registry";
+		String pathToRegistry = System.getProperty("user.home") + "TXM-0.8.2/corpora/DEMOCRATLYON5/registry";
 		String pathToInitFile = System.getProperty("user.home") + "workspace047/org.txm.libs.cqp.linux/res/cqpserver.init";
 		
 		String corpus = "DEMOCRATLYON5";
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/macro/edition/ImportAlignedEditionMacro.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/macro/edition/ImportAlignedEditionMacro.groovy	(revision 3078)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/macro/edition/ImportAlignedEditionMacro.groovy	(revision 3079)
@@ -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.1
+	dest_edition.pPageNames = src_edition.pPageNames // replace with getter&setter when published in TXM 0.8.2
 	dest_edition.pPageFirstWordIds = src_edition.pPageFirstWordIds
 	dest_edition.compute(false)
 	
Index: tmp/org.txm.groovy.core/src/groovy/org/txm/macro/commands/NIndexMacro.groovy
===================================================================
--- tmp/org.txm.groovy.core/src/groovy/org/txm/macro/commands/NIndexMacro.groovy	(revision 3078)
+++ tmp/org.txm.groovy.core/src/groovy/org/txm/macro/commands/NIndexMacro.groovy	(revision 3079)
@@ -98,7 +98,7 @@
 	try {
 		 Class.forName( "org.odftoolkit.simple.SpreadsheetDocument")
 	} catch(e) {
-		 println "** $scriptName: the simple-odf-0.8.1-incubating.jar file is needed in the \$HOME/TXM/scripts/lib directory to write in ODS format. Please uncheck the odsOutputFormat option. Aborting."
+		 println "** $scriptName: the simple-odf-0.8.2-incubating.jar file is needed in the \$HOME/TXM/scripts/lib directory to write in ODS format. Please uncheck the odsOutputFormat option. Aborting."
 		return false
 	}
 
Index: tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/MapSetter.java
===================================================================
--- tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/MapSetter.java	(revision 3078)
+++ tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/MapSetter.java	(revision 3079)
@@ -13,6 +13,7 @@
  * <tt>-map key=value</tt>
  * </p>
  */
+@SuppressWarnings("rawtypes")
 public class MapSetter implements Setter {
 	
 	private final Field f;
@@ -26,14 +27,17 @@
 		this.bean = bean;
 	}
 	
+	@Override
 	public Class getType() {
 		return f.getType();
 	}
 	
+	@Override
 	public boolean isMultiValued() {
 		return false;
 	}
 	
+	@Override
 	public void addValue(Object value) {
 		if (String.valueOf(value).indexOf('=') == -1) {
 			throw new RuntimeException(Messages.FORMAT_ERROR_FOR_MAP.format());
Index: tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/spi/MethodSetter.java
===================================================================
--- tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/spi/MethodSetter.java	(revision 3078)
+++ tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/spi/MethodSetter.java	(revision 3079)
@@ -11,6 +11,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
+@SuppressWarnings("rawtypes")
 public final class MethodSetter implements Setter {
 	
 	private final CmdLineParser parser;
@@ -27,14 +28,17 @@
 			throw new IllegalAnnotationError(Messages.ILLEGAL_METHOD_SIGNATURE.format(m));
 	}
 	
+	@Override
 	public Class getType() {
 		return m.getParameterTypes()[0];
 	}
 	
+	@Override
 	public boolean isMultiValued() {
 		return false;
 	}
 	
+	@Override
 	public void addValue(Object value) throws CmdLineException {
 		try {
 			try {
Index: tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/spi/FieldSetter.java
===================================================================
--- tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/spi/FieldSetter.java	(revision 3078)
+++ tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/spi/FieldSetter.java	(revision 3079)
@@ -9,6 +9,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
+@SuppressWarnings("rawtypes")
 final class FieldSetter implements Setter {
 	
 	private final Field f;
@@ -20,14 +21,17 @@
 		this.f = f;
 	}
 	
+	@Override
 	public Class getType() {
 		return f.getType();
 	}
 	
+	@Override
 	public boolean isMultiValued() {
 		return false;
 	}
 	
+	@Override
 	public void addValue(Object value) {
 		try {
 			f.set(bean, value);
Index: tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/spi/MultiValueFieldSetter.java
===================================================================
--- tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/spi/MultiValueFieldSetter.java	(revision 3078)
+++ tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/spi/MultiValueFieldSetter.java	(revision 3079)
@@ -14,6 +14,7 @@
  *
  * @author Kohsuke Kawaguchi
  */
+@SuppressWarnings("rawtypes")
 final class MultiValueFieldSetter implements Setter {
 	
 	private final Object bean;
@@ -28,10 +29,12 @@
 			throw new IllegalAnnotationError(Messages.ILLEGAL_FIELD_SIGNATURE.format(f.getType()));
 	}
 	
+	@Override
 	public boolean isMultiValued() {
 		return true;
 	}
 	
+	@Override
 	public Class getType() {
 		// TODO: compute this correctly
 		Type t = f.getGenericType();
@@ -44,6 +47,7 @@
 		return Object.class;
 	}
 	
+	@Override
 	public void addValue(Object value) {
 		try {
 			doAddValue(bean, value);
@@ -63,7 +67,7 @@
 	private void doAddValue(Object bean, Object value) throws IllegalAccessException {
 		Object o = f.get(bean);
 		if (o == null) {
-			o = new ArrayList<Object>();
+			o = new ArrayList<>();
 			f.set(bean, o);
 		}
 		if (!(o instanceof List))
Index: tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/ClassParser.java
===================================================================
--- tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/ClassParser.java	(revision 3078)
+++ tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/ClassParser.java	(revision 3079)
@@ -17,7 +17,7 @@
 	
 	public void parse(Object bean, CmdLineParser parser) {
 		// recursively process all the methods/fields.
-		for (Class c = bean.getClass(); c != null; c = c.getSuperclass()) {
+		for (Class<?> c = bean.getClass(); c != null; c = c.getSuperclass()) {
 			for (Method m : c.getDeclaredMethods()) {
 				Option o = m.getAnnotation(Option.class);
 				if (o != null) {
Index: tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/CmdLineParser.java
===================================================================
--- tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/CmdLineParser.java	(revision 3078)
+++ tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/CmdLineParser.java	(revision 3079)
@@ -63,12 +63,12 @@
 	/**
 	 * Discovered {@link OptionHandler}s for options.
 	 */
-	private final List<OptionHandler> options = new ArrayList<OptionHandler>();
+	private final List<OptionHandler> options = new ArrayList<>();
 	
 	/**
 	 * Discovered {@link OptionHandler}s for arguments.
 	 */
-	private final List<OptionHandler> arguments = new ArrayList<OptionHandler>();
+	private final List<OptionHandler> arguments = new ArrayList<>();
 	
 	private boolean parsingOptions = true;
 	
@@ -180,7 +180,7 @@
 			// infer the type
 			
 			// enum is the special case
-			Class t = setter.getType();
+			Class<?> t = setter.getType();
 			if (Enum.class.isAssignableFrom(t))
 				return new EnumOptionHandler(this, o, setter, t);
 			
@@ -247,7 +247,7 @@
 	 *
 	 *         <pre>
 	 *         System.err.println("java -jar my.jar" + parser.printExample(REQUIRED) + " arg1 arg2");
-	 * 		</pre>
+	 *         </pre>
 	 */
 	public String printExample(ExampleMode mode, ResourceBundle rb) {
 		StringBuilder buf = new StringBuilder();
@@ -353,7 +353,7 @@
 	 * @return list of all wrapped parts
 	 */
 	private List<String> wrapLines(String line, final int maxLength) {
-		List<String> rv = new ArrayList<String>();
+		List<String> rv = new ArrayList<>();
 		for (String restOfLine : line.split("\\n")) {
 			while (restOfLine.length() > maxLength) {
 				// try to wrap at space, but don't try too hard as some languages don't even have whitespaces.
@@ -404,12 +404,14 @@
 			pos += n;
 		}
 		
+		@Override
 		public String getParameter(int idx) throws CmdLineException {
 			if (pos + idx >= args.length)
 				throw new CmdLineException(CmdLineParser.this, Messages.MISSING_OPERAND.format(getOptionName()));
 			return args[pos + idx];
 		}
 		
+		@Override
 		public int size() {
 			return args.length - pos;
 		}
@@ -439,7 +441,7 @@
 	public void parseArgument(final String... args) throws CmdLineException {
 		CmdLineImpl cmdLine = new CmdLineImpl(args);
 		
-		Set<OptionHandler> present = new HashSet<OptionHandler>();
+		Set<OptionHandler> present = new HashSet<>();
 		int argIndex = 0;
 		
 		while (cmdLine.hasMore()) {
@@ -522,7 +524,7 @@
 	
 	
 	private Map<String, OptionHandler> filter(List<OptionHandler> opt, String keyFilter) {
-		Map<String, OptionHandler> rv = new TreeMap<String, OptionHandler>();
+		Map<String, OptionHandler> rv = new TreeMap<>();
 		for (OptionHandler h : opt) {
 			if (opt.toString().startsWith(keyFilter)) rv.put(opt.toString(), h);
 		}
@@ -544,7 +546,7 @@
 	 *
 	 * Constructors of {@link OptionHandler}-derived class keyed by their supported types.
 	 */
-	private static final Map<Class, Constructor<? extends OptionHandler>> handlerClasses = Collections.synchronizedMap(new HashMap<Class, Constructor<? extends OptionHandler>>());
+	private static final Map<Class<?>, Constructor<? extends OptionHandler>> handlerClasses = Collections.synchronizedMap(new HashMap<Class<?>, Constructor<? extends OptionHandler>>());
 	
 	/**
 	 * Registers a user-defined {@link OptionHandler} class with args4j.
Index: tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/FieldParser.java
===================================================================
--- tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/FieldParser.java	(revision 3078)
+++ tmp/org.txm.libs.args4j/src/org/kohsuke/args4j/FieldParser.java	(revision 3079)
@@ -15,7 +15,7 @@
 public class FieldParser {
 	
 	public void parse(CmdLineParser parser, Object bean) throws ClassNotFoundException {
-		for (Class c = bean.getClass(); c != null; c = c.getSuperclass()) {
+		for (Class<?> c = bean.getClass(); c != null; c = c.getSuperclass()) {
 			System.out.println("Class: " + c); //$NON-NLS-1$
 			for (Field f : c.getDeclaredFields()) {
 				Option o = new OptionImpl(createConfigElement(f));
Index: tmp/org.txm.ahc.feature/feature.xml
===================================================================
--- tmp/org.txm.ahc.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.ahc.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       AHC command plugins
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.chartsengine.r.feature/feature.xml
===================================================================
--- tmp/org.txm.chartsengine.r.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.chartsengine.r.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="R Charts Engine"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       R chart engine for TXM
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
@@ -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.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
    </requires>
 
    <plugin
Index: tmp/org.txm.progression.feature/feature.xml
===================================================================
--- tmp/org.txm.progression.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.progression.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="Progression"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Progression
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.concordance.feature/feature.xml
===================================================================
--- tmp/org.txm.concordance.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.concordance.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Concordances
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
@@ -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.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
       <import plugin="org.txm.concordance.core" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 
Index: tmp/org.txm.wordcloud.feature/feature.xml
===================================================================
--- tmp/org.txm.wordcloud.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.wordcloud.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.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.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.backtomedia.feature/feature.xml
===================================================================
--- tmp/org.txm.backtomedia.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.backtomedia.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.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.1
+      TXM 0.8.2
 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
@@ -39,7 +39,7 @@
 
    <requires>
       <import plugin="org.txm.core" version="0.7.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.2" 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"/>
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/adapters/ConcordanceAdapterFactory.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/adapters/ConcordanceAdapterFactory.java	(revision 3078)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/adapters/ConcordanceAdapterFactory.java	(revision 3079)
@@ -12,30 +12,29 @@
 
 /**
  * A factory for creating Adapter objects.
- *  
+ * 
  * @author mdecorde
  * @author sjacquot
  */
 public class ConcordanceAdapterFactory extends TXMResultAdapterFactory {
-
 	
-	public static final ImageDescriptor ICON =
-			AbstractUIPlugin.imageDescriptorFromPlugin(FrameworkUtil.getBundle(ConcordanceAdapterFactory.class).getSymbolicName(),
-					"platform:/plugin/"+ FrameworkUtil.getBundle(ConcordanceAdapterFactory.class).getSymbolicName() + "/icons/concordance.png"); //$NON-NLS-1$ //$NON-NLS-2$
 	
-
+	public static final ImageDescriptor ICON = AbstractUIPlugin.imageDescriptorFromPlugin(FrameworkUtil.getBundle(ConcordanceAdapterFactory.class).getSymbolicName(),
+			"platform:/plugin/" + FrameworkUtil.getBundle(ConcordanceAdapterFactory.class).getSymbolicName() + "/icons/concordance.png"); //$NON-NLS-1$ //$NON-NLS-2$
+	
 	@Override
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if(this.canAdapt(adapterType) && adaptableObject instanceof Concordance)	{
-			return new TXMResultAdapter() {
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+		if (this.canAdapt(adapterType) && adaptableObject instanceof Concordance) {
+			return adapterType.cast(new TXMResultAdapter() {
+				
 				@Override
 				public ImageDescriptor getImageDescriptor(Object object) {
 					return ICON;
 				}
-			};
+			});
 		}
 		return null;
 	}
-
-
+	
+	
 }
Index: tmp/org.txm.libs.javafx.feature/feature.xml
===================================================================
--- tmp/org.txm.libs.javafx.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.libs.javafx.feature/feature.xml	(revision 3079)
@@ -4,7 +4,7 @@
       label="org.txm.libs.javafx.feature"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
Index: tmp/org.txm.annotation.feature/feature.xml
===================================================================
--- tmp/org.txm.annotation.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.annotation.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Abstract annotation features
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.textsbalance.feature/feature.xml
===================================================================
--- tmp/org.txm.textsbalance.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.textsbalance.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="TXM"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.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.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.analec.feature/feature.xml
===================================================================
--- tmp/org.txm.analec.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.analec.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.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.1
+      TXM 0.8.2
 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
@@ -41,8 +41,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.1" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.1" 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.utils.core"/>
       <import feature="org.txm.edition.feature" version="1.0.0.qualifier"/>
       <import feature="org.txm.lexicaltable.feature" version="1.0.0.qualifier"/>
Index: tmp/org.txm.core.feature/feature.xml
===================================================================
--- tmp/org.txm.core.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.core.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="TXM Core"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description>
       TXM Core (no UI)
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
@@ -59,7 +59,7 @@
       <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="com.ibm.icu"/>
-      <import plugin="org.txm.core" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
       <import plugin="javax.xml" version="1.3.4" match="compatible"/>
       <import plugin="org.apache.xml.resolver" version="1.2.0" match="compatible"/>
       <import plugin="org.apache.xml.serializer" version="2.7.1" match="compatible"/>
Index: tmp/org.txm.rcp/plugin.xml
===================================================================
--- tmp/org.txm.rcp/plugin.xml	(revision 3078)
+++ tmp/org.txm.rcp/plugin.xml	(revision 3079)
@@ -52,7 +52,7 @@
          </property>
          <property
                name="aboutText"
-               value="&lt;TXM Software User Agreement&gt;&#x0A;&#x0A;TXM 0.8.1 Copyright © 2010-2020 ENS de Lyon, University of Franche-Comté, CNRS&#x0A;&#x0A;&lt;English version below&gt;&#x0A;&#x0A;EN ACCEPTANT CETTE 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;&#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="&lt;TXM Software User Agreement&gt;&#x0A;&#x0A;TXM 0.8.2 Copyright © 2010-2020 ENS de Lyon, University of Franche-Comté, CNRS&#x0A;&#x0A;&lt;English version below&gt;&#x0A;&#x0A;EN ACCEPTANT CETTE 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;&#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"
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/AdapterFactory.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/AdapterFactory.java	(revision 3078)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/AdapterFactory.java	(revision 3079)
@@ -43,94 +43,95 @@
  * @author jmague
  */
 public class AdapterFactory implements IAdapterFactory {
-
+	
 	private static boolean firstCorpusDiag = true;
-
-	private HashMap<Class, IWorkbenchAdapter> externalAdapters = new HashMap<Class, IWorkbenchAdapter>();
-
-//	/** The corpus adapter. */
-//	private IWorkbenchAdapter corpusAdapter = new IWorkbenchAdapter() {
-//
-//		@Override
-//		public Object[] getChildren(Object corpus) {
-//			ArrayList<TXMResult> results = ((Corpus) corpus).getChildren(true);
-//			for (int i = 0; i < results.size(); i++) {
-//				Object element = results.get(i);
-//
-//				// remove Text and SavedQuery from the corpora view
-//				if (!TBXPreferences.getInstance().getBoolean(TBXPreferences.SHOW_ALL_RESULT_NODES) && (element instanceof Text || element instanceof SavedQuery)) {
-//					results.remove(i);
-//					i--;
-//				}
-//			}
-//			List<Object> children = new ArrayList<Object>();
-//			children.addAll(results);
-//			return children.toArray();
-//		}
-//
-//		@Override
-//		public ImageDescriptor getImageDescriptor(Object object) {
-//			return AbstractUIPlugin.imageDescriptorFromPlugin(Application.PLUGIN_ID, IImageKeys.CORPUS);
-//		}
-//
-//		@Override
-//		public String getLabel(Object corpus) {
-//			if (corpus instanceof MainCorpus) {
-//				return ((MainCorpus) corpus).getNameForCorporaView();
-//			}
-//			else {
-//				return ((Corpus) corpus).getName();
-//			}
-//		}
-//
-//		@Override
-//		public Object getParent(Object corpus) {
-//			if (corpus instanceof Subcorpus) {
-//				return ((Subcorpus) corpus).getMotherSubcorpus();
-//			}
-//			else {
-//				return CorpusManager.getCorpusManager();
-//			}
-//		}
-//	};
-
-//	/** The partition adapter. */
-//	private IWorkbenchAdapter partitionAdapter = new IWorkbenchAdapter() {
-//
-//		@Override
-//		public Object[] getChildren(Object partition) {
-//			ArrayList<TXMResult> children = ((Partition) partition).getResults();
-//			// System.out.println("PARTITION RESULTS "+children);
-//			return children.toArray();
-//		}
-//
-//		@Override
-//		public ImageDescriptor getImageDescriptor(Object object) {
-//			return AbstractUIPlugin.imageDescriptorFromPlugin(
-//					Application.PLUGIN_ID, IImageKeys.PARTITION);
-//		}
-//
-//		@Override
-//		public String getLabel(Object partition) {
-//			return ((Partition) partition).getSimpleName();
-//		}
-//
-//		@Override
-//		public Object getParent(Object partition) {
-//			return ((Partition) partition).getCorpus();
-//		}
-//	};
-
-
+	
+	private HashMap<Class<?>, IWorkbenchAdapter> externalAdapters = new HashMap<>();
+	
+	// /** The corpus adapter. */
+	// private IWorkbenchAdapter corpusAdapter = new IWorkbenchAdapter() {
+	//
+	// @Override
+	// public Object[] getChildren(Object corpus) {
+	// ArrayList<TXMResult> results = ((Corpus) corpus).getChildren(true);
+	// for (int i = 0; i < results.size(); i++) {
+	// Object element = results.get(i);
+	//
+	// // remove Text and SavedQuery from the corpora view
+	// if (!TBXPreferences.getInstance().getBoolean(TBXPreferences.SHOW_ALL_RESULT_NODES) && (element instanceof Text || element instanceof SavedQuery)) {
+	// results.remove(i);
+	// i--;
+	// }
+	// }
+	// List<Object> children = new ArrayList<Object>();
+	// children.addAll(results);
+	// return children.toArray();
+	// }
+	//
+	// @Override
+	// public ImageDescriptor getImageDescriptor(Object object) {
+	// return AbstractUIPlugin.imageDescriptorFromPlugin(Application.PLUGIN_ID, IImageKeys.CORPUS);
+	// }
+	//
+	// @Override
+	// public String getLabel(Object corpus) {
+	// if (corpus instanceof MainCorpus) {
+	// return ((MainCorpus) corpus).getNameForCorporaView();
+	// }
+	// else {
+	// return ((Corpus) corpus).getName();
+	// }
+	// }
+	//
+	// @Override
+	// public Object getParent(Object corpus) {
+	// if (corpus instanceof Subcorpus) {
+	// return ((Subcorpus) corpus).getMotherSubcorpus();
+	// }
+	// else {
+	// return CorpusManager.getCorpusManager();
+	// }
+	// }
+	// };
+	
+	// /** The partition adapter. */
+	// private IWorkbenchAdapter partitionAdapter = new IWorkbenchAdapter() {
+	//
+	// @Override
+	// public Object[] getChildren(Object partition) {
+	// ArrayList<TXMResult> children = ((Partition) partition).getResults();
+	// // System.out.println("PARTITION RESULTS "+children);
+	// return children.toArray();
+	// }
+	//
+	// @Override
+	// public ImageDescriptor getImageDescriptor(Object object) {
+	// return AbstractUIPlugin.imageDescriptorFromPlugin(
+	// Application.PLUGIN_ID, IImageKeys.PARTITION);
+	// }
+	//
+	// @Override
+	// public String getLabel(Object partition) {
+	// return ((Partition) partition).getSimpleName();
+	// }
+	//
+	// @Override
+	// public Object getParent(Object partition) {
+	// return ((Partition) partition).getCorpus();
+	// }
+	// };
+	
+	
 	/** The Lexicon adapter. */
 	// FIXME: became useless? seems never used
 	private IWorkbenchAdapter LexiconAdapter = new TXMResultAdapter() {
+		
 		@Override
 		public ImageDescriptor getImageDescriptor(Object object) {
 			return AbstractUIPlugin.imageDescriptorFromPlugin(Application.PLUGIN_ID, IImageKeys.ACTION_FREQUENCY_LIST);
 		}
 	};
-
+	
 	/**
 	 * Gets the adapter.
 	 *
@@ -138,36 +139,37 @@
 	 * @param adapterType the adapter type
 	 * @return the adapter
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
-	 * java.lang.Class)
+	 *      java.lang.Class)
 	 */
 	@Override
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-//		if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof CorpusManager) {
-//			return corpusManagerAdapter;
-//		}
-//		if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Corpus) {
-//			return corpusAdapter;
-//		}
-//		if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Partition) {
-//			return partitionAdapter;
-//		}
-
-		//check adapters from plugins
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+		// if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof CorpusManager) {
+		// return corpusManagerAdapter;
+		// }
+		// if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Corpus) {
+		// return corpusAdapter;
+		// }
+		// if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof Partition) {
+		// return partitionAdapter;
+		// }
+		
+		// check adapters from plugins
 		if (externalAdapters.containsKey(adaptableObject.getClass())) {
-			return externalAdapters.get(adaptableObject.getClass());
+			return adapterType.cast(externalAdapters.get(adaptableObject.getClass()));
 		}
 		
-		if(adapterType == IWorkbenchAdapter.class && adaptableObject instanceof TXMResult)	{
-			return new TXMResultAdapter() {
+		if (adapterType == IWorkbenchAdapter.class && adaptableObject instanceof TXMResult) {
+			return adapterType.cast(new TXMResultAdapter() {
+				
 				@Override
 				public ImageDescriptor getImageDescriptor(Object object) {
 					return AbstractUIPlugin.imageDescriptorFromPlugin(Application.PLUGIN_ID, IImageKeys.ACTION_INFO);
 				}
-			};
+			});
 		}
 		return null;
 	}
-
+	
 	/**
 	 * Gets the adapter list.
 	 *
@@ -175,9 +177,9 @@
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
 	 */
 	@Override
-	@SuppressWarnings("unchecked") //$NON-NLS-1$
-	public Class[] getAdapterList() {
+	@SuppressWarnings("unchecked")
+	public Class<?>[] getAdapterList() {
 		return new Class[] { IWorkbenchAdapter.class };
 	}
-
-}
\ No newline at end of file
+	
+}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenLocalizedWebPage.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenLocalizedWebPage.java	(revision 3078)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/OpenLocalizedWebPage.java	(revision 3079)
@@ -288,7 +288,7 @@
 	}
 	
 	public static void main(String args[]) {
-		String s = getValidURL("https://txm.gitpages.huma-num.fr/textometrie/files/software/TXM/0.8.1beta/", "https://txm.gitpages.huma-num.fr/textometrie/files/software/TXM/0.8.1beta");
+		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");
 		System.out.println(s);
 	}
 }
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/jface/ComboFieldEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/jface/ComboFieldEditor.java	(revision 3078)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/jface/ComboFieldEditor.java	(revision 3079)
@@ -14,21 +14,22 @@
  *
  */
 public class ComboFieldEditor extends org.eclipse.jface.preference.ComboFieldEditor {
-
+	
 	public ComboFieldEditor(String name, String labelText, String[][] entryNamesAndValues, Composite parent) {
 		super(name, labelText, entryNamesAndValues, parent);
 	}
-
+	
 	public String getStringValue() {
 		
 		Field field;
 		try {
-			Class clazz = this.getClass().getSuperclass();
+			Class<?> clazz = this.getClass().getSuperclass();
 			field = clazz.getDeclaredField("fCombo");
 			field.setAccessible(true);
 			Combo fCombo = (Combo) field.get(this);
 			return fCombo.getText();
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			e.printStackTrace();
 			return null;
 		}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 3078)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/ApplicationWorkbenchAdvisor.java	(revision 3079)
@@ -883,7 +883,7 @@
 			}
 		});
 		
-		// move previous TXM 0.8.1 corpora
+		// move previous TXM 0.8.2 corpora
 		File backupDir = new File(corporaDir.getAbsolutePath() + "-previous"); //$NON-NLS-1$
 		if (corporaDir.exists()) {
 			backupDir.mkdirs();
@@ -894,7 +894,7 @@
 			}
 		}
 		
-		// load TXM-0.8.1 sample corpora (from the install directory)
+		// load TXM-0.8.2 sample corpora (from the install directory)
 		if (corporaDirs.contains(SAMPLES) && sampleCorporaDirectory.exists()) {
 			
 			Log.info(TXMUIMessages.installingSampleCorpus);
@@ -909,9 +909,9 @@
 			}
 		}
 		
-		// TXM-0.8.1 previous installation corpora
+		// TXM-0.8.2 previous installation corpora
 		if (corporaDirs.contains(V081) && backupDir.listFiles(IOUtils.HIDDENFILE_FILTER).length > 0) { // not a new install, restore corpus from the corpora-previous directory
-			Log.info(NLS.bind(TXMUIMessages.installingPreviousCorpusFromP0, "0.8.1", corporaDir)); //$NON-NLS-1$
+			Log.info(NLS.bind(TXMUIMessages.installingPreviousCorpusFromP0, "0.8.2", corporaDir)); //$NON-NLS-1$
 			JobHandler job = LoadBinaryCorporaDirectory.loadBinaryCorpusFromCorporaDirectory(backupDir, false, false, true);
 			try {
 				job.join();
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java	(revision 3078)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/SWTChartsComponentsProvider.java	(revision 3079)
@@ -28,6 +28,7 @@
 import org.txm.chartsengine.core.ChartsEngine;
 import org.txm.chartsengine.core.ChartsEnginesManager;
 import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
+import org.txm.chartsengine.core.results.ChartResult;
 import org.txm.chartsengine.rcp.editors.ChartEditor;
 import org.txm.chartsengine.rcp.messages.ChartsUIMessages;
 import org.txm.chartsengine.rcp.preferences.___KeyboardBindingProperties;
@@ -49,23 +50,23 @@
  * 
  */
 public abstract class SWTChartsComponentsProvider {
-
 	
 	
+	
 	// FIXME: should be done in an activator?
-	static	{
+	static {
 		// Initializes the SWT Charts Components provider according to the current charts engine and its output format
 		SWTChartsComponentsProvider.createSWTChartsComponentsProviders();
 		SWTChartsComponentsProvider.setCurrrentComponentsProvider(ChartsEngine.getCurrent());
 	}
 	
-
+	
 	/**
 	 * The charts engine.
 	 */
 	protected ChartsEngine chartsEngine;
-
-
+	
+	
 	/**
 	 * The name of the provider.
 	 */
@@ -81,14 +82,14 @@
 	 * Mouse control properties which will be shared by all implementations and chart editors.
 	 */
 	protected Properties mouseBindingProperties;
-
-
+	
+	
 	/**
 	 * Keyboard control properties which will be shared by all implementations and chart editors.
 	 */
 	protected Properties keyboardBindingProperties;
-
 	
+	
 	/**
 	 * Installed SWT charts components providers.
 	 */
@@ -103,35 +104,35 @@
 	
 	public SWTChartsComponentsProvider(ChartsEngine chartsEngine, Properties mouseBindingProperties, Properties keyboardBindingProperties) {
 		this.chartsEngine = chartsEngine;
-
+		
 		this.mouseBindingProperties = mouseBindingProperties;
 		this.keyboardBindingProperties = keyboardBindingProperties;
-
+		
 		// FIXME : SJ: see if we need to define the L&F as system for AWT/Swing components
 		// If yes, we need to find a way to manage the GTK L&F/Linux bug, see ticket #761
-        // System Look and feel
-//        try {
-//			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-//		}
-//		catch(ClassNotFoundException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//		catch(InstantiationException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//		catch(IllegalAccessException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//		catch(UnsupportedLookAndFeelException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
+		// System Look and feel
+		// try {
+		// UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		// }
+		// catch(ClassNotFoundException e) {
+		// // TODO Auto-generated catch block
+		// e.printStackTrace();
+		// }
+		// catch(InstantiationException e) {
+		// // TODO Auto-generated catch block
+		// e.printStackTrace();
+		// }
+		// catch(IllegalAccessException e) {
+		// // TODO Auto-generated catch block
+		// e.printStackTrace();
+		// }
+		// catch(UnsupportedLookAndFeelException e) {
+		// // TODO Auto-generated catch block
+		// e.printStackTrace();
+		// }
 		
 	}
-
+	
 	/**
 	 * 
 	 * @param chartsEngine
@@ -146,40 +147,41 @@
 	public SWTChartsComponentsProvider() {
 		this(null);
 	}
-
-
 	
+	
+	
 	/**
-	 * Creates and stores SWT charts components providers from installed extension contributions and defines the current one according to the specified charts engine output format and provider supported input format.
+	 * Creates and stores SWT charts components providers from installed extension contributions and defines the current one according to the specified charts engine output format and provider
+	 * supported input format.
 	 */
-	public static void createSWTChartsComponentsProviders()	{
+	public static void createSWTChartsComponentsProviders() {
 		
 		
-		SWTChartsComponentsProvider.chartsComponentsProviders = new ArrayList<SWTChartsComponentsProvider>();
+		SWTChartsComponentsProvider.chartsComponentsProviders = new ArrayList<>();
 		
 		String extensionPointId = "org.txm.rcp.swtchartscomponentsprovider"; //$NON-NLS-1$
 		IConfigurationElement[] contributions = Platform.getExtensionRegistry().getConfigurationElementsFor(extensionPointId);
 		
-		for(int i = 0; i < contributions.length; i++) {
+		for (int i = 0; i < contributions.length; i++) {
 			
 			// FIXME: SJ: to manage more than one input format, Store them in the class rather than in the extension schema?
 			String formatsStr = contributions[i].getAttribute("inputFormat").replace(" ", "").trim(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			String[] formats = formatsStr.split(","); //$NON-NLS-1$
 			
 			try {
-				SWTChartsComponentsProvider swtChartsComponentsProvider = (SWTChartsComponentsProvider)contributions[i].createExecutableExtension("class");  //$NON-NLS-1$
+				SWTChartsComponentsProvider swtChartsComponentsProvider = (SWTChartsComponentsProvider) contributions[i].createExecutableExtension("class");  //$NON-NLS-1$
 				swtChartsComponentsProvider.setName(contributions[i].getAttribute("name")); //$NON-NLS-1$
 				swtChartsComponentsProvider.setEditorSupportedInputFormat(Arrays.asList(formats));
 				
 				// Add the first charts engine that supports the input format
 				ChartsEngine chartsEngine = null;
-				for(int j = 0; j < formats.length; j++) {
+				for (int j = 0; j < formats.length; j++) {
 					chartsEngine = ChartsEnginesManager.getInstance().getChartsEngine(formats[j]);
-					if(chartsEngine != null)	{
+					if (chartsEngine != null) {
 						break;
 					}
 				}
-				swtChartsComponentsProvider.setChartsEngine(chartsEngine);					
+				swtChartsComponentsProvider.setChartsEngine(chartsEngine);
 				
 				SWTChartsComponentsProvider.chartsComponentsProviders.add(swtChartsComponentsProvider);
 				
@@ -187,7 +189,7 @@
 				
 				
 			}
-			catch(CoreException e) {
+			catch (CoreException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
@@ -197,19 +199,21 @@
 	
 	/**
 	 * Gets the current charts component provider.
+	 * 
 	 * @return the current charts engine
 	 */
-	public static SWTChartsComponentsProvider getCurrent()	{
+	public static SWTChartsComponentsProvider getCurrent() {
 		return SWTChartsComponentsProvider.chartsComponentsProviders.get(SWTChartsComponentsProvider.currentChartsComponentsProviderIndex);
 	}
 	
 	/**
-	 * Sets the current charts component provider according to the specified charts engine output format and provider supported input format. 
+	 * Sets the current charts component provider according to the specified charts engine output format and provider supported input format.
+	 * 
 	 * @param name the name of the charts engine to set as current
 	 */
-	public static void setCurrrentComponentsProvider(ChartsEngine chartsEngine)	{
-		for(int i = 0; i < SWTChartsComponentsProvider.chartsComponentsProviders.size(); i++) {
-			if(SWTChartsComponentsProvider.chartsComponentsProviders.get(i).canCreateView(chartsEngine))	{
+	public static void setCurrrentComponentsProvider(ChartsEngine chartsEngine) {
+		for (int i = 0; i < SWTChartsComponentsProvider.chartsComponentsProviders.size(); i++) {
+			if (SWTChartsComponentsProvider.chartsComponentsProviders.get(i).canCreateView(chartsEngine)) {
 				// Set new charts engine
 				SWTChartsComponentsProvider.chartsComponentsProviders.get(i).setChartsEngine(chartsEngine);
 				
@@ -292,56 +296,61 @@
 	public ChartsEngine getChartsEngine() {
 		return chartsEngine;
 	}
-
-
-	 /**
-	  * Creates the chart drawing area composite.
-	  * @param parent
-	  * @param style
-	  * @return the composite
-	  */
-	 public abstract ChartComposite createComposite(ChartEditor chartEditor, Composite parent);
-
-
+	
+	
 	/**
+	 * Creates the chart drawing area composite.
+	 * 
+	 * @param parent
+	 * @param style
+	 * @return the composite
+	 */
+	public abstract ChartComposite createComposite(ChartEditor chartEditor, Composite parent);
+	
+	
+	/**
 	 * Returns the input formats supported by the implementation of the <code>EditorPart</code> for viewing.
+	 * 
 	 * @return
 	 */
-	public List<String> getEditorSupportedInputFormats()	{
+	public List<String> getEditorSupportedInputFormats() {
 		return this.supportedInputFormats;
 	}
 	
-
+	
 	/**
 	 * Sets the input formats supported by the implementation of the <code>EditorPart</code> for viewing.
+	 * 
 	 * @param supportedInputFormats
 	 */
-	public void setEditorSupportedInputFormat(List<String> supportedInputFormats)	{
+	public void setEditorSupportedInputFormat(List<String> supportedInputFormats) {
 		this.supportedInputFormats = supportedInputFormats;
 	}
 	
 	/**
 	 * Returns the export formats supported by the implementation of the <code>ChartsEngine</code> for the total chart.
+	 * 
 	 * @return
 	 */
 	public abstract ArrayList<String> getChartsEngineSupportedExportFileFormats();
-
-
+	
+	
 	/**
 	 * Creates a SWT group for the charts engine default preferences area in preference pages.
+	 * 
 	 * @return
 	 */
-	public static Group createChartsRenderingPreferencesGroup(Composite parent)	{
-
+	public static Group createChartsRenderingPreferencesGroup(Composite parent) {
+		
 		Group chartsGroup = new Group(parent, SWT.NONE);
-
+		
 		chartsGroup.setText(ChartsUIMessages.chartsRendering);
-
+		
 		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
 		gridData.horizontalSpan = 2;
 		gridData.verticalIndent = 10;
 		chartsGroup.setLayoutData(gridData);
-
+		
 		return chartsGroup;
 	}
 	
@@ -351,29 +360,30 @@
 	 * @param parent
 	 * @return
 	 */
-	public static Composite createChartsRenderingPreferencesTabFolderComposite(Composite parent)	{
+	public static Composite createChartsRenderingPreferencesTabFolderComposite(Composite parent) {
 		return createChartsRenderingPreferencesTabFolderComposite(parent, ChartsUIMessages.chartsRendering);
 	}
 	
 	/**
 	 * Creates a tab folder with a tab item for rendering preferences.
+	 * 
 	 * @param parent
 	 * @return
 	 */
-	public static Composite createChartsRenderingPreferencesTabFolderComposite(Composite parent, String tabTitle)	{
-
+	public static Composite createChartsRenderingPreferencesTabFolderComposite(Composite parent, String tabTitle) {
 		
+		
 		TabFolder tabFolder = new TabFolder(parent, SWT.TOP);
 		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
 		gridData.horizontalSpan = 2;
 		tabFolder.setLayoutData(gridData);
-
+		
 		TabItem tabItem = new TabItem(tabFolder, SWT.NULL);
 		tabItem.setText(tabTitle);
 		Composite composite = new Composite(tabFolder, SWT.NULL);
 		tabItem.setControl(composite);
 		
-
+		
 		return composite;
 	}
 	
@@ -382,30 +392,30 @@
 	 * @param page
 	 * @param composite
 	 */
-	public static void createChartsRenderingPreferencesFields(TXMPreferencePage page, Composite composite)	{
+	public static void createChartsRenderingPreferencesFields(TXMPreferencePage page, Composite composite) {
 		
 		Label separator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
 		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
 		gridData.horizontalSpan = 2;
 		separator.setLayoutData(gridData);
-
-		String commandNodeQualifier = ((TXMPreferenceStore)page.getPreferenceStore()).getNodeQualifier(); 
-
+		
+		String commandNodeQualifier = ((TXMPreferenceStore) page.getPreferenceStore()).getNodeQualifier();
+		
 		// Show title
-		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_TITLE))	{
+		if (!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_TITLE)) {
 			page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_TITLE, ChartsUIMessages.showTitle, composite));
 		}
 		// Show legend
-		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_LEGEND))	{
+		if (!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_LEGEND)) {
 			page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_LEGEND, ChartsUIMessages.showLegend, composite));
 		}
 		// Show grid
-		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_GRID))	{
+		if (!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.SHOW_GRID)) {
 			page.addField(new BooleanFieldEditor(ChartsEnginePreferences.SHOW_GRID, ChartsUIMessages.showGrid, composite));
 		}
-
+		
 		// Rendering colors mode selection
-		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.RENDERING_COLORS_MODE))	{
+		if (!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.RENDERING_COLORS_MODE)) {
 			String colorsModes[][] = new String[4][2];
 			colorsModes[0][0] = ChartsUIMessages.colors;
 			colorsModes[0][1] = "0"; //$NON-NLS-1$
@@ -418,79 +428,81 @@
 			ComboFieldEditor renderingModeComboField = new ComboFieldEditor(ChartsEnginePreferences.RENDERING_COLORS_MODE, ChartsUIMessages.renderingColorsMode, colorsModes, composite);
 			page.addField(renderingModeComboField);
 		}
-
+		
 		// Same lines stroke
-		if(!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.MULTIPLE_LINE_STROKES))	{
+		if (!TXMPreferences.isEmpty(commandNodeQualifier, ChartsEnginePreferences.MULTIPLE_LINE_STROKES)) {
 			page.addField(new BooleanFieldEditor(ChartsEnginePreferences.MULTIPLE_LINE_STROKES, ChartsUIMessages.multipleLineStrokeStyles, composite));
 		}
-
 		
+		
 	}
 	
 	/**
 	 * Gets the current active chart editor managing the multi pages editor.
+	 * 
 	 * @param event
 	 * @return
 	 */
-	public static ChartEditor getActiveChartEditor(ExecutionEvent event)	{
-		ChartEditor chartEditor = null;
-
-		Event eevent = (Event)event.getTrigger();
+	public static ChartEditor<? extends ChartResult> getActiveChartEditor(ExecutionEvent event) {
+		ChartEditor<? extends ChartResult> chartEditor = null;
+		
+		Event eevent = (Event) event.getTrigger();
 		Widget widget = eevent.widget;
 		
 		// Toolbars
-		if(event != null && widget instanceof ToolItem)	{
+		if (event != null && widget instanceof ToolItem) {
 			ToolItem to = (ToolItem) widget;
 			ToolBar parent = to.getParent();
-			if(to.getParent() instanceof ChartEditorToolBar)	{
-				chartEditor = ((ChartEditorToolBar)((ToolItem)((Event)event.getTrigger()).widget).getParent()).getEditorPart();	
+			if (to.getParent() instanceof ChartEditorToolBar) {
+				chartEditor = ((ChartEditorToolBar) ((ToolItem) ((Event) event.getTrigger()).widget).getParent()).getEditorPart();
 			}
-			if(to.getParent() instanceof AdvancedChartEditorToolBar)	{
-				chartEditor = ((AdvancedChartEditorToolBar)((ToolItem)((Event)event.getTrigger()).widget).getParent()).getEditorPart();
+			if (to.getParent() instanceof AdvancedChartEditorToolBar) {
+				chartEditor = ((AdvancedChartEditorToolBar) ((ToolItem) ((Event) event.getTrigger()).widget).getParent()).getEditorPart();
 			}
 		}
 		else {
 			IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-
+			
 			// Context menu, multi pages editor
-			if(part instanceof TXMMultiPageEditor)	{
+			if (part instanceof TXMMultiPageEditor) {
 				TXMMultiPageEditor editor = (TXMMultiPageEditor) part;
 				// Main editor
-				if(editor.getMainEditorPart() instanceof ChartEditor
-					&& ((ChartEditor)editor.getMainEditorPart()).hasFocus())	{
-				chartEditor = (ChartEditor)editor.getMainEditorPart();
+				if (editor.getMainEditorPart() instanceof ChartEditor
+						&& ((ChartEditor<?>) editor.getMainEditorPart()).hasFocus()) {
+					chartEditor = (ChartEditor<?>) editor.getMainEditorPart();
 				}
 				// FIXME: SJ: became useless?
-	//			else if(((MultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getSelectedPage() instanceof ChartEditor
-	//					&& ((ChartEditor)((MultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getSelectedPage()).hasFocus() )	{
-	//				chartEditor = (ChartEditor)((MultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getSelectedPage();
-	//			}
+				// else if(((MultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getSelectedPage() instanceof ChartEditor
+				// && ((ChartEditor)((MultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getSelectedPage()).hasFocus() ) {
+				// chartEditor = (ChartEditor)((MultiPageEditorPart) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor()).getSelectedPage();
+				// }
 			}
 			// Context menu, Normal editor
-			else if(part instanceof ChartEditor)	{
-				chartEditor = (ChartEditor) part;	
+			else if (part instanceof ChartEditor) {
+				chartEditor = (ChartEditor<?>) part;
 			}
 		}
 		return chartEditor;
 	}
 	
-
 	
-
+	
+	
 	@Override
 	public String toString() {
 		return String.format("%s (supported input formats: %s, Charts Engine: %s)", this.name, this.supportedInputFormats.toString().replaceAll("\\[|\\]", ""), this.chartsEngine); //$NON-NLS-1$
 	}
-
-
+	
+	
 	/**
 	 * Sets the name of the provider.
+	 * 
 	 * @param name the name to set
 	 */
 	public void setName(String name) {
 		this.name = name;
 	}
-
-
-
-}
\ No newline at end of file
+	
+	
+	
+}
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java	(revision 3078)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java	(revision 3079)
@@ -229,7 +229,7 @@
 	 * 
 	 * @param result
 	 */
-	public static ChartEditor openEditor(ChartResult result) {
+	public static ChartEditor<ChartResult> openEditor(ChartResult result) {
 		return openEditor(result, false);
 	}
 	
@@ -239,7 +239,7 @@
 	 * @param alwaysRecreateEditor
 	 * @return
 	 */
-	public static ChartEditor openEditor(ChartResult result, boolean alwaysRecreateEditor) {
+	public static ChartEditor<ChartResult> openEditor(ChartResult result, boolean alwaysRecreateEditor) {
 		return openEditor(result, result.getClass().getName(), alwaysRecreateEditor);
 	}
 	
@@ -249,7 +249,7 @@
 	 * @param editorPartId
 	 * @return
 	 */
-	public static ChartEditor openEditor(ChartResult result, String editorPartId) {
+	public static ChartEditor<ChartResult> openEditor(ChartResult result, String editorPartId) {
 		return openEditor(result, editorPartId, false);
 	}
 	
@@ -261,12 +261,12 @@
 	 * @param alwaysRecreateEditor force editor creation
 	 * @return
 	 */
-	public static ChartEditor openEditor(ChartResult result, String editorPartId, boolean alwaysRecreateEditor) {
+	public static ChartEditor<ChartResult> openEditor(ChartResult result, String editorPartId, boolean alwaysRecreateEditor) {
 		
 		ChartEditorInput<ChartResult> editorInput = new ChartEditorInput<>(result);
 		editorInput.setAlwaysRecreateEditor(alwaysRecreateEditor);
 		
-		return (ChartEditor) openEditor(editorInput, editorPartId);
+		return (ChartEditor<ChartResult>) openEditor(editorInput, editorPartId);
 	}
 	
 	
Index: tmp/org.txm.searchengine.cqp.feature/feature.xml
===================================================================
--- tmp/org.txm.searchengine.cqp.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.searchengine.cqp.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       SearchEngine
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
@@ -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.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
       <import plugin="org.txm.searchengine.cqp.core" version="1.1.0" match="greaterOrEqual"/>
    </requires>
 
Index: tmp/org.txm.statsengine.r.feature/feature.xml
===================================================================
--- tmp/org.txm.statsengine.r.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.statsengine.r.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Statistic engine
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
@@ -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.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
    </requires>
 
    <plugin
Index: tmp/org.txm.groovy.feature/feature.xml
===================================================================
--- tmp/org.txm.groovy.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.groovy.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="Groovy"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Groovy scripts and macros
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
@@ -37,7 +37,7 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.core" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
    </requires>
 
    <plugin
Index: tmp/org.txm.ahc.core/src/org/txm/ahc/core/chartsengine/jfreechart/JFCAHCChartCreator.java
===================================================================
--- tmp/org.txm.ahc.core/src/org/txm/ahc/core/chartsengine/jfreechart/JFCAHCChartCreator.java	(revision 3078)
+++ tmp/org.txm.ahc.core/src/org/txm/ahc/core/chartsengine/jfreechart/JFCAHCChartCreator.java	(revision 3079)
@@ -13,32 +13,21 @@
  * 
  * 
  */
-public class JFCAHCChartCreator extends JFCChartCreator {
+public class JFCAHCChartCreator extends JFCChartCreator<AHC> {
 	
 	
 	@Override
-	public JFreeChart createChart(ChartResult result) {
+	public JFreeChart createChart(AHC result) {
 		
 		System.err.println("JFCAHCChartCreator.createChart(): not yet implemented.");
 		
-		final AHC cah = (AHC) result;
-		
-		
 		return null;
 		
 	}
 	
 	
 	@Override
-	// FIXME: to not load the chart creator, to remove when implemented
-	public Class getChartsEngineClass() {
-		return null;
-	}
-	
-	
-	
-	@Override
-	public Class getResultDataClass() {
+	public Class<AHC> getResultDataClass() {
 		return AHC.class;
 	}
 	
Index: tmp/org.txm.lexicaltable.feature/feature.xml
===================================================================
--- tmp/org.txm.lexicaltable.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.lexicaltable.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="LexicalTable"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Lexical Table
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java
===================================================================
--- tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java	(revision 3078)
+++ tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpI.java	(revision 3079)
@@ -292,7 +292,7 @@
 		String[] rownames = new String[lines.size()];
 		String[] colnames = new String[npart];
 		
-		int i = 0 ;
+		int i = 0;
 		for (String k : lines.keySet()) {
 			QueryIndexLine line = lines.get(k);
 			int[] linefreqs = line.getFreqs();
@@ -370,10 +370,10 @@
 	}
 	
 	@Override
-	public Object getAdapter(Class adapterType) {
+	public <T> T getAdapter(Class<T> adapterType) {
 		// TODO Auto-generated method stub
 		if (adapterType == IWorkbenchAdapter.class)
-			return queryIndexOfTextAdapter;
+			return adapterType.cast(queryIndexOfTextAdapter);
 		return null;
 	}
 	
Index: tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java
===================================================================
--- tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java	(revision 3078)
+++ tmp/org.txm.cql2lsa.rcp/src/org/txm/functions/cql2lsa/ExpII.java	(revision 3079)
@@ -531,9 +531,10 @@
 	}
 	
 	@Override
-	public Object getAdapter(Class adapterType) {
+	public <T> T getAdapter(Class<T> adapterType) {
+		
 		if (adapterType == IWorkbenchAdapter.class)
-			return ExpIIAAdapter;
+			return adapterType.cast(ExpIIAAdapter);
 		return null;
 	}
 	
Index: tmp/org.txm.edition.feature/feature.xml
===================================================================
--- tmp/org.txm.edition.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.edition.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.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.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.svn.feature/feature.xml
===================================================================
--- tmp/org.txm.svn.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.svn.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="SVN"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       SVN access
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.xmleditor.feature/feature.xml
===================================================================
--- tmp/org.txm.xmleditor.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.xmleditor.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.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.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.tokenizer.core/src/org/txm/tokenizer/SimpleStringTokenizer.groovy
===================================================================
--- tmp/org.txm.tokenizer.core/src/org/txm/tokenizer/SimpleStringTokenizer.groovy	(revision 3078)
+++ tmp/org.txm.tokenizer.core/src/org/txm/tokenizer/SimpleStringTokenizer.groovy	(revision 3079)
@@ -250,7 +250,7 @@
 			["fr", "C'est un autre test."],
 			[
 				"fr",
-				"C'est une version 0.8.1 un 01:12:12 test vers http://un.site.web.fr, fin."
+				"C'est une version 0.8.2 un 01:12:12 test vers http://un.site.web.fr, fin."
 			],
 			["en", "This is a test."],
 			["en", "It's a test."]
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/adapters/CAAdapterFactory.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/adapters/CAAdapterFactory.java	(revision 3078)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/adapters/CAAdapterFactory.java	(revision 3079)
@@ -15,11 +15,11 @@
  * @author sjacquot
  */
 public class CAAdapterFactory extends TXMResultAdapterFactory {
-
+	
 	public static final ImageDescriptor ICON = AbstractUIPlugin.imageDescriptorFromPlugin(
 			FrameworkUtil.getBundle(CAAdapterFactory.class).getSymbolicName(),
 			"platform:/plugin/" + FrameworkUtil.getBundle(CAAdapterFactory.class).getSymbolicName() + "/icons/ca.png"); //$NON-NLS-1$ //$NON-NLS-2$
-
+	
 	/**
 	 * Gets the adapter.
 	 *
@@ -32,14 +32,15 @@
 	 *      java.lang.Class)
 	 */
 	@Override
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		if (this.canAdapt(adapterType) && adaptableObject instanceof CA) {
-			return new TXMResultAdapter() {
+			return adapterType.cast(new TXMResultAdapter() {
+				
 				@Override
 				public ImageDescriptor getImageDescriptor(Object object) {
 					return ICON;
 				}
-			};
+			});
 		}
 		return null;
 	}
Index: tmp/org.txm.referencer.feature/feature.xml
===================================================================
--- tmp/org.txm.referencer.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.referencer.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="Referencer"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       References
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/AnnotationInjector.java
===================================================================
--- tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/AnnotationInjector.java	(revision 3078)
+++ tmp/org.txm.annotation.kr.core/src/org/txm/annotation/kr/core/AnnotationInjector.java	(revision 3079)
@@ -859,8 +859,8 @@
 	
 	public static void main(String[] args) {
 		try {
-			File xmlFile = new File(System.getProperty("user.home"), "TXM-0.8.1/corpora/XMLLINEBREAK/txm/XMLLINEBREAK/test.xml");
-			File outfile = new File(System.getProperty("user.home"), "TXM-0.8.1/corpora/XMLLINEBREAK/txm/XMLLINEBREAK/test-out.xml");
+			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");
 			
 			ArrayList<Annotation> segmentAnnotations = new ArrayList<>();
 			// int starts[] = { 3, 6 };
Index: tmp/org.txm.treetagger.feature/feature.xml
===================================================================
--- tmp/org.txm.treetagger.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.treetagger.feature/feature.xml	(revision 3079)
@@ -68,9 +68,9 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.core" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.core" version="0.8.2" match="greaterOrEqual"/>
       <import plugin="org.txm.treetagger.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
       <import plugin="org.txm.index.rcp" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 
Index: tmp/org.txm.setups/shared/debian/usr/bin/TXM
===================================================================
--- tmp/org.txm.setups/shared/debian/usr/bin/TXM	(revision 3078)
+++ tmp/org.txm.setups/shared/debian/usr/bin/TXM	(revision 3079)
@@ -158,16 +158,7 @@
 #DEBUGOPTIONS="-log -clean -debug -console -noexit"
 ) 1>&3 2>&4
 
-#author: sheiden
-ubuntuubuntuversion=`lsb_release -r | sed -e 's/^Release:\t//g' -e 's/\..*//g'`
 
-# test release number syntax
-if [[ ! "$ubuntuubuntuversion" =~ ^[0-9]+$ ]]
-then
-	echo "** error: wrong release number"
-	exit 1
-fi
-
 #author: sheiden
 ubuntuubuntuversion=`lsb_release -r | sed -e 's/^Release:\t//g' -e 's/\..*//g'`
 
@@ -180,9 +171,9 @@
 
 # test range
 ACTIVATEGTK3=1
-if [ "$ubuntuubuntuversion" -lt 20 ]
-then
-	ACTIVATEGTK3=0
-fi
+#if [ "$ubuntuubuntuversion" -lt 20 ]
+#then
+#	ACTIVATEGTK3=0
+#fi
 
 SWT_GTK3=$ACTIVATEGTK3 UBUNTU_MENUPROXY=0 exec "${TXMINSTALL}/launcher" "$@" -run --launcher.ini "$DOTTXMHOME/launcher.ini" $DEBUGOPTIONS -configuration "$DOTTXMHOME/configuration" -user "$DOTTXMHOME/user" -install "$TXMINSTALL"
Index: tmp/org.txm.cooccurrence.feature/feature.xml
===================================================================
--- tmp/org.txm.cooccurrence.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.cooccurrence.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Cooccurrences
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.libs.javafx.linux/jfxrt.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.libs.javafx.linux/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.libs.javafx.linux/META-INF/MANIFEST.MF	(revision 3078)
+++ tmp/org.txm.libs.javafx.linux/META-INF/MANIFEST.MF	(revision 3079)
@@ -37,7 +37,6 @@
  com.sun.javafx.font.coretext,
  com.sun.javafx.font.directwrite,
  com.sun.javafx.font.freetype,
- com.sun.javafx.font.t2k,
  com.sun.javafx.fxml,
  com.sun.javafx.fxml.builder,
  com.sun.javafx.fxml.expression,
Index: tmp/org.txm.libs.javafx.linux/jfxswt.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.specificities.feature/feature.xml
===================================================================
--- tmp/org.txm.specificities.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.specificities.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="Specificities"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Specificities
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/adapters/AHCAdapterFactory.java
===================================================================
--- tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/adapters/AHCAdapterFactory.java	(revision 3078)
+++ tmp/org.txm.ahc.rcp/src/org/txm/ahc/rcp/adapters/AHCAdapterFactory.java	(revision 3079)
@@ -30,15 +30,15 @@
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
 	 */
 	@Override
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		if (this.canAdapt(adapterType) && adaptableObject instanceof AHC) {
-			return new TXMResultAdapter() {
+			return adapterType.cast(new TXMResultAdapter() {
 				
 				@Override
 				public ImageDescriptor getImageDescriptor(Object object) {
 					return ICON;
 				}
-			};
+			});
 		}
 		return null;
 	}
Index: tmp/org.txm.chartsengine.jfreechart.feature/feature.xml
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.chartsengine.jfreechart.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="JFreeChart"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       JFreeChart chart engine for TXM
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
@@ -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.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
    </requires>
 
    <plugin
Index: tmp/org.txm.queryindex.rcp/src/queryindexrcp/adapters/AdapterFactory.java
===================================================================
--- tmp/org.txm.queryindex.rcp/src/queryindexrcp/adapters/AdapterFactory.java	(revision 3078)
+++ tmp/org.txm.queryindex.rcp/src/queryindexrcp/adapters/AdapterFactory.java	(revision 3079)
@@ -15,32 +15,32 @@
  * @author mdecorde
  */
 public class AdapterFactory implements IAdapterFactory {
-
+	
 	/** The Index adapter. */
 	private IWorkbenchAdapter QueryIndexAdapter = new IWorkbenchAdapter() {
-
+		
 		@Override
 		public Object[] getChildren(Object o) {
 			return new Object[0];
 		}
-
+		
 		@Override
 		public ImageDescriptor getImageDescriptor(Object object) {
 			return AbstractUIPlugin.imageDescriptorFromPlugin(
 					Application.PLUGIN_ID, IImageKeys.QUERYINDEX);
 		}
-
+		
 		@Override
 		public String getLabel(Object o) {
 			return ((QueryIndex) o).getName();
 		}
-
+		
 		@Override
 		public Object getParent(Object o) {
 			return ((QueryIndex) o).getCorpus();
 		}
 	};
-
+	
 	/**
 	 * Gets the adapter.
 	 *
@@ -48,16 +48,16 @@
 	 * @param adapterType the adapter type
 	 * @return the adapter
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
-	 * java.lang.Class)
+	 *      java.lang.Class)
 	 */
 	@Override
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		if (adapterType == IWorkbenchAdapter.class
 				&& adaptableObject instanceof QueryIndex)
-			return QueryIndexAdapter;
+			return adapterType.cast(QueryIndexAdapter);
 		return null;
 	}
-
+	
 	/**
 	 * Gets the adapter list.
 	 *
@@ -65,9 +65,8 @@
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
 	 */
 	@Override
-	@SuppressWarnings("unchecked") //$NON-NLS-1$
-	public Class[] getAdapterList() {
+	public Class<?>[] getAdapterList() {
 		return new Class[] { IWorkbenchAdapter.class };
 	}
-
+	
 }
Index: tmp/org.txm.properties.feature/feature.xml
===================================================================
--- tmp/org.txm.properties.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.properties.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="Properties"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Corpus Properties
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
@@ -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.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
       <import plugin="org.txm.properties.core" version="1.0.0" match="greaterOrEqual"/>
    </requires>
 
Index: tmp/org.txm.translate.feature/feature.xml
===================================================================
--- tmp/org.txm.translate.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.translate.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Translate TXM
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.practically.rcp/src/practicallymacro/model/E4CommandHelper.java
===================================================================
--- tmp/org.txm.practically.rcp/src/practicallymacro/model/E4CommandHelper.java	(revision 3078)
+++ tmp/org.txm.practically.rcp/src/practicallymacro/model/E4CommandHelper.java	(revision 3079)
@@ -11,42 +11,36 @@
 import org.eclipse.ui.PlatformUI;
 
 public class E4CommandHelper {
-	public static void addMCommandToSystem(Command newCommand)
-	{
-		try
-		{
-			IEclipseContext context=(IEclipseContext)PlatformUI.getWorkbench().getAdapter(IEclipseContext.class);
-			Class commandsFactory=Class.forName("org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl");
-			Field instanceField=commandsFactory.getField("INSTANCE");
-			Method createCommand=commandsFactory.getMethod("createCommand");
-			Object implInstance=instanceField.get(null);
-			MCommand anMCommand=(MCommand)createCommand.invoke(implInstance);
-//			MCommand anMCommand=CommandsFactoryImpl.INSTANCE.createCommand();
+	
+	public static void addMCommandToSystem(Command newCommand) {
+		try {
+			IEclipseContext context = PlatformUI.getWorkbench().getAdapter(IEclipseContext.class);
+			Class<?> commandsFactory = Class.forName("org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl");
+			Field instanceField = commandsFactory.getField("INSTANCE");
+			Method createCommand = commandsFactory.getMethod("createCommand");
+			Object implInstance = instanceField.get(null);
+			MCommand anMCommand = (MCommand) createCommand.invoke(implInstance);
+			// MCommand anMCommand=CommandsFactoryImpl.INSTANCE.createCommand();
 			anMCommand.setElementId(newCommand.getId());
-			try
-			{
+			try {
 				anMCommand.setCommandName(newCommand.getName());
 			}
-			catch (Exception e)
-			{
+			catch (Exception e) {
 				e.printStackTrace();
 			}
-			MApplication app=context.get(MApplication.class);
-			List<MCommand> allCommands=app.getCommands();
-			boolean commandExists=false;
-			for (MCommand mcommand : allCommands)
-			{
-				if (mcommand.getElementId().equals(newCommand.getId()))
-				{
-					commandExists=true;
+			MApplication app = context.get(MApplication.class);
+			List<MCommand> allCommands = app.getCommands();
+			boolean commandExists = false;
+			for (MCommand mcommand : allCommands) {
+				if (mcommand.getElementId().equals(newCommand.getId())) {
+					commandExists = true;
 					break;
 				}
 			}
 			if (!commandExists)
 				allCommands.add(anMCommand);
 		}
-		catch (Exception e)
-		{
+		catch (Exception e) {
 			e.printStackTrace();
 		}
 		
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/adapters/CooccurrenceAdapterFactory.java
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/adapters/CooccurrenceAdapterFactory.java	(revision 3078)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/adapters/CooccurrenceAdapterFactory.java	(revision 3079)
@@ -12,30 +12,30 @@
 
 /**
  * A factory for creating Adapter objects.
- *  
+ * 
  * @author mdecorde
  * @author sjacquot
  */
 public class CooccurrenceAdapterFactory extends TXMResultAdapterFactory {
-
 	
-	public static final ImageDescriptor ICON =
-			AbstractUIPlugin.imageDescriptorFromPlugin(FrameworkUtil.getBundle(CooccurrenceAdapterFactory.class).getSymbolicName(),
-					"platform:/plugin/"+ FrameworkUtil.getBundle(CooccurrenceAdapterFactory.class).getSymbolicName() + "/icons/cooccurrences.png"); //$NON-NLS-1$ //$NON-NLS-2$
 	
-
+	public static final ImageDescriptor ICON = AbstractUIPlugin.imageDescriptorFromPlugin(FrameworkUtil.getBundle(CooccurrenceAdapterFactory.class).getSymbolicName(),
+			"platform:/plugin/" + FrameworkUtil.getBundle(CooccurrenceAdapterFactory.class).getSymbolicName() + "/icons/cooccurrences.png"); //$NON-NLS-1$ //$NON-NLS-2$
+	
+	
 	@Override
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if(this.canAdapt(adapterType) && adaptableObject instanceof Cooccurrence)	{
-			return new TXMResultAdapter() {
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+		if (this.canAdapt(adapterType) && adaptableObject instanceof Cooccurrence) {
+			return adapterType.cast(new TXMResultAdapter() {
+				
 				@Override
 				public ImageDescriptor getImageDescriptor(Object object) {
 					return ICON;
 				}
-			};
+			});
 		}
 		return null;
 	}
-
-
+	
+	
 }
Index: tmp/org.txm.partition.feature/feature.xml
===================================================================
--- tmp/org.txm.partition.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.partition.feature/feature.xml	(revision 3079)
@@ -5,14 +5,14 @@
       version="1.0.0.qualifier"
       provider-name="Textometrie.org"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Partition
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.libs.javafx/jfxswt.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.rcp.feature/feature.properties
===================================================================
--- tmp/org.txm.rcp.feature/feature.properties	(revision 3078)
+++ tmp/org.txm.rcp.feature/feature.properties	(revision 3079)
@@ -1,2 +1,2 @@
 description = \
-TXM 0.8.1 - main commands
\ No newline at end of file
+TXM 0.8.2 - main commands
\ No newline at end of file
Index: tmp/org.txm.rcp.feature/feature.xml
===================================================================
--- tmp/org.txm.rcp.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.rcp.feature/feature.xml	(revision 3079)
@@ -2,16 +2,16 @@
 <feature
       id="org.txm.rcp.feature"
       label="TXM RCP"
-      version="0.8.1.qualifier"
+      version="0.8.2.qualifier"
       provider-name="Textometrie.org"
       plugin="org.txm.rcp">
 
-   <description url="https://gitlab.huma-num.fr/txm/textometrie/files/software/TXM/0.8.1">
+   <description url="https://gitlab.huma-num.fr/txm/textometrie/files/software/TXM/0.8.2">
       %description
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
@@ -255,7 +255,7 @@
       <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.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
    </requires>
 
    <plugin
Index: tmp/org.txm.rcp.feature/feature_fr.properties
===================================================================
--- tmp/org.txm.rcp.feature/feature_fr.properties	(revision 3078)
+++ tmp/org.txm.rcp.feature/feature_fr.properties	(revision 3079)
@@ -1,2 +1,2 @@
 description = \
-TXM 0.8.1 - commandes principales
\ No newline at end of file
+TXM 0.8.2 - commandes principales
\ No newline at end of file
Index: tmp/org.txm.core/src/java/org/txm/utils/BundleUtils.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/utils/BundleUtils.java	(revision 3078)
+++ tmp/org.txm.core/src/java/org/txm/utils/BundleUtils.java	(revision 3079)
@@ -17,8 +17,8 @@
 import org.txm.utils.zip.Zip;
 
 public class BundleUtils {
-
-//	protected static File INSTALLDIR = new File(System.getProperty("eclipse.launcher")).getParentFile().getParentFile();
+	
+	// protected static File INSTALLDIR = new File(System.getProperty("eclipse.launcher")).getParentFile().getParentFile();
 	/**
 	 * 
 	 * @param bundle_id the Bundle ID
@@ -27,13 +27,13 @@
 	public static Version getBundleVersion(String bundle_id) {
 		Bundle bundle = Platform.getBundle(bundle_id);
 		if (bundle == null) {
-			//System.out.println("Error while initializing "+bundle_id+" plugin: bundle not found.");
+			// System.out.println("Error while initializing "+bundle_id+" plugin: bundle not found.");
 			return null;
 		}
 		return bundle.getVersion();
 	}
 	
-	public static Bundle getBundle(Class clazz) {
+	public static Bundle getBundle(Class<?> clazz) {
 		return FrameworkUtil.getBundle(clazz);
 	}
 	
@@ -41,7 +41,7 @@
 		return Platform.getBundle(bundle_id);
 	}
 	
-	public static String getBundleId(Class clazz) {
+	public static String getBundleId(Class<?> clazz) {
 		return getBundle(clazz).getSymbolicName();
 	}
 	
@@ -57,12 +57,13 @@
 		}
 		try {
 			return FileLocator.getBundleFile(bundle).getAbsolutePath();
-		} catch (IOException e) {
+		}
+		catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
-			return "error path "+bundle_id;
+			return "error path " + bundle_id;
 		}
-		//return bundle.getLocation();
+		// return bundle.getLocation();
 	}
 	
 	/**
@@ -77,44 +78,45 @@
 		}
 		try {
 			return FileLocator.getBundleFile(bundle).getAbsoluteFile();
-		} catch (IOException e) {
+		}
+		catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			return null;
 		}
-		//return bundle.getLocation();
+		// return bundle.getLocation();
 	}
 	
-//	/**
-//	 * 
-//	 * @param bundle_id the Bundle ID
-//	 * @return the absolute File to the bundle directory. The File is a directory or a file.
-//	 */
-//	public static File getBundleFile(String bundle_id) {
-//		Log.info("Retrieving file_path from "+bundle_id+" plugin.");
-//		Bundle bundle = Platform.getBundle(bundle_id);
-//		if (bundle == null) {
-//			System.out.println("Error while initializing '"+bundle_id+"' plugin: bundle not found.");
-//			return null;
-//		}
-//		String bundleLocation = bundle.getLocation();
-//		String eclipseHomeLocation = System.getProperty("eclipse.home.location");
-//	
-//		int idx = bundleLocation.lastIndexOf(":");
-//		if (idx > 0) bundleLocation = bundleLocation.substring(idx + 1);
-//		
-//		idx = eclipseHomeLocation.indexOf("file:");
-//		if (idx == 0) eclipseHomeLocation = eclipseHomeLocation.substring(5);
-//		
-//		File bundleDir = new File(bundleLocation);
-//		if (bundleLocation.startsWith("/")) {
-//			bundleDir = new File(bundleLocation);
-//		} else {
-//			bundleDir = new File(eclipseHomeLocation, bundleLocation);
-//		}
-//		
-//		return bundleDir;
-//	}
+	// /**
+	// *
+	// * @param bundle_id the Bundle ID
+	// * @return the absolute File to the bundle directory. The File is a directory or a file.
+	// */
+	// public static File getBundleFile(String bundle_id) {
+	// Log.info("Retrieving file_path from "+bundle_id+" plugin.");
+	// Bundle bundle = Platform.getBundle(bundle_id);
+	// if (bundle == null) {
+	// System.out.println("Error while initializing '"+bundle_id+"' plugin: bundle not found.");
+	// return null;
+	// }
+	// String bundleLocation = bundle.getLocation();
+	// String eclipseHomeLocation = System.getProperty("eclipse.home.location");
+	//
+	// int idx = bundleLocation.lastIndexOf(":");
+	// if (idx > 0) bundleLocation = bundleLocation.substring(idx + 1);
+	//
+	// idx = eclipseHomeLocation.indexOf("file:");
+	// if (idx == 0) eclipseHomeLocation = eclipseHomeLocation.substring(5);
+	//
+	// File bundleDir = new File(bundleLocation);
+	// if (bundleLocation.startsWith("/")) {
+	// bundleDir = new File(bundleLocation);
+	// } else {
+	// bundleDir = new File(eclipseHomeLocation, bundleLocation);
+	// }
+	//
+	// return bundleDir;
+	// }
 	
 	/**
 	 * Copy a file from the bundle directory or Jar to @outputDirectory
@@ -135,46 +137,48 @@
 		
 		File bundleDir = getBundleFile(bundle_id);
 		File outfile = new File(outputDirectory, file_name);
-
+		
 		if (bundleDir.isDirectory()) { // TXM is run from Eclipse or we've decided to ship the Toolbox plugin in a directory
-			File fileInToolbox = new File(bundleDir, file_path+file_name);
+			File fileInToolbox = new File(bundleDir, file_path + file_name);
 			if (!fileInToolbox.exists()) { // maybe run from Eclipse, then add the relative directory
-				fileInToolbox = new File(bundleDir, source_relative_directory+file_path+file_name);
+				fileInToolbox = new File(bundleDir, source_relative_directory + file_path + file_name);
 			}
 			try {
 				if (fileInToolbox.isDirectory())
 					FileCopy.copyFiles(fileInToolbox, outfile);
-				else 
+				else
 					FileCopy.copy(fileInToolbox, outfile);
-			} catch (IOException e) {
-				System.out.println("Copy of ressource script failed: "+e); 
+			}
+			catch (IOException e) {
+				System.out.println("Copy of ressource script failed: " + e);
 				Log.printStackTrace(e);
 				return false;
 			}
-		} else { // jar file
-//			if (!bundleDir.exists()) { // get from the installed Toolbox
-//				bundleDir = new File(INSTALLDIR, "TXM/"+bundleLocation);
-//			}
-
-			if (!Zip.extractOneFile(bundleDir, file_path+file_name, outfile, false)) {
-				System.out.println("Extraction of ressource failed from "+bundleDir+" with path "+file_path+file_name);
+		}
+		else { // jar file
+				 // if (!bundleDir.exists()) { // get from the installed Toolbox
+				 // bundleDir = new File(INSTALLDIR, "TXM/"+bundleLocation);
+				 // }
+			
+			if (!Zip.extractOneFile(bundleDir, file_path + file_name, outfile, false)) {
+				System.out.println("Extraction of ressource failed from " + bundleDir + " with path " + file_path + file_name);
 				return false;
 			}
 		}
 		return true;
 	}
-
+	
 	public static boolean replaceFilesIfNewer(String bundle_id, String source_relative_directory, String file_path, String file_name, File fileToReplace) {
 		if (!source_relative_directory.endsWith("/")) source_relative_directory += "/";
 		if (!file_path.endsWith("/")) file_path += "/";
 		
 		File bundleDir = getBundleFile(bundle_id);
-//		String bundleLocation = getBundleLocation(bundle_id);
-
+		// String bundleLocation = getBundleLocation(bundle_id);
+		
 		if (bundleDir.isDirectory()) { // TXM is run from Eclipse or we've decided to ship the Toolbox plugin in a directory
-			File fileInToolbox = new File(bundleDir, file_path+file_name);
+			File fileInToolbox = new File(bundleDir, file_path + file_name);
 			if (!fileInToolbox.exists()) { // TXM may be run from Eclipse, then add the source relative directory
-				fileInToolbox = new File(bundleDir, source_relative_directory+file_path+file_name);
+				fileInToolbox = new File(bundleDir, source_relative_directory + file_path + file_name);
 			}
 			
 			if (!fileInToolbox.exists()) {
@@ -188,26 +192,29 @@
 			try {
 				if (fileInToolbox.isDirectory()) {
 					FileCopy.copyFiles(fileInToolbox, fileToReplace);
-				} else { 
+				}
+				else {
 					FileCopy.copy(fileInToolbox, fileToReplace);
 				}
-			} catch (IOException e) {
-				System.out.println("Copy of ressource script failed: "+e); 
+			}
+			catch (IOException e) {
+				System.out.println("Copy of ressource script failed: " + e);
 				Log.printStackTrace(e);
 				return false;
 			}
-		} else { // jar file
-//			if (!bundleDir.exists()) { // get from the installed Toolbox
-//				bundleDir = new File(INSTALLDIR, "TXM/"+bundleLocation);
-//			}
-
-			if (!Zip.extractOneFile(bundleDir, file_path+file_name, fileToReplace, true)) {
-				System.out.println("Extraction of ressource failed from "+bundleDir+" with path "+file_path+file_name);
+		}
+		else { // jar file
+				 // if (!bundleDir.exists()) { // get from the installed Toolbox
+				 // bundleDir = new File(INSTALLDIR, "TXM/"+bundleLocation);
+				 // }
+			
+			if (!Zip.extractOneFile(bundleDir, file_path + file_name, fileToReplace, true)) {
+				System.out.println("Extraction of ressource failed from " + bundleDir + " with path " + file_path + file_name);
 				return false;
 			}
 		}
 		return true;
-
+		
 	}
 	
 	/**
@@ -225,17 +232,18 @@
 		if (path.startsWith("file:")) {
 			if (OSDetector.isFamilyWindows()) {
 				path = path.substring(6); // file://C:/ ...
-			} else {
+			}
+			else {
 				path = path.substring(5); // file://home/ ...
 			}
 		}
 		return path;
 	}
-
+	
 	public static ClassLoader getLoader(String bundle_id) {
 		Bundle bundle = Platform.getBundle(bundle_id);
 		if (bundle == null) {
-			System.out.println("Error while initializing '"+bundle_id+"' plugin: bundle not found.");
+			System.out.println("Error while initializing '" + bundle_id + "' plugin: bundle not found.");
 			return null;
 		}
 		
Index: tmp/org.txm.core/src/java/org/txm/scripts/importer/MileStoneProjection.groovy
===================================================================
--- tmp/org.txm.core/src/java/org/txm/scripts/importer/MileStoneProjection.groovy	(revision 3078)
+++ tmp/org.txm.core/src/java/org/txm/scripts/importer/MileStoneProjection.groovy	(revision 3079)
@@ -104,8 +104,8 @@
 	}
 	
 	public static void main(String[] args) {
-		File inputFile = new File(System.getProperty("user.home"), "TXM-0.8.1/corpora/XTZMILESTONES/tokenized/test.xml")
-		File outputFile = new File(System.getProperty("user.home"), "TXM-0.8.1/corpora/XTZMILESTONES/tokenized/result.xml")
+		File inputFile = new File(System.getProperty("user.home"), "TXM-0.8.2/corpora/XTZMILESTONES/tokenized/test.xml")
+		File outputFile = new File(System.getProperty("user.home"), "TXM-0.8.2/corpora/XTZMILESTONES/tokenized/result.xml")
 		
 		MileStoneProjection msp = new MileStoneProjection(inputFile, "text", "w", "lb");
 		println "Sucess: "+msp.process(outputFile)
Index: tmp/org.txm.core/src/java/org/txm/core/engines/EnginesManager.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/engines/EnginesManager.java	(revision 3078)
+++ tmp/org.txm.core/src/java/org/txm/core/engines/EnginesManager.java	(revision 3079)
@@ -244,7 +244,7 @@
 	 * @return the installed engine according to its class type if it exists
 	 *         otherwise null
 	 */
-	public T getEngine(Class classType) {
+	public T getEngine(Class<?> classType) {
 		T engine = null;
 		for (T engine2 : this.values()) {
 			if (engine2.getClass().equals(classType)) {
Index: tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java	(revision 3078)
+++ tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java	(revision 3079)
@@ -1906,7 +1906,7 @@
 	 * 
 	 * @return a message indicating the start of computing
 	 */
-	// FIXME: SJ: this method must become abstract in TXM 0.8.1 and implemented by subclasses
+	// FIXME: SJ: this method must become abstract in TXM 0.8.2 and implemented by subclasses
 	public String getComputingStartMessage() {
 		return NLS.bind("Computing {0}...", this.getClass().getSimpleName());
 	}
@@ -1919,7 +1919,7 @@
 	 * 
 	 * @return a message indicating the computing is done
 	 */
-	// FIXME: SJ: this method must become abstract in TXM0.8.1 and implemented by subclasses
+	// FIXME: SJ: this method must become abstract in TXM0.8.2 and implemented by subclasses
 	public String getComputingDoneMessage() {
 		return TXMCoreMessages.common_done;
 	}
Index: tmp/org.txm.tigersearch.feature/feature.xml
===================================================================
--- tmp/org.txm.tigersearch.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.tigersearch.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="TIGERSearch"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Enable TIGERSearch search, indexes and concordances within TXM
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
Index: tmp/org.txm.cql2lsa.feature/feature.xml
===================================================================
--- tmp/org.txm.cql2lsa.feature/feature.xml	(revision 3078)
+++ tmp/org.txm.cql2lsa.feature/feature.xml	(revision 3079)
@@ -4,14 +4,14 @@
       label="CQL2LSA"
       version="1.0.0.qualifier"
       license-feature="org.txm.rcp.feature"
-      license-feature-version="0.8.1.qualifier">
+      license-feature-version="0.8.2.qualifier">
 
    <description url="http://www.example.com/description">
       Commands for LSA computations
    </description>
 
    <copyright url="http://www.example.com/copyright">
-      TXM 0.8.1
+      TXM 0.8.2
 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
@@ -37,7 +37,7 @@
    </license>
 
    <requires>
-      <import plugin="org.txm.rcp" version="0.8.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.rcp" version="0.8.2" match="greaterOrEqual"/>
    </requires>
 
    <plugin
