Index: tmp/org.txm.statsengine.r.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.statsengine.r.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.statsengine.r.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,14 +4,29 @@
 Bundle-SymbolicName: org.txm.statsengine.r.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.lexicaltable.core;bundle-version="1.0.0",
+Require-Bundle: org.eclipse.ui;bundle-version="3.106.1",
+ org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.jface.text;bundle-version="3.9.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.ui.console;bundle-version="3.5.300",
+ org.eclipse.ui.ide;bundle-version="3.10.2",
+ org.txm.index.core;bundle-version="1.0.0",
+ org.txm.concordance.core;bundle-version="1.0.0",
+ org.txm.lexicaltable.core;bundle-version="1.0.0",
+ org.txm.ca.core;bundle-version="1.0.0",
+ org.txm.lexicon.core;bundle-version="1.0.0",
+ org.txm.specificities.core;bundle-version="1.0.0",
+ org.txm.progression.core;bundle-version="1.0.0",
+ org.txm.cah.core;bundle-version="1.0.0",
+ org.txm.cooccurrence.core;bundle-version="1.0.0",
+ org.txm.searchengine.core;bundle-version="1.0.0",
+ org.txm.referencer.core;bundle-version="1.0.0",
  org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.statsengine.core;bundle-version="1.0.0",
  org.txm.core;bundle-version="0.7.0",
- org.eclipse.core.runtime;bundle-version="3.10.0",
- org.eclipse.ui;bundle-version="3.106.1",
- org.txm.rcp;bundle-version="0.7.8",
- org.txm.searchengine.core;bundle-version="1.0.0",
- org.txm.searchengine.cqp.core;bundle-version="1.1.0"
+ org.txm.rcp;bundle-version="0.7.8"
 Export-Package: org.txm.statsengine.r.rcp.handlers,
  org.txm.statsengine.r.rcp.messages,
  org.txm.statsengine.r.rcp.perspectives,
Index: tmp/org.txm.chartsengine.jfreechart.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.chartsengine.jfreechart.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,14 +4,16 @@
 Bundle-SymbolicName: org.txm.chartsengine.jfreechart.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.core;bundle-version="0.7.0",
+Require-Bundle: org.eclipse.core.expressions;bundle-version="3.4.600",
+ org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.ui;bundle-version="3.106.1",
+ org.txm.ca.core;bundle-version="1.0.0",
+ org.txm.core;bundle-version="0.7.0",
  org.txm.libs.jfreechart,
  org.txm.chartsengine.core,
- org.txm.chartsengine.rcp;bundle-version="1.0.0";visibility:=reexport,
- org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.rcp;bundle-version="0.7.8",
- org.eclipse.core.runtime;bundle-version="3.10.0",
- org.eclipse.core.expressions;bundle-version="3.4.600"
+ org.txm.chartsengine.rcp;bundle-version="1.0.0",
+ org.txm.rcp;bundle-version="0.7.8"
 Export-Package: org.txm.chartsengine.jfreechart.rcp,
  org.txm.chartsengine.jfreechart.rcp.events,
  org.txm.chartsengine.jfreechart.rcp.preferences,
Index: tmp/org.txm.ca.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.ca.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.ca.core/META-INF/MANIFEST.MF	(revision 452)
@@ -4,13 +4,14 @@
 Bundle-SymbolicName: org.txm.ca.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.statsengine.core;bundle-version="1.0.0",
+Require-Bundle: org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.txm.statsengine.core;bundle-version="1.0.0",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.utils;bundle-version="1.0.0",
  org.txm.core;bundle-version="0.7.0",
- org.eclipse.core.runtime;bundle-version="3.10.0",
  org.txm.chartsengine.r.core;bundle-version="1.0.0",
  org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
  org.txm.lexicaltable.core,
- org.txm.statsengine.r.core;bundle-version="1.0.0",
  org.txm.searchengine.core;bundle-version="1.0.0",
  org.txm.searchengine.cqp.core;bundle-version="1.1.0"
 Export-Package: org.txm.ca.core.chartsengine.base,
Index: tmp/org.txm.para.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.para.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.para.core/META-INF/MANIFEST.MF	(revision 452)
@@ -4,10 +4,13 @@
 Bundle-SymbolicName: org.txm.para.core
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.txm.para.core.Activator
-Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+Require-Bundle: org.txm.libs.groovy-all;bundle-version="2.3.3",
+ org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
  org.txm.core;bundle-version="0.7.0",
  org.eclipse.ui,
- org.eclipse.core.runtime,
  org.txm.searchengine.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
Index: tmp/org.txm.statsengine.r.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.statsengine.r.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.statsengine.r.core/META-INF/MANIFEST.MF	(revision 452)
@@ -3,12 +3,13 @@
 Bundle-Name: R Statistics Engine Core
 Bundle-SymbolicName: org.txm.statsengine.r.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.osgi,
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi,
+ org.eclipse.core.runtime,
+ org.txm.statsengine.core;bundle-version="1.0.0";visibility:=reexport,
  org.txm.libs.colt;bundle-version="1.0.0";visibility:=reexport,
  org.txm.libs.rserve;bundle-version="0.0.0";visibility:=reexport,
- org.txm.statsengine.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.core;bundle-version="0.7.0",
- org.eclipse.core.runtime
+ org.txm.core;bundle-version="0.7.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.txm.statsengine.r.core,
  org.txm.statsengine.r.core.data,
Index: tmp/org.txm.cah.rcp/src/org/txm/cah/rcp/handlers/ComputeCAH.java
===================================================================
--- tmp/org.txm.cah.rcp/src/org/txm/cah/rcp/handlers/ComputeCAH.java	(revision 451)
+++ tmp/org.txm.cah.rcp/src/org/txm/cah/rcp/handlers/ComputeCAH.java	(revision 452)
@@ -30,7 +30,6 @@
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
@@ -41,7 +40,6 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.ui.handlers.HandlerUtil;
 import org.txm.ca.core.functions.CA;
 import org.txm.ca.core.preferences.CAPreferences;
 import org.txm.cah.core.functions.CAH;
@@ -56,7 +54,6 @@
 import org.txm.lexicaltable.core.functions.LexicalTableFactory;
 import org.txm.lexicaltable.rcp.editors.LexicalTableDialog;
 import org.txm.rcp.handlers.BaseAbstractHandler;
-import org.txm.rcp.TxmPreferences;
 import org.txm.rcp.views.corpora.CorporaView;
 import org.txm.searchengine.cqp.corpus.Partition;
 import org.txm.searchengine.cqp.corpus.Property;
Index: tmp/org.txm.cah.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.cah.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.cah.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -9,16 +9,20 @@
  org.txm.cah.rcp.handlers,
  org.txm.cah.rcp.messages,
  org.txm.cah.rcp.preferences
-Require-Bundle: org.txm.lexicaltable.core;bundle-version="1.0.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi,
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.ui;bundle-version="3.106.1",
+ org.txm.statsengine.r.rcp;bundle-version="1.0.0",
+ org.txm.lexicaltable.rcp;bundle-version="1.0.0",
+ org.txm.statsengine.core;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.ca.core,
+ org.txm.lexicaltable.core;bundle-version="1.0.0",
  org.txm.cah.core;bundle-version="1.0.0",
  org.txm.chartsengine.rcp;bundle-version="1.0.0",
  org.txm.core;bundle-version="0.7.0",
  org.txm.rcp;bundle-version="0.7.8",
- org.eclipse.ui;bundle-version="3.106.1",
- org.eclipse.core.runtime;bundle-version="3.10.0",
- org.txm.ca.core,
- org.txm.lexicaltable.rcp;bundle-version="1.0.0",
  org.eclipse.core.expressions;bundle-version="3.4.600",
- org.txm.searchengine.core;bundle-version="1.0.0",
- org.txm.searchengine.cqp.core;bundle-version="1.1.0"
+ org.txm.searchengine.core;bundle-version="1.0.0"
 Bundle-Vendor: Textometrie.org
Index: tmp/org.txm.lexicaltable.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.lexicaltable.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.lexicaltable.core/META-INF/MANIFEST.MF	(revision 452)
@@ -3,12 +3,15 @@
 Bundle-Name: Lexical Table Core
 Bundle-SymbolicName: org.txm.lexicaltable.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.txm.statsengine.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.statsengine.r.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.core;bundle-version="0.7.0";visibility:=reexport,
- org.eclipse.core.runtime;visibility:=reexport,
- org.txm.index.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.lexicon.core;bundle-version="1.0.0";visibility:=reexport
+Require-Bundle: org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.utils;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.statsengine.core;bundle-version="1.0.0",
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.txm.core;bundle-version="0.7.0",
+ org.txm.index.core;bundle-version="1.0.0",
+ org.txm.lexicon.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.txm.functions.intertextualdistance,
Index: tmp/org.txm.lexicaltable.core/src/org/txm/functions/intertextualdistance/InterTextDistance.java
===================================================================
--- tmp/org.txm.lexicaltable.core/src/org/txm/functions/intertextualdistance/InterTextDistance.java	(revision 451)
+++ tmp/org.txm.lexicaltable.core/src/org/txm/functions/intertextualdistance/InterTextDistance.java	(revision 452)
@@ -13,6 +13,7 @@
 import org.txm.searchengine.cqp.clientExceptions.InvalidCqpIdException;
 import org.txm.statsengine.core.StatException;
 import org.txm.statsengine.r.core.RWorkspace;
+import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
 
 public class InterTextDistance extends TXMCommand {
 	
@@ -22,29 +23,42 @@
 	public InterTextDistance(ILexicalTable table) {
 		this.table = table;
 	}
-	public boolean compute() throws CqiClientException, InvalidCqpIdException, REXPMismatchException, StatException {
-//		Corpus corpus = CorpusManager.getCorpusManager().getCorpus("VOEUX");
-//		String method = "euclidean"; // "euclidean"’, ‘"maximum"’, ‘"manhattan"’, ‘"canberra"’, ‘"binary"’ or ‘"minkowski"’
-//
-//		StructuralUnit text_su = corpus.getStructuralUnit("text");
-//		StructuralUnitProperty text_prop = text_su.getProperty("loc");
-//		Partition textes = corpus.createPartition(text_su, text_prop);
-//
-//		Property prop = corpus.getProperty("word") ;
-		//LexicalTable table = textes.getLexicalTable(prop, 2);
-
-		System.out.println(table.getSymbol()); // LexicalTable41
-
-		RWorkspace r = RWorkspace.getRWorkspaceInstance() ;	// get the R connection
-		REXP rresult = r.eval("as.matrix(dist(t("+table.getSymbol()+"), method=\"euclidian\"))"); //$NON-NLS-1$ //$NON-NLS-2$
-		double[][] result = rresult.asDoubleMatrix();
-		
-		for (int i = 0 ; i < result.length ; i++) {
-			for (int j = 0; j < result[i].length ; j++) {
-				System.out.print(" "+result[i][j]); //$NON-NLS-1$
+	
+	
+	@Override
+	public boolean compute() {
+try {
+	//		Corpus corpus = CorpusManager.getCorpusManager().getCorpus("VOEUX");
+	//		String method = "euclidean"; // "euclidean"’, ‘"maximum"’, ‘"manhattan"’, ‘"canberra"’, ‘"binary"’ or ‘"minkowski"’
+	//
+	//		StructuralUnit text_su = corpus.getStructuralUnit("text");
+	//		StructuralUnitProperty text_prop = text_su.getProperty("loc");
+	//		Partition textes = corpus.createPartition(text_su, text_prop);
+	//
+	//		Property prop = corpus.getProperty("word") ;
+			//LexicalTable table = textes.getLexicalTable(prop, 2);
+	
+			System.out.println(table.getSymbol()); // LexicalTable41
+	
+			RWorkspace r = RWorkspace.getRWorkspaceInstance() ;	// get the R connection
+			REXP rresult = r.eval("as.matrix(dist(t("+table.getSymbol()+"), method=\"euclidian\"))"); //$NON-NLS-1$ //$NON-NLS-2$
+			double[][] result = rresult.asDoubleMatrix();
+			
+			for (int i = 0 ; i < result.length ; i++) {
+				for (int j = 0; j < result[i].length ; j++) {
+					System.out.print(" "+result[i][j]); //$NON-NLS-1$
+				}
+				System.out.println();
 			}
-			System.out.println();
-		}
+}
+catch(RWorkspaceException e) {
+	// TODO Auto-generated catch block
+	e.printStackTrace();
+}
+catch(REXPMismatchException e) {
+	// TODO Auto-generated catch block
+	e.printStackTrace();
+}
 		return true;
 	}
 	
Index: tmp/org.txm.lexicon.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.lexicon.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.lexicon.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,14 +4,15 @@
 Bundle-SymbolicName: org.txm.lexicon.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.core;bundle-version="0.7.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.txm.core;bundle-version="0.7.0",
+ org.eclipse.ui;bundle-version="3.106.1",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
  org.txm.lexicon.core;bundle-version="1.0.0",
  org.txm.index.core;bundle-version="1.0.0",
  org.txm.index.rcp;bundle-version="1.0.0",
- org.eclipse.jface,
  org.txm.rcp;bundle-version="0.7.8",
- org.eclipse.ui;bundle-version="3.106.1",
- org.eclipse.core.runtime;bundle-version="3.10.0",
  org.eclipse.core.expressions;bundle-version="3.4.600"
 Export-Package: org.txm.lexicon.rcp.adapters,
  org.txm.lexicon.rcp.editors,
Index: tmp/org.txm.rcp/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- tmp/org.txm.rcp/.settings/org.eclipse.jdt.core.prefs	(revision 451)
+++ tmp/org.txm.rcp/.settings/org.eclipse.jdt.core.prefs	(revision 452)
@@ -1,7 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.6
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/TXMResultContentProvider.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/TXMResultContentProvider.java	(revision 451)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/views/corpora/TXMResultContentProvider.java	(revision 452)
@@ -37,7 +37,7 @@
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.txm.core.results.ITXMResult;
+import org.txm.core.results.TXMResult;
 import org.txm.objects.Base;
 import org.txm.objects.Project;
 import org.txm.searchengine.cqp.corpus.Corpus;
@@ -102,7 +102,7 @@
 			Project p = (Project) element;
 			
 			for (Base b : p.getBases()) {
-				for (ITXMResult o : b.getResults(MainCorpus.class)) {
+				for (TXMResult o : b.getResults(MainCorpus.class)) {
 					elements.add((MainCorpus)o);
 				}
 			}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/link/IndexToCooccurrence.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/link/IndexToCooccurrence.java	(revision 451)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/commands/link/IndexToCooccurrence.java	(revision 452)
@@ -51,6 +51,7 @@
  * use the lines of a index to compute a concordance 
  * @author mdecorde.
  */
+// FIXME: should call the ComputeCooccurrence command with some parameters
 public class IndexToCooccurrence extends AbstractHandler {
 
 	/* (non-Javadoc)
Index: tmp/org.txm.wordcloud.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.wordcloud.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.wordcloud.core/META-INF/MANIFEST.MF	(revision 452)
@@ -4,11 +4,15 @@
 Bundle-SymbolicName: org.txm.wordcloud.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.statsengine.r.core;bundle-version="1.0.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
+ org.txm.chartsengine.core;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.statsengine.core;bundle-version="1.0.0",
+ org.txm.chartsengine.r.core;bundle-version="1.0.0",
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.10.0",
  org.txm.core;bundle-version="0.7.0",
- org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
- org.txm.chartsengine.r.core;bundle-version="1.0.0",
  org.txm.index.core;bundle-version="1.0.0",
  org.txm.lexicon.core
 Export-Package: org.txm.wordcloud.core.chartsengine.jfreechart,
Index: tmp/org.txm.chartsengine.raster.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.chartsengine.raster.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.chartsengine.raster.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,8 +4,11 @@
 Bundle-SymbolicName: org.txm.chartsengine.raster.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.core,
- org.txm.chartsengine.rcp;bundle-version="1.0.0";visibility:=reexport,
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.ui;bundle-version="3.106.1",
+ org.txm.core,
+ org.txm.chartsengine.core;bundle-version="1.0.0",
+ org.txm.chartsengine.rcp;bundle-version="1.0.0",
  org.txm.rcp;bundle-version="0.7.8"
 Bundle-Vendor: Textometrie.org
 Export-Package: org.txm.chartsengine.raster.rcp,
Index: tmp/org.txm.cooccurrence.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.cooccurrence.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.cooccurrence.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -9,13 +9,16 @@
  org.txm.cooccurrence.rcp.handlers,
  org.txm.cooccurrence.rcp.messages,
  org.txm.cooccurrence.rcp.preferences
-Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+Require-Bundle: org.txm.utils,
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
  org.txm.cooccurrence.core;bundle-version="1.0.0",
  org.txm.concordance.core;bundle-version="1.0.0",
+ org.txm.statsengine.r.rcp;bundle-version="1.0.0",
  org.eclipse.ui;bundle-version="3.106.1",
  org.txm.core,
  org.txm.rcp,
- org.eclipse.core.runtime;bundle-version="3.10.0",
  org.eclipse.core.expressions;bundle-version="3.4.600",
  org.txm.searchengine.core;bundle-version="1.0.0"
 Bundle-Vendor: Textometrie.org
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java	(revision 451)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java	(revision 452)
@@ -175,44 +175,10 @@
 	/** The query. */
 	private Query query;
 	
-	/** The properties. */
-//	private List<Property> properties;
-//	
-//	/** The structure. */
-//	private StructuralUnit structure;
-//	
-//	/** The leftmin. */
-//	private int leftmin;
-//	
-//	/** The leftmax. */
-//	private int leftmax;
-//	
-//	/** The rightmin. */
-//	private int rightmin;
-//	
-//	/** The rightmax. */
-//	private int rightmax;
-//	
-//	/** The minfreq. */
-//	private int minfreq;
-//	
-//	/** The mincount. */
-//	private int mincount;
-//	
-//	/** The minscore. */
-//	private double minscore;
 
 	/** The scroll composite. */
 	private ScrolledComposite scrollComposite;
 
-	/** The include xpivot. */
-//	private boolean includeXpivot;
-	
-	private boolean buildLexicalTableWithCooccurrents;
-
-	/** The source. */
-//	private Object source;
-
 	/**
 	 * Instantiates a new cooccurrences editor.
 	 */
@@ -233,21 +199,9 @@
 	@Override
 	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
 		super.init(site, input);
-		
 
-//		if (((TXMResultEditorInput) input).getResult() != null)
-//		{
-			this.cooc = (Cooccurrence) ((TXMResultEditorInput) input).getResult();
-			this.corpus = cooc.getCorpus();
-			//this.query = cooc.getQuery();
-			//FIXME: deprecated
-			//setPartName(cooc.getCorpus().getName()+": "+cooc.getName()); //$NON-NLS-1$
-//		}
-//		else	{
-//			this.corpus = (Corpus) ((TXMResultEditorInput) input).getSource();
-//			this.query = new Query("");
-//		}
-		
+		this.cooc = (Cooccurrence) ((TXMResultEditorInput) input).getResult();
+		this.corpus = cooc.getCorpus();
 	}
 
 	/**
@@ -259,6 +213,7 @@
 	@Override
 	public void createPartControl(final Composite parent) {
 		
+		// FIXME: to do
 		//super.createPartControl(parent);
 		
 		FormLayout parentLayout = new FormLayout();
@@ -632,7 +587,7 @@
 		parameters.put(CooccurrencePreferences.MIN_FREQ, this.TFreq.getSelection());
 		parameters.put(CooccurrencePreferences.MIN_COUNT, this.TCount.getSelection());
 		parameters.put(CooccurrencePreferences.INCLUDE_X_PIVOT, this.empantPanel.getXPivot());
-		parameters.put(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE, TXMPreferences.getBoolean(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE, CooccurrencePreferences.PREFERENCES_NODE));
+		parameters.put(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE,this.getBooleanParameterValue(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE));
 		
 		
 		Double minScore = 0.0;
@@ -667,6 +622,9 @@
 			}
 		}
 		
+		// FIXME: method using TXMCommandParameters
+		final TXMParameters parameters = this.getWidgetsParameters();
+		
 		JobHandler jobhandler = new JobHandler(NLS.bind(CooccurrenceUIMessages.CooccurrencesEditor_12, corpus)) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
@@ -690,43 +648,32 @@
 					//monitor.worked(5);
 					
 					// FIXME: method using TXMCommandParameters
-					//cooc.compute(this, getWidgetsParameters());
+					cooc.compute(this, parameters);
 					
-					
 					// FIXME: method without using TXMCommandParameters
-					Double minScore = 0.0;
-					try {
-						Double d = Double.parseDouble(TScore.getText());
-						minScore = d;
-					}
-					catch (Exception e) {
-						System.out.println(NLS.bind(CooccurrenceUIMessages.CooccurrencesEditor_18, TScore.getText()));
-					}
-					cooc.compute(this,
-							new Query(
-									queryWidget.getQueryString()),
-									propsArea.getProperties(),
-									null,
-									empantPanel.getMinLeft() + 1,
-									empantPanel.getMaxLeft() + 1,
-									empantPanel.getMinRight() + 1,
-									empantPanel.getMaxRight() + 1,
-									TFreq.getSelection(),
-									minScore,
-									TCount.getSelection(),
-									empantPanel.getXPivot(),
-									TXMPreferences.getBoolean(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE, CooccurrencePreferences.PREFERENCES_NODE)
-									);
+//					cooc.compute(this,
+//							new Query(
+//									queryWidget.getQueryString()),
+//									propsArea.getProperties(),
+//									null,
+//									empantPanel.getMinLeft() + 1,
+//									empantPanel.getMaxLeft() + 1,
+//									empantPanel.getMinRight() + 1,
+//									empantPanel.getMaxRight() + 1,
+//									TFreq.getSelection(),
+//									minScore,
+//									TCount.getSelection(),
+//									empantPanel.getXPivot(),
+//									getBooleanParameterValue(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE)
+//									);
 					
 					
 					//FIXME: DEbug
 //					parameters.dump();
 //					TXMPreferences.dump(CooccurrencePreferences.PREFERENCES_NODE, cooc);
 					
-					//getEditorInput().setResult(cooc);
 					
 					
-					
 					// FIXME: this code should be move in Cooccurrence.getDetails() or getName(), etc?
 					final String message;
 					if (cooc.getLines().size() == 0) {
@@ -785,7 +732,7 @@
 					return Status.CANCEL_STATUS;
 
 				monitor.subTask(CooccurrenceUIMessages.CooccurrencesEditor_15);
-				syncExec(new Runnable() {
+				this.syncExec(new Runnable() {
 					@Override
 					public void run() {
 						viewer.setInput(cooc.getLines());
@@ -800,6 +747,7 @@
 
 						refresh();
 						
+						//FIXME: need to be done in another way with after the plugin split
 						QueriesView.refresh();
 						RVariablesView.refresh();
 						
@@ -820,30 +768,6 @@
 	 * Updates the parameters area from values from parameters, local result node or preferences.
 	 */
 	private void fillCommandParametersArea() {
-		// from result
-		//FIXME: to remove
-//		if (this.cooc != null) {
-//			this.queryWidget.setText(cooc.getQuery().getQueryString());
-//			List<Property> available;
-//			try {
-//				available = new ArrayList<Property>(this.cooc.getCorpus().getProperties());
-//				available.removeAll(cooc.getProperties());
-//				this.propsArea.setProperties(available, cooc.getProperties());
-//			} catch (CqiClientException e) {
-//				// TODO Auto-generated catch block
-//				org.txm.rcp.utils.Logger.printStackTrace(e);
-//			}
-//			this.empantPanel.setStructure(cooc.getStructure());
-//			this.empantPanel.setMinLeft(cooc.getMinLeft()-1);
-//			this.empantPanel.setMaxLeft(cooc.getMaxLeft()-1);
-//			this.empantPanel.setMinRight(cooc.getMinRight()-1);
-//			this.empantPanel.setMaxRight(cooc.getMaxRight()-1);
-//
-//		}
-		//FIXME: look for parameters or preferences in following order: command parameters, local result node, default preferences, alternate preferences nodes
-//		else	{
-		
-		
 		queryWidget.setText(this.getStringParameterValue(CooccurrencePreferences.QUERY));
 		
 		if (this.cooc.getProperties() != null) {
@@ -858,7 +782,6 @@
 				org.txm.rcp.utils.Logger.printStackTrace(e);
 			}
 		}
-
 		
 		TFreq.setSelection(this.getIntParameterValue(CooccurrencePreferences.MIN_FREQ));
 		TCount.setSelection(this.getIntParameterValue(CooccurrencePreferences.MIN_COUNT));
@@ -869,8 +792,6 @@
 		empantPanel.setMaxLeft(this.getIntParameterValue(CooccurrencePreferences.MAX_LEFT));
 		empantPanel.setMinRight(this.getIntParameterValue(CooccurrencePreferences.MIN_RIGHT));
 		empantPanel.setMaxRight(this.getIntParameterValue(CooccurrencePreferences.MAX_RIGHT));
-			
-//		}
 	}
 
 
Index: tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java
===================================================================
--- tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java	(revision 451)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/handlers/ComputeCooccurrences.java	(revision 452)
@@ -32,7 +32,6 @@
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.txm.Toolbox;
 import org.txm.concordance.core.functions.Concordance;
 import org.txm.cooccurrence.core.functions.Cooccurrence;
 import org.txm.cooccurrence.core.preferences.CooccurrencePreferences;
@@ -43,7 +42,9 @@
 import org.txm.rcp.editors.TXMEditorPart;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.handlers.BaseAbstractHandler;
+import org.txm.rcp.utils.Logger;
 import org.txm.rcp.views.corpora.CorporaView;
+import org.txm.searchengine.cqp.CQPEngine;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnit;
@@ -78,7 +79,7 @@
 		}
 
 
-		if (!Toolbox.isSearchEngineInitialized()) return null;
+		if (!CQPEngine.isInitialized()) return null;
 
 		
 		Object selection = this.getSelection();
@@ -123,7 +124,7 @@
 			}
 			catch (Exception e) {
 				// TODO Auto-generated catch block
-				org.txm.rcp.utils.Logger.printStackTrace(e);
+				Logger.printStackTrace(e);
 				return null;
 			}
 
Index: tmp/org.txm.chartsengine.r.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.chartsengine.r.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.chartsengine.r.core/META-INF/MANIFEST.MF	(revision 452)
@@ -4,10 +4,10 @@
 Bundle-SymbolicName: org.txm.chartsengine.r.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Require-Bundle: org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.txm.utils;bundle-version="1.0.0",
  org.eclipse.core.runtime,
  org.txm.chartsengine.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.core,
- org.txm.utils;bundle-version="1.0.0"
+ org.txm.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.txm.chartsengine.r.core,
Index: tmp/org.txm.ca.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.ca.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.ca.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,18 +4,19 @@
 Bundle-SymbolicName: org.txm.ca.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.lexicaltable.core;bundle-version="1.0.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.ui;bundle-version="3.106.1",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.lexicaltable.core;bundle-version="1.0.0",
  org.txm.lexicaltable.rcp;bundle-version="1.0.0",
  org.txm.ca.core;bundle-version="1.0.0",
  org.txm.chartsengine.rcp,
  org.txm.core;bundle-version="0.7.0",
  org.txm.rcp,
- org.eclipse.ui;bundle-version="3.106.1",
- org.eclipse.core.runtime;bundle-version="3.10.0",
  org.eclipse.core.expressions;bundle-version="3.4.600",
- org.txm.statsengine.core;bundle-version="1.0.0",
- org.txm.statsengine.r.core;bundle-version="1.0.0",
- org.txm.statsengine.r.rcp;bundle-version="1.0.0"
+ org.txm.statsengine.core;bundle-version="1.0.0"
 Export-Package: org.txm.ca.rcp.adapters,
  org.txm.ca.rcp.chartsengine.events,
  org.txm.ca.rcp.editors,
Index: tmp/org.txm.para.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.para.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.para.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,13 +4,15 @@
 Bundle-SymbolicName: org.txm.para.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.txm.para.rcp.Activator
-Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.ui,
+ org.txm.concordance.rcp,
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
  org.txm.rcp;bundle-version="0.7.8",
  org.txm.core;bundle-version="0.7.0",
- org.eclipse.ui,
- org.eclipse.core.runtime,
  org.txm.para.core,
- org.txm.concordance.rcp,
  org.txm.searchengine.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
Index: tmp/org.txm.chartsengine.svgbatik.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.chartsengine.svgbatik.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.chartsengine.svgbatik.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,12 +4,15 @@
 Bundle-SymbolicName: org.txm.chartsengine.svgbatik.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.libs.itext;bundle-version="2.1.5",
- org.txm.chartsengine.rcp;bundle-version="1.0.0";visibility:=reexport,
+Require-Bundle: org.txm.libs.batik;bundle-version="0.0.0",
+ org.txm.libs.itext;bundle-version="2.1.5",
+ org.txm.chartsengine.core;bundle-version="1.0.0",
+ org.txm.chartsengine.rcp;bundle-version="1.0.0",
+ org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.swt;bundle-version="3.103.2",
  org.txm.core;bundle-version="0.7.0",
  org.txm.rcp;bundle-version="0.7.8",
- org.eclipse.core.expressions;bundle-version="3.4.600",
- org.txm.libs.batik;bundle-version="0.0.0"
+ org.eclipse.core.expressions;bundle-version="3.4.600"
 Export-Package: org.txm.chartsengine.svgbatik.rcp,
  org.txm.chartsengine.svgbatik.rcp.swing,
  org.txm.chartsengine.svgbatik.rcp.swt
Index: tmp/org.txm.specificities.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.specificities.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.specificities.core/META-INF/MANIFEST.MF	(revision 452)
@@ -4,7 +4,11 @@
 Bundle-SymbolicName: org.txm.specificities.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.statsengine.r.core,
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.statsengine.r.core,
  org.txm.lexicon.core;bundle-version="1.0.0",
  org.txm.lexicaltable.core;bundle-version="1.0.0",
  org.txm.statsengine.core;bundle-version="1.0.0",
@@ -12,8 +16,7 @@
  org.txm.progression.core;bundle-version="1.0.0",
  org.txm.chartsengine.core;bundle-version="1.0.0",
  org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
- org.txm.chartsengine.r.core;bundle-version="1.0.0",
- org.eclipse.core.runtime;bundle-version="3.10.0"
+ org.txm.chartsengine.r.core;bundle-version="1.0.0"
 Export-Package: org.txm.functions.contrasts,
  org.txm.specificities.core.chartsengine.jfreechart,
  org.txm.specificities.core.chartsengine.r,
Index: tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/DoInstallStep.java
===================================================================
--- tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/DoInstallStep.java	(revision 451)
+++ tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/DoInstallStep.java	(revision 452)
@@ -22,10 +22,10 @@
 	@Override
 	public void preInstall() {
 		
-		String CQPFRAGMENT = "CQP."+System.getProperty("osgi.os");
+		String CQPFRAGMENT = "org.txm.libs.cqp."+System.getProperty("osgi.os");
 		
 		Log.info("CQP.DoInstallStep.install()");
-		String saved = TXMPreferences.getString(CQPPreferences.PREFERENCES_NODE, CQPPreferences.VERSION, "");
+		String saved = TXMPreferences.getString(CQPPreferences.VERSION, CQPPreferences.PREFERENCES_NODE);
 		Version currentVersion = BundleUtils.getBundleVersion(CQPFRAGMENT); // the CQPFRAGMENT plugin contains the right version
 		
 		if (saved != null && saved.length() > 0) {
Index: tmp/org.txm.libs.cqp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.libs.cqp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.libs.cqp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,10 +4,11 @@
 Bundle-SymbolicName: org.txm.libs.cqp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.txm.libs.cqp.Activator
-Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
- org.txm.core;visibility:=reexport,
- org.eclipse.jface;visibility:=reexport,
- org.eclipse.ui.workbench;visibility:=reexport
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.core.runtime,
+ org.txm.core,
+ org.eclipse.jface,
+ org.eclipse.ui.workbench
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.txm.libs.cqp
Index: tmp/org.txm.lexicon.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.lexicon.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.lexicon.core/META-INF/MANIFEST.MF	(revision 452)
@@ -5,10 +5,11 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Textometrie.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.core;bundle-version="0.7.0",
+Require-Bundle: org.eclipse.osgi;bundle-version="3.10.2",
  org.eclipse.core.runtime;bundle-version="3.10.0",
- org.txm.statsengine.core;bundle-version="1.0.0",
+ org.txm.utils,
  org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.txm.core;bundle-version="0.7.0",
  org.txm.searchengine.core;bundle-version="1.0.0",
  org.txm.searchengine.cqp.core;bundle-version="1.1.0"
 Export-Package: org.txm.lexicon.core.corpusengine.cqp,
Index: tmp/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java	(revision 451)
+++ tmp/org.txm.core/src/java/org/txm/core/preferences/TBXPreferences.java	(revision 452)
@@ -121,7 +121,6 @@
 		Log.info(TXMCoreMessages.Toolbox_4 + TBXPreferences.getID()); 
 
 		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
-		DefaultScope.INSTANCE
 		
 		//FIXME: USE osgi.instance.area later
 		preferences.put(TBXPreferences.USER_TXM_HOME, System.getProperty("user.home")+"/TXM");
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 451)
+++ tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java	(revision 452)
@@ -90,8 +90,9 @@
 		this.children = new ArrayList<TXMResult>(1);
 		this.preferencesNodeQualifier = FrameworkUtil.getBundle(getClass()).getSymbolicName();
 		this.parameters = parameters;
+
 		//FIXME: Debug
-		System.out.println("TXMResult.TXMResult(): default preferences node qualifier = " + this.preferencesNodeQualifier + ", class = " + getClass());
+		//System.out.println("TXMResult.TXMResult(): default preferences node qualifier = " + this.preferencesNodeQualifier + ", class = " + getClass());
 	}
 	
 	/**
Index: tmp/org.txm.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.core/META-INF/MANIFEST.MF	(revision 452)
@@ -4,17 +4,15 @@
 Bundle-SymbolicName: org.txm.core;singleton:=true
 Bundle-Version: 0.7.0.qualifier
 Bundle-Activator: org.txm.toolbox.Activator
-Require-Bundle: org.txm.utils;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0",
+ javax.persistence;bundle-version="2.1.0",
+ org.txm.utils;bundle-version="1.0.0",
  org.eclipse.osgi.util;bundle-version="3.2.0",
  org.eclipse.core.net,
  org.eclipse.osgi,
- org.txm.libs.groovy-all;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.persistence.jpa;bundle-version="2.6.0",
- javax.persistence;bundle-version="2.1.0";visibility:=reexport,
- org.eclipse.persistence.jpa.jpql;bundle-version="2.6.0";visibility:=reexport,
- org.txm.statsengine.r.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.annotation.core;bundle-version="1.0.0";visibility:=reexport
+ org.txm.libs.groovy-all;bundle-version="1.0.0",
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.txm.annotation.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: EDU.oswego.cs.dl.util.concurrent,
  EDU.oswego.cs.dl.util.concurrent.misc,
Index: tmp/org.txm.core.tests/src/org/txm/core/tests/manual/ToolBoxTesterRCPApplication.java
===================================================================
--- tmp/org.txm.core.tests/src/org/txm/core/tests/manual/ToolBoxTesterRCPApplication.java	(revision 451)
+++ tmp/org.txm.core.tests/src/org/txm/core/tests/manual/ToolBoxTesterRCPApplication.java	(revision 452)
@@ -3,8 +3,6 @@
  */
 package org.txm.core.tests.manual;
 
-import org.apache.tools.ant.taskdefs.Sleep;
-import org.eclipse.core.internal.preferences.RootPreferences;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.txm.Toolbox;
@@ -14,7 +12,6 @@
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnit;
 import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
-import org.txm.statsengine.r.core.preferences.RPreferences;
 
 /**
  * 
Index: tmp/org.txm.core.tests/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.core.tests/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.core.tests/META-INF/MANIFEST.MF	(revision 452)
@@ -4,11 +4,12 @@
 Bundle-SymbolicName: org.txm.core.tests;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.utils,
+Require-Bundle: org.txm.statsengine.r.core,
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.utils,
  org.txm.lexicon.core,
  org.eclipse.core.runtime;bundle-version="3.10.0",
  org.txm.core;bundle-version="0.7.0",
- org.txm.statsengine.r.core,
  org.txm.ca.core;bundle-version="1.0.0",
  org.txm.cah.core;bundle-version="1.0.0",
  org.txm.chartsengine.core;bundle-version="1.0.0",
Index: tmp/org.txm.chartsengine.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.chartsengine.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.chartsengine.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,12 +4,13 @@
 Bundle-SymbolicName: org.txm.chartsengine.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.chartsengine.core;bundle-version="1.0.0";visibility:=reexport,
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.ui;bundle-version="3.106.1",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.chartsengine.core;bundle-version="1.0.0",
  org.txm.core;bundle-version="0.7.0",
  org.txm.rcp;bundle-version="0.7.8",
  org.eclipse.core.resources,
- org.eclipse.ui;bundle-version="3.106.1";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="3.10.0",
  org.eclipse.swt,
  org.eclipse.core.expressions;bundle-version="3.4.600"
 Export-Package: org.txm.chartsengine.rcp,
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/preferences/ChartsEnginePreferencePage.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/preferences/ChartsEnginePreferencePage.java	(revision 451)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/preferences/ChartsEnginePreferencePage.java	(revision 452)
@@ -15,8 +15,6 @@
 import org.eclipse.ui.PlatformUI;
 import org.txm.chartsengine.core.ChartsEngine;
 import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
-import org.txm.chartsengine.jfreechart.core.JFCChartsEngine;
-import org.txm.chartsengine.jfreechart.core.preferences.JFCChartsEnginePreferences;
 import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
 import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
 import org.txm.core.preferences.TBXPreferences;
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/r/RProgressionChartCreator.java
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/r/RProgressionChartCreator.java	(revision 451)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/r/RProgressionChartCreator.java	(revision 452)
@@ -7,13 +7,11 @@
 import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
 import org.txm.chartsengine.r.core.RChartCreator;
 import org.txm.chartsengine.r.core.themes.DefaultTheme;
-import org.txm.core.preferences.TXMPreferences;
 import org.txm.core.results.TXMResult;
 import org.txm.progression.core.chartsengine.base.ProgressionChartCreator;
 import org.txm.progression.core.chartsengine.base.Utils;
 import org.txm.progression.core.functions.Progression;
 import org.txm.progression.core.preferences.ProgressionPreferences;
-import org.txm.statsengine.core.StatException;
 import org.txm.statsengine.r.core.RWorkspace;
 import org.txm.statsengine.r.core.exceptions.RWorkspaceException;
 import org.txm.utils.logger.Log;
Index: tmp/org.txm.progression.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.progression.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.progression.core/META-INF/MANIFEST.MF	(revision 452)
@@ -4,7 +4,9 @@
 Bundle-SymbolicName: org.txm.progression.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.statsengine.r.core;bundle-version="1.0.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.txm.statsengine.core;bundle-version="1.0.0",
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
  org.txm.chartsengine.core,
  org.eclipse.core.runtime,
  org.txm.core;bundle-version="0.7.0",
Index: tmp/org.txm.annotation.core/src/org/txm/annotation/AnnotationWriter.java
===================================================================
--- tmp/org.txm.annotation.core/src/org/txm/annotation/AnnotationWriter.java	(revision 451)
+++ tmp/org.txm.annotation.core/src/org/txm/annotation/AnnotationWriter.java	(revision 452)
@@ -1,11 +1,7 @@
 package org.txm.annotation;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -28,8 +24,6 @@
 import org.txm.utils.DeleteDir;
 import org.txm.utils.logger.Log;
 import org.txm.utils.zip.Zip;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
 
 
 public class AnnotationWriter {
Index: tmp/org.txm.annotation.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.annotation.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.annotation.core/META-INF/MANIFEST.MF	(revision 452)
@@ -4,9 +4,13 @@
 Bundle-SymbolicName: org.txm.annotation.core
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.txm.annotation.Activator
-Require-Bundle: org.txm.core;bundle-version="0.7.0",
+Require-Bundle: org.eclipse.persistence.jpa;bundle-version="2.6.0",
+ org.eclipse.persistence.jpa.jpql;bundle-version="2.6.0",
+ javax.persistence;bundle-version="2.1.0",
+ org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.txm.core;bundle-version="0.7.0",
  org.eclipse.ui,
- org.eclipse.core.runtime,
  org.txm.searchengine.cqp.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
Index: tmp/org.txm.referencer.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.referencer.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.referencer.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,12 +4,16 @@
 Bundle-SymbolicName: org.txm.referencer.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.txm.referencer.rcp.Activator
-Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.txm.referencer.core;bundle-version="1.0.0",
+ org.txm.concordance.core;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.concordance.rcp;bundle-version="1.0.0",
+ org.txm.statsengine.r.rcp;bundle-version="1.0.0",
  org.eclipse.ui,
  org.eclipse.core.runtime,
  org.txm.core;bundle-version="0.7.0",
  org.txm.rcp;bundle-version="0.7.8",
- org.txm.concordance.core;bundle-version="1.0.0",
  org.eclipse.core.expressions;bundle-version="3.4.600",
  org.txm.searchengine.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Index: tmp/org.txm.concordance.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.concordance.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.concordance.core/META-INF/MANIFEST.MF	(revision 452)
@@ -4,11 +4,14 @@
 Bundle-SymbolicName: org.txm.concordance.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
- org.txm.core;visibility:=reexport,
- org.txm.annotation.core;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version="3.10.0";visibility:=reexport,
- org.txm.searchengine.core;bundle-version="1.0.0";visibility:=reexport
+Require-Bundle: org.txm.annotation.core;bundle-version="1.0.0",
+ org.txm.utils;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.core,
+ org.txm.searchengine.core;bundle-version="1.0.0"
 Export-Package: org.txm.concordance.core.functions,
  org.txm.concordance.core.functions.comparators,
  org.txm.concordance.core.messages,
Index: tmp/org.txm.specificities.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.specificities.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.specificities.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,17 +4,21 @@
 Bundle-SymbolicName: org.txm.specificities.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.lexicaltable.core;bundle-version="1.0.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.ui;bundle-version="3.106.1",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.lexicaltable.core;bundle-version="1.0.0",
  org.txm.index.core;bundle-version="1.0.0",
+ org.txm.statsengine.core;bundle-version="1.0.0",
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
  org.txm.core;bundle-version="0.7.0",
  org.txm.statsengine.r.rcp,
  org.txm.specificities.core,
  org.txm.chartsengine.rcp,
  org.txm.rcp;bundle-version="0.7.8",
- org.eclipse.core.expressions;bundle-version="3.4.600",
- org.eclipse.core.runtime;bundle-version="3.10.0",
- org.txm.statsengine.core;bundle-version="1.0.0",
- org.txm.statsengine.r.core;bundle-version="1.0.0"
+ org.eclipse.core.expressions;bundle-version="3.4.600"
 Export-Package: org.txm.specificities.rcp.adapters,
  org.txm.specificities.rcp.editors,
  org.txm.specificities.rcp.handlers,
Index: tmp/org.txm.referencer.core/src/org/txm/functions/referencer/Referencer.java
===================================================================
--- tmp/org.txm.referencer.core/src/org/txm/functions/referencer/Referencer.java	(revision 451)
+++ tmp/org.txm.referencer.core/src/org/txm/functions/referencer/Referencer.java	(revision 452)
@@ -145,27 +145,31 @@
 	 * Call in order all stages to compute the referencer.
 	 *
 	 * @return true, if successful
-	 * @throws CqiClientException the cqi client exception
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 * @throws CqiServerError the cqi server error
 	 */
-	public boolean compute() throws CqiClientException, IOException, CqiServerError
+	public boolean compute()
 	{
-		if (this.parent == null || query == null || pattern == null || prop == null)
-			return false;
-		if (pattern.size() == 0)
-			return false;
-		if (query.getQueryString().equals("")) //$NON-NLS-1$
-			return false;
+		try {
+			if (this.parent == null || query == null || pattern == null || prop == null)
+				return false;
+			if (pattern.size() == 0)
+				return false;
+			if (query.getQueryString().equals("")) //$NON-NLS-1$
+				return false;
 
-		if (!getQueryMatches())
-			return false;
+			if (!getQueryMatches())
+				return false;
 
-		if (!getQueryindexes())
-			return false;
+			if (!getQueryindexes())
+				return false;
 
-		if (!groupPositionsbyId())
-			return false;
+			if (!groupPositionsbyId())
+				return false;
+		}
+		catch(CqiClientException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			return false;
+		}
 
 		return true;
 	}
Index: tmp/org.txm.referencer.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.referencer.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.referencer.core/META-INF/MANIFEST.MF	(revision 452)
@@ -4,7 +4,8 @@
 Bundle-SymbolicName: org.txm.referencer.core
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.statsengine.r.core;bundle-version="1.0.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
  org.txm.core;bundle-version="0.7.0",
  org.txm.searchengine.core;bundle-version="1.0.0",
  org.txm.searchengine.cqp.core;bundle-version="1.1.0"
Index: tmp/org.txm.groovy.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.groovy.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.groovy.core/META-INF/MANIFEST.MF	(revision 452)
@@ -4,7 +4,13 @@
 Bundle-SymbolicName: org.txm.groovy.core
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+Require-Bundle: org.txm.libs.groovy-all;bundle-version="2.3.3",
+ org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.concordance.core;bundle-version="1.0.0",
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
  org.txm.ca.core;bundle-version="1.0.0",
  org.txm.ca.rcp;bundle-version="1.0.0",
  org.txm.cah.core;bundle-version="1.0.0",
@@ -29,7 +35,6 @@
  org.txm.lexicon.rcp;bundle-version="1.0.0",
  org.txm.libs.batik;bundle-version="0.0.0",
  org.txm.libs.colt;bundle-version="1.2.0",
- org.txm.libs.groovy-all;bundle-version="2.3.3",
  org.txm.libs.itext;bundle-version="2.1.5",
  org.txm.libs.jfreechart;bundle-version="1.0.17",
  org.txm.libs.jfreesvg;bundle-version="1.7.0",
@@ -43,15 +48,12 @@
  org.txm.specificities.core;bundle-version="1.0.0",
  org.txm.specificities.rcp;bundle-version="1.0.0",
  org.txm.statsengine.core;bundle-version="1.0.0",
- org.txm.statsengine.r.core;bundle-version="1.0.0",
  org.txm.statsengine.r.rcp;bundle-version="1.0.0",
  org.txm.synopticeditor.rcp;bundle-version="1.0.0",
  org.txm.textsbalance.core;bundle-version="1.0.0",
  org.txm.textsbalance.rcp;bundle-version="1.0.0",
- org.txm.utils;bundle-version="1.0.0",
  org.txm.wordcloud.core;bundle-version="1.0.0",
  org.txm.wordcloud.rcp;bundle-version="1.0.0",
- org.txm.concordance.core;bundle-version="1.0.0",
  org.txm.referencer.core;bundle-version="1.0.0",
  org.txm.annotation.core;bundle-version="1.0.0",
  org.txm.para.core;bundle-version="1.0.0",
@@ -60,7 +62,6 @@
  org.txm.para.rcp;bundle-version="1.0.0",
  org.txm.referencer.rcp;bundle-version="1.0.0",
  org.txm.searchengine.core;bundle-version="1.0.0",
- org.txm.experimentations.core;bundle-version="1.0.0",
  org.txm.links.rcp;bundle-version="1.0.0"
 Export-Package: filters.BuildXmlLiturgie,
  filters.Concatenator,
Index: tmp/org.txm.chartsengine.jfreechart.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.chartsengine.jfreechart.core/META-INF/MANIFEST.MF	(revision 452)
@@ -6,7 +6,7 @@
 Require-Bundle: org.txm.libs.jfreechart;bundle-version="1.0.17";visibility:=reexport,
  org.txm.libs.itext,
  org.eclipse.core.runtime,
- org.txm.libs.jfreesvg;bundle-version="1.7.0",
+ org.txm.libs.jfreesvg;bundle-version="1.7.0";visibility:=reexport,
  org.txm.chartsengine.core;bundle-version="1.0.0";visibility:=reexport,
  org.txm.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Index: tmp/org.txm.rcp.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java
===================================================================
--- tmp/org.txm.rcp.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java	(revision 451)
+++ tmp/org.txm.rcp.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ResolutionResultsWizardPage.java	(revision 452)
@@ -36,7 +36,6 @@
 import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.statushandlers.StatusManager;
 
-import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor.SetterOnlyReflection;
 
 /**
  * A wizard page that shows detailed information about a resolved install
Index: tmp/org.txm.wordcloud.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.wordcloud.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.wordcloud.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,10 +4,15 @@
 Bundle-SymbolicName: org.txm.wordcloud.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.wordcloud.core;bundle-version="1.0.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.lexicon.core;bundle-version="1.0.0",
+ org.txm.index.core;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.eclipse.ui;bundle-version="3.106.1",
+ org.txm.wordcloud.core;bundle-version="1.0.0",
  org.txm.chartsengine.rcp,
- org.eclipse.core.runtime;bundle-version="3.10.0",
  org.txm.core;bundle-version="0.7.0",
- org.txm.rcp;bundle-version="0.7.8",
- org.txm.index.core;bundle-version="1.0.0"
+ org.txm.rcp;bundle-version="0.7.8"
 Bundle-Vendor: Textometrie.org
Index: tmp/org.txm.partition.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.partition.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.partition.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -3,16 +3,17 @@
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.txm.partition.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
- org.txm.rcp;bundle-version="0.7.8",
- org.txm.partition.core;bundle-version="1.0.0",
- org.txm.chartsengine.rcp,
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
  org.eclipse.ui,
- org.eclipse.core.runtime,
  org.txm.core;bundle-version="0.7.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.chartsengine.rcp,
+ org.txm.partition.core,
+ org.txm.rcp;bundle-version="0.7.8",
  org.txm.chartsengine.core,
- org.eclipse.core.expressions;bundle-version="3.4.600",
- org.txm.searchengine.core;bundle-version="1.0.0"
+ org.eclipse.core.expressions;bundle-version="3.4.600"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Textometrie.org
Index: tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/handlers/ComputePartitionDimensionsBarChart.java
===================================================================
--- tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/handlers/ComputePartitionDimensionsBarChart.java	(revision 451)
+++ tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/handlers/ComputePartitionDimensionsBarChart.java	(revision 452)
@@ -27,30 +27,24 @@
 //
 package org.txm.partition.rcp.handlers;
 
-import java.util.List;
-
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.Toolbox;
 import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
 import org.txm.chartsengine.rcp.editors.ChartEditorPart;
 import org.txm.core.preferences.TXMPreferences;
 import org.txm.partition.core.functions.PartitionDimensions;
 import org.txm.partition.core.preferences.PartitionDimensionsPreferences;
 import org.txm.partition.rcp.messages.PartitionUIMessages;
-import org.txm.rcp.handlers.BaseAbstractHandler;
 import org.txm.rcp.IImageKeys;
+import org.txm.rcp.handlers.BaseAbstractHandler;
 import org.txm.rcp.views.corpora.CorporaView;
-import org.txm.searchengine.cqp.CQPEngine;
-import org.txm.searchengine.cqp.corpus.Part;
 import org.txm.searchengine.cqp.corpus.Partition;
 
+
 /**
  * Creates and opens a bar chart editor with the dimensions of the selected partition.
  * 
@@ -74,82 +68,70 @@
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		
-		if (!CQPEngine.isInitialized()) return false;
+		if (!this.checkCorpusEngine())	{
+			return false;
+		}
 		
 		if(!this.checkStatsEngine()) {
-			return null;
+			return false;
 		}
 
 		
-		IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelection(event);
-
-		PartitionDimensions partitionDimensions = null; 
+		Object selection = this.getSelection();
+		PartitionDimensions partitionDimensions = null;
 		
-		// Create new editor
-		if (selection.getFirstElement() instanceof Partition) {
-			final Partition partition = (Partition) selection.getFirstElement();
-			try {
-				List<Part> parts = partition.getParts();
-				if(parts.size() == 0)	{
-					return false;
-				}
+		
+		// Creating from Partition
+		if (selection instanceof Partition) {
+			Partition partition = (Partition) selection;
+			if(partition.getParts().size() == 0)	{
+				return false;
+			}
 
-				partitionDimensions = new PartitionDimensions(partition);
-				CorporaView.refreshObject(partitionDimensions.getCorpus());
+			partitionDimensions = new PartitionDimensions(partition);
 				
-			}
-			catch (Exception e) {
-				org.txm.rcp.utils.Logger.printStackTrace(e);
-			}
 		}
-		// Reopen an editor
-		else if(selection.getFirstElement() instanceof PartitionDimensions)	{
-			partitionDimensions = (PartitionDimensions) selection.getFirstElement(); 
+		// Reopening from existing result
+		else if(selection instanceof PartitionDimensions)	{
+			partitionDimensions = (PartitionDimensions) selection;
 		}
 
+		final ChartEditorPart editor = SWTChartsComponentsProvider.getCurrent().openEditor(partitionDimensions, "Partition Dimensions Bar Chart"); //$NON-NLS-1$
+		
+		// FIXME: Pie chart tests
+//		final ChartEditorPart editor = SWTChartsComponentsProvider.getCurrent().openEditor(partitionDimensions, "Partition Dimensions Pie Chart");
 
-		if(partitionDimensions != null)	{
+		
+		// Contribute to the tool bar without extending ChartEditorPart
+		// FIXME: finally, would be better to create a PartitionDimensionEditor
+		if(!editor.wasAlreadyOpened())	{
 
-			final ChartEditorPart editor = SWTChartsComponentsProvider.getCurrent().openEditor(partitionDimensions, PartitionDimensionsPreferences.PREFERENCES_NODE,
-					"Partition Dimensions Bar Chart");
 			
+			editor.refresh();
 			
-			// FIXME: Pie chart tests
-//			final ChartEditorPart editor = SWTChartsComponentsProvider.getCurrent().openEditor(partitionDimensions, PartitionDimensionsPreferences.PREFERENCES_NODE,
-//					"Partition Dimensions Pie Chart");
-
+			new ToolItem(editor.getToolBar(), SWT.SEPARATOR);
 			
-			// Contribute to the tool bar without extending ChartEditorPart
-			if(!editor.wasAlreadyOpened())	{
+			final ToolItem sortByPartSize = new ToolItem(editor.getToolBar(), SWT.CHECK);
+			sortByPartSize.setImage(IImageKeys.getImage(ComputePartitionDimensionsBarChart.class, "icons/silk_sort_by_size.png"));
+			sortByPartSize.setToolTipText(PartitionUIMessages.PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE);
+			sortByPartSize.setSelection(editor.getBooleanParameterValue(PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE));
+			
+			sortByPartSize.addSelectionListener(new SelectionListener() {
 				
-				new ToolItem(editor.getToolBar(), SWT.SEPARATOR);
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					TXMPreferences.putLocalBoolean(editor.getResultData(), PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE, sortByPartSize.getSelection());
+					editor.computeChart(true, false, true);
+				}
 				
-				final ToolItem sortByPartSize = new ToolItem(editor.getToolBar(), SWT.CHECK);
-				sortByPartSize.setImage(IImageKeys.getImage(ComputePartitionDimensionsBarChart.class, "icons/silk_sort_by_size.png"));
-				sortByPartSize.setToolTipText(PartitionUIMessages.PreferencesPage_DIMENSIONS_SORT_BY_PARTS_SIZE);
-				sortByPartSize.setSelection(TXMPreferences.getBoolean(PartitionDimensionsPreferences.PREFERENCES_NODE, editor.getResultData(), PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE));
-				
-				sortByPartSize.addSelectionListener(new SelectionListener() {
+				@Override
+				public void widgetDefaultSelected(SelectionEvent e) {
+					// TODO Auto-generated method stub
 					
-					@Override
-					public void widgetSelected(SelectionEvent e) {
-						TXMPreferences.putLocalBoolean(editor.getResultData(), PartitionDimensionsPreferences.CHART_DIMENSIONS_SORTED_BY_SIZE, sortByPartSize.getSelection());
-						editor.computeChart(true, false, true);
-					}
-					
-					@Override
-					public void widgetDefaultSelected(SelectionEvent e) {
-						// TODO Auto-generated method stub
-						
-					}
-				});
-				
-				
-				
-			}
-			
+				}
+			});
 		}
-		
+			
 		return null;
 	}
 	
Index: tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java
===================================================================
--- tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java	(revision 451)
+++ tmp/org.txm.chartsengine.r.rcp/src/org/txm/rcp/chartsengine/r/preferences/RChartsEnginePreferencePage.java	(revision 452)
@@ -34,20 +34,13 @@
 
 import org.eclipse.jface.preference.ComboFieldEditor;
 import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
 import org.txm.chartsengine.core.ChartsEngine;
-import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
-import org.txm.chartsengine.jfreechart.core.JFCChartsEngine;
-import org.txm.chartsengine.jfreechart.core.preferences.JFCChartsEnginePreferences;
 import org.txm.chartsengine.r.core.RChartsEngine;
 import org.txm.chartsengine.r.core.preferences.RChartsEnginePreferences;
 import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
 import org.txm.chartsengine.rcp.messages.SWTComponentsProviderMessages;
-import org.txm.core.preferences.TXMPreferences;
-import org.txm.rcp.preferences.ExportPreferencePage;
 import org.txm.rcp.preferences.TXMPreferencePage;
 import org.txm.rcp.preferences.TXMPreferenceStore;
-import org.txm.rcp.preferences.UserPreferencePage;
 
 /**
  * R charts engine preference page.
Index: tmp/org.txm.chartsengine.r.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.chartsengine.r.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.chartsengine.r.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,9 +4,10 @@
 Bundle-SymbolicName: org.txm.chartsengine.r.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.txm.core,
- org.txm.chartsengine.rcp;bundle-version="1.0.0";visibility:=reexport,
- org.txm.rcp;bundle-version="0.7.8",
- org.txm.chartsengine.r.core;bundle-version="1.0.0";visibility:=reexport
+Require-Bundle: org.eclipse.ui;bundle-version="3.106.1",
+ org.txm.chartsengine.r.core;bundle-version="1.0.0",
+ org.txm.core,
+ org.txm.chartsengine.rcp;bundle-version="1.0.0",
+ org.txm.rcp;bundle-version="0.7.8"
 Bundle-Vendor: Textometrie.org
 Import-Package: org.txm.chartsengine.rcp.messages
Index: tmp/org.txm.index.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.index.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.index.core/META-INF/MANIFEST.MF	(revision 452)
@@ -3,12 +3,12 @@
 Bundle-Name: Index Core
 Bundle-SymbolicName: org.txm.index.core
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
  org.txm.statsengine.r.core;bundle-version="1.0.0",
  org.txm.lexicon.core;bundle-version="1.0.0",
  org.eclipse.core.runtime,
  org.txm.core;bundle-version="0.7.0",
- org.txm.utils;bundle-version="1.0.0",
  org.txm.searchengine.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
Index: tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java	(revision 451)
+++ tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java	(revision 452)
@@ -298,7 +298,7 @@
 	protected boolean scanCorpus(Corpus corp) throws CqiClientException, IOException, CqiServerError {
 		// get the cqp result of the query
 		
-		long time = System.currentTimeMillis();
+		//long time = System.currentTimeMillis();
 		QueryResult result = corp.query(query, "index", true); //$NON-NLS-1$
 		boolean isTargetUsed = CQPEngine.getCqiClient().subCorpusHasField(result.getQualifiedCqpId(), ICqiClient.CQI_CONST_FIELD_TARGET);
 		int nbresults = result.getNMatch();
@@ -429,7 +429,7 @@
 	 * @return the lines
 	 */
 	public List<Line> getLines(int start, int end) {
-		long time = System.currentTimeMillis();
+	//	long time = System.currentTimeMillis();
 		List<Line> selectedLines = new ArrayList<Line>();
 		if (lines.size() > 0) {
 			start = Math.max(0, start);
@@ -549,7 +549,7 @@
 	 * @param Fmax the fmax
 	 */
 	public void filterLines(int Fmin, int Fmax) {
-		int before = lines.size();
+		//int before = lines.size();
 		for (int i = 0; i < lines.size(); i++)// for each line
 		{
 			Line line = lines.get(i);
@@ -577,7 +577,7 @@
 	public void cut(int vmax) {
 		this.acquireSemaphore();
 		// assume the lines are sorted
-		int before = lines.size();
+		//int before = lines.size();
 		this.lines = this.lines.subList(0, Math.min(lines.size(), vmax));
 		this.FilterVmax = vmax;
 		updateFminFmax();
Index: tmp/org.txm.utils/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.utils/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.utils/META-INF/MANIFEST.MF	(revision 452)
@@ -3,7 +3,7 @@
 Bundle-Name: org.txm.utils
 Bundle-SymbolicName: org.txm.utils
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.osgi.util;bundle-version="3.3.0";visibility:=reexport,
+Require-Bundle: org.eclipse.osgi.util;bundle-version="3.3.0",
  org.eclipse.core.runtime,
  org.txm.libs.saxon;bundle-version="9.0.0";visibility:=reexport,
  org.eclipse.core.net;bundle-version="1.2.200"
Index: tmp/org.txm.cooccurrence.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.cooccurrence.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.cooccurrence.core/META-INF/MANIFEST.MF	(revision 452)
@@ -3,14 +3,17 @@
 Bundle-Name: Cooccurrence Core
 Bundle-SymbolicName: org.txm.cooccurrence.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.txm.concordance.core;bundle-version="1.0.0",
- org.txm.core;bundle-version="0.7.0";visibility:=reexport,
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.concordance.core;bundle-version="1.0.0",
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.txm.core;bundle-version="0.7.0",
  org.txm.lexicaltable.core,
  org.txm.specificities.core;bundle-version="1.0.0",
- org.eclipse.core.runtime,
  org.txm.index.core;bundle-version="1.0.0",
- org.txm.searchengine.core;bundle-version="1.0.0";visibility:=reexport,
- org.txm.searchengine.cqp.core;bundle-version="1.1.0";visibility:=reexport
+ org.txm.searchengine.core;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.txm.cooccurrence.core.functions,
Index: tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java
===================================================================
--- tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java	(revision 451)
+++ tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java	(revision 452)
@@ -631,7 +631,7 @@
 		//System.out.println("T counts : "+(System.currentTimeMillis()- time)); //$NON-NLS-1$
 		
 		allsignaturesstr = null; // no more need
-		counted = null;
+//		counted = null;
 		return true;
 	}
 
@@ -1012,7 +1012,6 @@
 			monitor.worked(10);
 			this.releaseSemaphore();
 			
-			this.clearMemory();
 		}
 		// user canceling
 		catch(ThreadDeath e) {
@@ -1040,7 +1039,7 @@
 				this.getIntParameterValue(CooccurrencePreferences.MIN_RIGHT),
 				this.getIntParameterValue(CooccurrencePreferences.MAX_RIGHT),
 				this.getIntParameterValue(CooccurrencePreferences.MIN_FREQ),
-				this.getIntParameterValue(CooccurrencePreferences.MIN_SCORE),
+				this.getDoubleParameterValue(CooccurrencePreferences.MIN_SCORE),
 				this.getIntParameterValue(CooccurrencePreferences.MIN_COUNT),
 				this.getBooleanParameterValue(CooccurrencePreferences.INCLUDE_X_PIVOT),
 				this.getBooleanParameterValue(CooccurrencePreferences.PARTIAL_LEXICAL_TABLE)))	{
@@ -1802,7 +1801,16 @@
 
 	@Override
 	public String getSimpleName() {
-		return query + " (" + (maxLeft-1) + ", " + (maxRight-1) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+		String output = "";
+		
+		if(query != null)	{
+			output += query.getQueryString();
+		}
+		
+		if(maxLeft > 0 && maxRight > 0)	{
+			output += " (" + (maxLeft-1) + ", " + (maxRight-1) + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
+		}
+		return output;
 	}
 
 	@Override
Index: tmp/org.txm.textsbalance.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.textsbalance.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.textsbalance.core/META-INF/MANIFEST.MF	(revision 452)
@@ -8,7 +8,8 @@
  org.txm.textsbalance.core.chartsengine.r,
  org.txm.textsbalance.core.functions,
  org.txm.textsbalance.core.preferences
-Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
  org.eclipse.core.runtime;bundle-version="3.10.0",
  org.txm.core;bundle-version="0.7.0",
  org.txm.chartsengine.core;bundle-version="1.0.0",
Index: tmp/org.txm.statsengine.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.statsengine.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.statsengine.core/META-INF/MANIFEST.MF	(revision 452)
@@ -8,8 +8,9 @@
  org.txm.statsengine.core.data,
  org.txm.statsengine.core.messages,
  org.txm.statsengine.core.utils
-Require-Bundle: org.txm.core;bundle-version="0.7.0",
- org.txm.utils;bundle-version="1.0.0",
- org.eclipse.core.runtime;bundle-version="3.10.0"
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.core;bundle-version="0.7.0"
 Bundle-Vendor: Textometrie.org
 Import-Package: org.eclipse.osgi.util
Index: tmp/org.txm.lexicaltable.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.lexicaltable.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.lexicaltable.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -3,17 +3,21 @@
 Bundle-Name: Lexical Table RCP
 Bundle-SymbolicName: org.txm.lexicaltable.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.txm.index.core;bundle-version="1.0.0",
+Require-Bundle: org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.ui;bundle-version="3.106.1",
+ org.txm.libs.batik,
+ org.txm.statsengine.core;bundle-version="1.0.0",
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.txm.statsengine.r.rcp,
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.index.core;bundle-version="1.0.0",
  org.txm.ca.core;bundle-version="1.0.0",
  org.txm.core,
  org.txm.lexicaltable.core;bundle-version="1.0.0",
- org.eclipse.core.runtime,
  org.txm.rcp,
- org.eclipse.ui;bundle-version="3.106.1",
- org.txm.statsengine.r.rcp,
- org.eclipse.core.expressions;bundle-version="3.4.600",
- org.txm.statsengine.core;bundle-version="1.0.0",
- org.txm.statsengine.r.core;bundle-version="1.0.0"
+ org.eclipse.core.expressions;bundle-version="3.4.600"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.txm.lexicaltable.rcp.adapters,
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LineLabelProvider.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LineLabelProvider.java	(revision 451)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LineLabelProvider.java	(revision 452)
@@ -34,7 +34,6 @@
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
-import org.txm.cooccurrence.rcp.preferences.CoocPreferencePage;
 import org.txm.lexicaltable.core.functions.LexicalTable;
 import org.txm.rcp.TxmPreferences;
 
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java	(revision 451)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/ComputeLexicalTable.java	(revision 452)
@@ -52,15 +52,14 @@
 import org.txm.lexicaltable.core.functions.LexicalTable;
 import org.txm.lexicaltable.core.functions.LexicalTableFactory;
 import org.txm.lexicaltable.core.preferences.LexicalTablePreferences;
-import org.txm.lexicaltable.core.statsengine.data.ILexicalTable;
 import org.txm.lexicaltable.core.statsengine.r.data.LexicalTableImpl;
 import org.txm.lexicaltable.rcp.editors.LexicalTableDialog;
 import org.txm.lexicaltable.rcp.editors.LexicalTableEditor2;
 import org.txm.lexicaltable.rcp.editors.LexicalTableEditorInput;
-import org.txm.rcp.handlers.BaseAbstractHandler;
 import org.txm.rcp.JobsTimer;
 import org.txm.rcp.Messages;
 import org.txm.rcp.StatusLine;
+import org.txm.rcp.handlers.BaseAbstractHandler;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.rcp.views.QueriesView;
 import org.txm.rcp.views.corpora.CorporaView;
Index: tmp/org.txm.cah.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.cah.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.cah.core/META-INF/MANIFEST.MF	(revision 452)
@@ -3,14 +3,16 @@
 Bundle-Name: CAH Core
 Bundle-SymbolicName: org.txm.cah.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.txm.ca.core;bundle-version="1.0.0",
- org.eclipse.core.runtime,
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.txm.ca.core;bundle-version="1.0.0",
  org.txm.core;bundle-version="0.7.0",
  org.txm.chartsengine.r.core;bundle-version="1.0.0",
  org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
- org.txm.lexicaltable.core;bundle-version="1.0.0",
- org.txm.statsengine.core;bundle-version="1.0.0",
- org.txm.statsengine.r.core;bundle-version="1.0.0"
+ org.txm.lexicaltable.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.txm.cah.core.chartsengine.jfreechart,
Index: tmp/org.txm.index.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.index.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.index.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,14 +4,18 @@
 Bundle-SymbolicName: org.txm.index.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.lexicon.core;bundle-version="1.0.0",
+ org.txm.statsengine.core;bundle-version="1.0.0",
+ org.txm.statsengine.r.core;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
  org.txm.core;bundle-version="0.7.0",
  org.txm.index.core;bundle-version="1.0.0",
  org.txm.statsengine.r.rcp,
  org.eclipse.ui;bundle-version="3.106.1",
- org.eclipse.core.runtime;bundle-version="3.10.0",
  org.txm.rcp,
- org.txm.statsengine.r.core;bundle-version="1.0.0",
  org.eclipse.core.expressions;bundle-version="3.4.600",
  org.txm.searchengine.core;bundle-version="1.0.0"
 Export-Package: org.txm.index.rcp.adapters,
Index: tmp/org.txm.progression.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.progression.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.progression.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -4,7 +4,15 @@
 Bundle-SymbolicName: org.txm.progression.rcp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+Require-Bundle: org.txm.utils,
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.ui;bundle-version="3.106.1",
+ org.eclipse.e4.ui.workbench;bundle-version="1.2.2",
+ org.txm.concordance.core;bundle-version="1.0.0",
+ org.txm.concordance.rcp,
+ org.txm.synopticeditor.rcp,
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
  org.txm.progression.core;bundle-version="1.0.0",
  org.txm.chartsengine.svgbatik.rcp;bundle-version="1.0.0",
  org.txm.lexicaltable.rcp;bundle-version="1.0.0",
@@ -16,10 +24,7 @@
  org.txm.core;bundle-version="0.7.0",
  org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
  org.txm.rcp,
- org.eclipse.core.runtime;bundle-version="3.10.0",
- org.txm.synopticeditor.rcp,
  org.eclipse.core.expressions;bundle-version="3.4.600",
- org.txm.concordance.rcp,
  org.txm.searchengine.core;bundle-version="1.0.0"
 Export-Package: org.txm.progression.rcp.adapters,
  org.txm.progression.rcp.chartsengine.events,
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java	(revision 451)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/handlers/ComputeProgression.java	(revision 452)
@@ -37,7 +37,6 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.handlers.HandlerUtil;
-import org.txm.Toolbox;
 import org.txm.chartsengine.core.ChartsEngine;
 import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
 import org.txm.chartsengine.r.core.RChartsEngine;
@@ -50,16 +49,17 @@
 import org.txm.progression.core.preferences.ProgressionPreferences;
 import org.txm.progression.rcp.dialogs.ProgressionDialog;
 import org.txm.progression.rcp.forms.ProgressionParametersComposite;
-import org.txm.rcp.handlers.BaseAbstractHandler;
 import org.txm.rcp.JobsTimer;
 import org.txm.rcp.Messages;
 import org.txm.rcp.StatusLine;
+import org.txm.rcp.handlers.BaseAbstractHandler;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.rcp.views.corpora.CorporaView;
 import org.txm.searchengine.cqp.CQPEngine;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.utils.logger.Log;
 
+
 /**
  * Open the ProgressionDialog, computes and opens the result editor part.
  * 
@@ -151,6 +151,7 @@
 
 			// FIXME: tests parameters composite extension
 			// Contribute to the tool bar without extending ChartEditorPart
+			// FIXME: finally, would be better to create a ProgressionEditor
 			if(!editor.wasAlreadyOpened())	{
 				new ProgressionParametersComposite(editor.getCommandParametersGroup(), SWT.NONE);
 				editor.getCommandParametersGroup().pack();
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java	(revision 451)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/functions/PartitionDimensions.java	(revision 452)
@@ -9,8 +9,6 @@
 import java.util.List;
 
 import org.txm.chartsengine.core.results.ChartResult;
-import org.txm.core.results.TXMParameters;
-import org.txm.functions.ProgressWatcher;
 import org.txm.partition.core.messages.PartitionCoreMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
@@ -27,7 +25,7 @@
 
 	
 	/**
-	 * Creates a partition dimensions result from the specified <code>Partition</code>.
+	 * Creates a partition dimensions result from the specified <link>Partition</link>.
 	 */
 	public PartitionDimensions(Partition partition) {
 		super(partition);
Index: tmp/org.txm.partition.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.partition.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.partition.core/META-INF/MANIFEST.MF	(revision 452)
@@ -3,9 +3,12 @@
 Bundle-Name: Partition Core
 Bundle-SymbolicName: org.txm.partition.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.txm.chartsengine.core,
+Require-Bundle: org.txm.utils;bundle-version="1.0.0",
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.txm.chartsengine.core,
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
  org.txm.core;bundle-version="0.7.0",
- org.eclipse.core.runtime,
  org.txm.chartsengine.jfreechart.core;bundle-version="1.0.0",
  org.txm.chartsengine.r.core;bundle-version="1.0.0",
  org.txm.lexicaltable.core;bundle-version="1.0.0"
Index: tmp/org.txm.chartsengine.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.chartsengine.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.chartsengine.core/META-INF/MANIFEST.MF	(revision 452)
@@ -3,9 +3,9 @@
 Bundle-Name: Charts Engine Core
 Bundle-SymbolicName: org.txm.chartsengine.core;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.txm.utils;visibility:=reexport,
- org.txm.core;bundle-version="0.7.0";visibility:=reexport,
- org.eclipse.core.runtime;visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime,
+ org.txm.utils,
+ org.txm.core;bundle-version="0.7.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.txm.chartsengine.core,
Index: tmp/org.txm.concordance.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.concordance.rcp/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.concordance.rcp/META-INF/MANIFEST.MF	(revision 452)
@@ -5,13 +5,18 @@
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Textometrie.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+Require-Bundle: org.txm.annotation.core;bundle-version="1.0.0",
+ org.eclipse.core.runtime;bundle-version="3.10.0",
+ org.eclipse.ui;bundle-version="3.106.1",
+ org.txm.cooccurrence.core;bundle-version="1.0.0",
+ org.txm.cooccurrence.rcp;bundle-version="1.0.0",
+ org.txm.searchengine.cqp.core;bundle-version="1.1.0",
+ org.eclipse.e4.ui.workbench;bundle-version="1.2.2",
  org.txm.concordance.core,
+ org.txm.utils;bundle-version="1.0.0",
+ org.txm.core,
  org.txm.rcp,
- org.eclipse.ui;bundle-version="3.106.1",
- org.eclipse.core.runtime;bundle-version="3.10.0",
  org.eclipse.core.expressions;bundle-version="3.4.600",
- org.txm.core,
  org.txm.para.rcp,
  org.txm.searchengine.core;bundle-version="1.0.0"
 Export-Package: org.txm.concordance.rcp.adapters,
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComputeCoocFromLines.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComputeCoocFromLines.java	(revision 451)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/actions/ComputeCoocFromLines.java	(revision 452)
@@ -86,7 +86,9 @@
 	 * @see org.eclipse.jface.action.Action#run()
 	 */
 	@Override
+	@Deprecated
 	public void run() {
+		//FIXME: should call the ComputeCooccurrence command with some TXMParameters as RCP parametrized command
 		TableViewer table = concordanceEditor.getLineTableViewer();
 		Cooccurrence cooc = ComputeCooccurrences
 				.computeCooc((IStructuredSelection) table.getSelection());
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java	(revision 451)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java	(revision 452)
@@ -31,13 +31,6 @@
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.e4.ui.model.application.ui.advanced.MPerspective;
-import org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveStackImpl;
-import org.eclipse.e4.ui.model.application.ui.advanced.impl.PlaceholderImpl;
-import org.eclipse.e4.ui.model.application.ui.basic.MPartSashContainerElement;
-import org.eclipse.e4.ui.model.application.ui.basic.MStackElement;
-import org.eclipse.e4.ui.model.application.ui.basic.impl.PartSashContainerImpl;
-import org.eclipse.e4.ui.model.application.ui.basic.impl.PartStackImpl;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PartInitException;
@@ -192,34 +185,34 @@
 		return true;
 	}
 
-
-	private static void printChildren(Object o, String space) {
-
-		System.out.println(space+o.getClass().getSimpleName()+": "+o);
-		
-		if (o instanceof PlaceholderImpl) {
-			PlaceholderImpl phi = (PlaceholderImpl)o;
-			System.out.println("phi: "+phi);
-		} else if (o instanceof PartSashContainerImpl) {
-			PartSashContainerImpl psci = (PartSashContainerImpl)o;
-			for (MPartSashContainerElement e :psci.getChildren()) {
-				printChildren(e, space+" ");
-			}
-		} else if (o instanceof PerspectiveStackImpl) {
-			PerspectiveStackImpl psi = (PerspectiveStackImpl)o;
-			for (MPerspective p : psi.getChildren()) {
-				printChildren(p,space+" ");
-			}
-		} else if (o instanceof MPerspective) {
-			MPerspective p = (MPerspective)o;
-			for (MPartSashContainerElement e : p.getChildren()) {
-				printChildren(e, space+" ");
-			}
-		} else if (o instanceof PartStackImpl) {
-			PartStackImpl psi = (PartStackImpl)o;
-			for (MStackElement e : psi.getChildren()) {
-				printChildren(e, space+" ");
-			}
-		}
-	}
+// FIXME: tests
+//	private static void printChildren(Object o, String space) {
+//
+//		System.out.println(space+o.getClass().getSimpleName()+": "+o);
+//		
+//		if (o instanceof PlaceholderImpl) {
+//			PlaceholderImpl phi = (PlaceholderImpl)o;
+//			System.out.println("phi: "+phi);
+//		} else if (o instanceof PartSashContainerImpl) {
+//			PartSashContainerImpl psci = (PartSashContainerImpl)o;
+//			for (MPartSashContainerElement e :psci.getChildren()) {
+//				printChildren(e, space+" ");
+//			}
+//		} else if (o instanceof PerspectiveStackImpl) {
+//			PerspectiveStackImpl psi = (PerspectiveStackImpl)o;
+//			for (MPerspective p : psi.getChildren()) {
+//				printChildren(p,space+" ");
+//			}
+//		} else if (o instanceof MPerspective) {
+//			MPerspective p = (MPerspective)o;
+//			for (MPartSashContainerElement e : p.getChildren()) {
+//				printChildren(e, space+" ");
+//			}
+//		} else if (o instanceof PartStackImpl) {
+//			PartStackImpl psi = (PartStackImpl)o;
+//			for (MStackElement e : psi.getChildren()) {
+//				printChildren(e, space+" ");
+//			}
+//		}
+//	}
 }
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/functions/diagnostic/Diagnostic.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/functions/diagnostic/Diagnostic.java	(revision 451)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/functions/diagnostic/Diagnostic.java	(revision 452)
@@ -43,7 +43,7 @@
 
 import org.eclipse.osgi.util.NLS;
 import org.txm.core.messages.TXMCoreMessages;
-import org.txm.functions.Function;
+import org.txm.functions.TXMCommand;
 import org.txm.objects.Base;
 import org.txm.searchengine.cqp.AbstractCqiClient;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
@@ -60,7 +60,7 @@
 /**
  * compute a diagnostic of Corpus, sub corpus and partition @ author mdecorde.
  */
-public class Diagnostic extends Function {
+public class Diagnostic extends TXMCommand {
 	// Base base;
 	/** The corpus. */
 	Corpus corpus;
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CorpusManager.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CorpusManager.java	(revision 451)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/CorpusManager.java	(revision 452)
@@ -30,7 +30,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.persistence.annotations.Structure;
 import org.txm.Toolbox;
 import org.txm.core.messages.TXMCoreMessages;
 import org.txm.searchengine.cqp.AbstractCqiClient;
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java	(revision 451)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Partition.java	(revision 452)
@@ -42,7 +42,6 @@
 import java.util.TreeMap;
 
 import org.eclipse.osgi.util.NLS;
-import org.txm.Toolbox;
 import org.txm.core.messages.TXMCoreMessages;
 import org.txm.objects.TxmObject;
 import org.txm.searchengine.cqp.CQPEngine;
@@ -57,6 +56,7 @@
 /**
  * A partition on a corpus.
  *
+ * @author mdecorde
  * @author sjacquot 
  * @author Jean-Philippe Magué
  * 
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Corpus.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Corpus.java	(revision 451)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/corpus/Corpus.java	(revision 452)
@@ -36,7 +36,7 @@
 
 import org.eclipse.osgi.util.NLS;
 import org.txm.core.messages.TXMCoreMessages;
-import org.txm.core.results.ITXMResult;
+import org.txm.core.results.TXMResult;
 import org.txm.functions.selection.SelectionResult;
 import org.txm.objects.Base;
 import org.txm.objects.TxmObject;
@@ -965,8 +965,8 @@
 	/* (non-Javadoc)
 	 * @see org.txm.HasResults#getSubHasResults()
 	 */
-	public ArrayList<ITXMResult> getSubHasResults() {
-		ArrayList<ITXMResult> subresults = new ArrayList<ITXMResult>();
+	public ArrayList<TXMResult> getSubHasResults() {
+		ArrayList<TXMResult> subresults = new ArrayList<TXMResult>();
 		subresults.addAll(this.getSubcorpora());
 		subresults.addAll(this.getPartitions());
 		return subresults;
@@ -1312,9 +1312,9 @@
 		return cql_limit_query;
 	}
 
-	public ArrayList<ITXMResult> clearResults() {
-		ArrayList<ITXMResult> old = this.children;
-		this.children = new ArrayList<ITXMResult>();
+	public ArrayList<TXMResult> clearResults() {
+		ArrayList<TXMResult> old = this.children;
+		this.children = new ArrayList<TXMResult>();
 		return old;
 	}
 }
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/clientExceptions/CqiClientException.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/clientExceptions/CqiClientException.java	(revision 451)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/clientExceptions/CqiClientException.java	(revision 452)
@@ -27,8 +27,6 @@
 //
 package org.txm.searchengine.cqp.clientExceptions;
 
-import org.txm.Toolbox;
-import org.txm.searchengine.cqp.CQPEngine;
 
 // TODO: Auto-generated Javadoc
 /**
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 451)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/MemCqiServer.java	(revision 452)
@@ -167,7 +167,7 @@
 				isLoaded = true;
 
 			} catch (Throwable e) {
-				System.err.println("Failed to load CQP lib with exception: "+e);
+				System.err.println("MemCqiServer: Failed to load CQP lib with exception: "+e);
 				System.err.println("Looking for Cqi libs in : "+System.getProperty("java.library.path")); 
 				System.err.println("Current directory: "+new File(".").getAbsolutePath());
 				throw new Exception(e);
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPEngine.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPEngine.java	(revision 451)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPEngine.java	(revision 452)
@@ -42,17 +42,17 @@
 
 		boolean cqiserverok = false;
 		
-		useNetCQi = Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_NETWORK_MODE));
+		useNetCQi = Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.CQI_NETWORK_MODE, TBXPreferences.PREFERENCES_NODE));
 
 		Log.warning("Killing CQP and RServe process if any");
 		killSearchEngine();
 
 		
-		boolean remote = Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_IS_REMOTE));
+		boolean remote = Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.CQI_SERVER_IS_REMOTE, TBXPreferences.PREFERENCES_NODE));
 		state = false;
 		// test if must-have properties for CWB are set
 
-		String exec_path = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PATH_TO_EXECUTABLE);
+		String exec_path = TXMPreferences.getString(TBXPreferences.CQI_SERVER_PATH_TO_EXECUTABLE, TBXPreferences.PREFERENCES_NODE);
 		String reg_path = ""; // new way that concats registry of loaded corpus
 		String path_separator = System.getProperty("path.separator");
 		for (Base b : Toolbox.workspace.getProject("default").getBases()) {
@@ -78,7 +78,7 @@
 		}
 		if (reg_path.length() > 0) reg_path = reg_path.substring(path_separator.length()); // remove first path_separator
 		//System.out.println("REGPATH="+reg_path);
-		String init_path = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PATH_TO_INIT_FILE);
+		String init_path = TXMPreferences.getString(TBXPreferences.CQI_SERVER_PATH_TO_INIT_FILE, TBXPreferences.PREFERENCES_NODE);
 
 
 		if (!remote) {
@@ -92,9 +92,9 @@
 						cqiServer = new MemCqiServer(exec_path,
 								reg_path, 
 								init_path, 
-								TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_ADDITIONAL_OPTIONS)
-								+ " -P " + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT), //$NON-NLS-1$
-								Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_MONITOR_OUTPUT)));
+								TXMPreferences.getString(TBXPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, TBXPreferences.PREFERENCES_NODE)
+								+ " -P " + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE), //$NON-NLS-1$
+								Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.CQI_SERVER_MONITOR_OUTPUT, TBXPreferences.PREFERENCES_NODE)));
 					} catch (Exception e) {
 						// TODO Auto-generated catch block
 						org.txm.utils.logger.Log.printStackTrace(e);
@@ -103,9 +103,9 @@
 					cqiServer = new NetCqiServer(exec_path,
 							reg_path, 
 							init_path, 
-							TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_ADDITIONAL_OPTIONS)
-							+ " -P " + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT), //$NON-NLS-1$
-							Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_MONITOR_OUTPUT)));
+							TXMPreferences.getString(TBXPreferences.CQI_SERVER_ADDITIONAL_OPTIONS, TBXPreferences.PREFERENCES_NODE)
+							+ " -P " + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE), //$NON-NLS-1$
+							Boolean.parseBoolean(TXMPreferences.getString(TBXPreferences.CQI_SERVER_MONITOR_OUTPUT, TBXPreferences.PREFERENCES_NODE)));
 				}
 				if (cqiServer != null)
 					cqiserverok = cqiServer.start();
@@ -123,22 +123,23 @@
 						cqiserverok = false;
 					}
 				} else {
-					int port = Integer.parseInt(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT));
-					String host = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_HOST);
+					int port = Integer.parseInt(TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE));
+					String host = TXMPreferences.getString(TBXPreferences.CQI_SERVER_HOST, TBXPreferences.PREFERENCES_NODE);
 					cqiClient = new NetCqiClient(host, port);
 				}
 			}
 		} catch (NumberFormatException e1) {
-			Log.severe(TXMCoreMessages.Toolbox_wrong_port + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT)); 
+			Log.severe(TXMCoreMessages.Toolbox_wrong_port + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE)); 
 		} catch (ServerNotFoundException e1) {
-			Log.severe(TXMCoreMessages.Error_CONNECTION_FAILED + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_HOST) + TXMCoreMessages.Toolbox_27 + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT)); 
+			Log.severe(TXMCoreMessages.Error_CONNECTION_FAILED + TXMPreferences.getString(TBXPreferences.CQI_SERVER_HOST, TBXPreferences.PREFERENCES_NODE)
+					+ TXMCoreMessages.Toolbox_27 + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE)); 
 		}
 
 		// try connecting to the CWB server
 		try {
 			if (cqiserverok) {
-				String login = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_LOGIN);
-				String password = TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PASSWORD);
+				String login = TXMPreferences.getString(TBXPreferences.CQI_SERVER_LOGIN, TBXPreferences.PREFERENCES_NODE);
+				String password = TXMPreferences.getString(TBXPreferences.CQI_SERVER_PASSWORD, TBXPreferences.PREFERENCES_NODE);
 				state = cqiClient.connect(login, password);
 			}
 		} catch (Exception e1) {
@@ -147,10 +148,10 @@
 
 		if (state == false) {
 			System.out.println(TXMCoreMessages.Toolbox_29); 
-			System.out.println(TXMCoreMessages.Toolbox_30 + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_LOGIN) 
-					+ " " + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PASSWORD) 
-					+ TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_HOST) 
-					+ " " + Integer.parseInt(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT))); //$NON-NLS-1$ //$NON-NLS-2$
+			System.out.println(TXMCoreMessages.Toolbox_30 + TXMPreferences.getString(TBXPreferences.CQI_SERVER_LOGIN, TBXPreferences.PREFERENCES_NODE) 
+					+ " " + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PASSWORD, TBXPreferences.PREFERENCES_NODE)  //$NON-NLS-1$
+					+ TXMPreferences.getString(TBXPreferences.CQI_SERVER_HOST, TBXPreferences.PREFERENCES_NODE) 
+					+ " " + Integer.parseInt(TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE))); //$NON-NLS-1$
 			if (cqiServer != null)
 				System.out.println(TXMCoreMessages.Toolbox_33 + cqiServer.getLastCmdLine());
 		} else {
@@ -298,7 +299,7 @@
 	 * kill cqpserver process.
 	 */
 	private static void killSearchEngine() {
-		if ("false".equals(TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_IS_REMOTE))) //$NON-NLS-1$
+		if (!TXMPreferences.getBoolean(TBXPreferences.CQI_SERVER_IS_REMOTE, TBXPreferences.PREFERENCES_NODE))
 			// Windows OS
 			if (OSDetector.isFamilyWindows()) {
 				try {
@@ -331,7 +332,7 @@
 			}
 		// Mac, Linux
 			else {
-				String cmd = TXMCoreMessages.Toolbox_37 + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.CQI_SERVER_PORT) + TXMCoreMessages.Toolbox_38;
+				String cmd = TXMCoreMessages.Toolbox_37 + TXMPreferences.getString(TBXPreferences.CQI_SERVER_PORT, TBXPreferences.PREFERENCES_NODE) + TXMCoreMessages.Toolbox_38;
 				try {
 					//Process p = Runtime.getRuntime().exec("killall -9 cqpserver"); //$NON-NLS-1$
 					// System.out.println("kill `ps aux | grep cqpserver | awk '/-P "
Index: tmp/org.txm.searchengine.cqp.core/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.searchengine.cqp.core/META-INF/MANIFEST.MF	(revision 451)
+++ tmp/org.txm.searchengine.cqp.core/META-INF/MANIFEST.MF	(revision 452)
@@ -7,7 +7,8 @@
  org.eclipse.core.runtime,
  org.txm.core;bundle-version="0.7.0",
  org.txm.searchengine.core;bundle-version="1.0.0",
- org.txm.libs.cqp;bundle-version="1.0.0"
+ org.txm.libs.cqp;bundle-version="1.0.0",
+ org.txm.utils;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: res/,
  .
