Index: tmp/org.txm.tigersearch.rcp/src/org/txm/function/tigersearch/TSIndex.java
===================================================================
--- tmp/org.txm.tigersearch.rcp/src/org/txm/function/tigersearch/TSIndex.java	(revision 722)
+++ tmp/org.txm.tigersearch.rcp/src/org/txm/function/tigersearch/TSIndex.java	(revision 723)
@@ -4,7 +4,6 @@
 import ims.tiger.corpus.Node;
 import ims.tiger.corpus.Sentence;
 import ims.tiger.corpus.T_Node;
-import ims.tiger.gui.tigergraphviewer.draw.Display_Sentence;
 import ims.tiger.gui.tigergraphviewer.forest.ResultForest;
 import ims.tiger.query.api.MatchResult;
 import ims.tiger.query.internalapi.InternalCorpusQueryManager;
@@ -18,27 +17,21 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
-import org.txm.Toolbox;
 import org.txm.index.core.functions.Index;
 import org.txm.index.core.functions.Line;
 import org.txm.searchengine.cqp.AbstractCqiClient;
 import org.txm.searchengine.cqp.CQPEngine;
-import org.txm.searchengine.cqp.ICqiClient;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
-import org.txm.searchengine.cqp.clientExceptions.UnexpectedAnswerException;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.CorpusManager;
 import org.txm.searchengine.cqp.corpus.Partition;
 import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.searchengine.cqp.corpus.QueryResult;
 import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
 import org.txm.searchengine.cqp.corpus.query.Match;
-import org.txm.searchengine.cqp.corpus.query.MatchUtils;
 import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.searchengine.cqp.serverException.CqiServerError;
 import org.txm.searchengine.ts.TSCorpus;
 import org.txm.searchengine.ts.TSCorpusManager;
-import org.txm.searchengine.ts.TSMatch;
 import org.txm.searchengine.ts.TSResult;
 import org.txm.utils.logger.Log;
 
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java	(revision 722)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/IndexEditor.java	(revision 723)
@@ -30,20 +30,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormLayout;
@@ -52,40 +44,29 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Spinner;
 import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
 import org.txm.core.messages.TXMCoreMessages;
-import org.txm.core.preferences.TXMPreferences;
-import org.txm.core.results.TXMResult;
+import org.txm.core.results.Parameter;
 import org.txm.index.core.functions.Index;
 import org.txm.index.core.functions.Line;
 import org.txm.index.core.functions.LineComparator.SortMode;
 import org.txm.index.core.preferences.IndexPreferences;
 import org.txm.index.rcp.messages.IndexUIMessages;
-import org.txm.rcp.JobsTimer;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.TXMEditor;
-import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.editors.TableKeyListener;
+import org.txm.rcp.editors.listeners.ComputeKeyListener;
+import org.txm.rcp.editors.listeners.ComputeSelectionListener;
 import org.txm.rcp.messages.TXMUIMessages;
-import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.swt.widget.AssistedQueryWidget;
 import org.txm.rcp.swt.widget.NavigationWidget;
 import org.txm.rcp.swt.widget.PropertiesSelector;
-import org.txm.rcp.utils.JobHandler;
 import org.txm.rcp.views.QueriesView;
-import org.txm.searchengine.cqp.CQPEngine;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Property;
-import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
 import org.txm.searchengine.cqp.corpus.WordProperty;
 import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.statsengine.r.rcp.views.RVariablesView;
@@ -105,26 +86,10 @@
 	/** The query label. */
 	protected Label queryLabel;
 
-	/** The query widget. */
-	protected AssistedQueryWidget queryWidget;
-
 	/** The go. */
-	protected Button go;
+	protected Button searchButton;
 
-	/** The props area. */
-	protected PropertiesSelector<Property> propsArea;
-	// seuils
-	/** The Fmin spinner. */
-	protected Spinner fMinSpinner;
 
-	/** The Fmax spinner. */
-	protected Spinner fMaxSpinner;
-
-	/** The Tmax spinner. */
-	protected Spinner vMaxSpinner;
-
-	/** The N ligne p page spinner. */
-	protected Spinner nLinesPerPageSpinner;
 	// infos
 	/** The navigation area. */
 	protected NavigationWidget navigationArea;
@@ -160,112 +125,35 @@
 	/** The title. */
 	String title;
 
+	
+	
+	/** The query widget. */
+	@Parameter(key=IndexPreferences.QUERY)
+	protected AssistedQueryWidget queryWidget;
 
-	/**
-	 * Inits the editor result.
-	 *
-	 * @param site the site
-	 * @param input the input
-	 * @throws PartInitException the part init exception
-	 * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite,
-	 * org.eclipse.ui.IEditorInput)
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		super.init(site, input);
+	/** The Fmin spinner. */
+	@Parameter(key=IndexPreferences.F_MIN)
+	protected Spinner fMinSpinner;
 
-		TXMResult result = ((TXMResultEditorInput) input).getResult();
-		if (result != null && result instanceof Index) {
-			this.index = (Index) result;
-		}
-		else { 
-			throw new PartInitException("TXMResult input is not an Index: " + result);
-		}
-	}
+	/** The Fmax spinner. */
+	@Parameter(key=IndexPreferences.F_MAX)
+	protected Spinner fMaxSpinner;
 
+	/** The Tmax spinner. */
+	@Parameter(key=IndexPreferences.V_MAX)
+	protected Spinner vMaxSpinner;
 
-	@Override
-	public void updateResultFromEditor() {
-		final Query query = new Query("");
-		if (!queryWidget.isDisposed() && !queryWidget.getQueryString().equals("\"\"")) { //$NON-NLS-1$
-			query.setQueryString(queryWidget.getQueryString());
-		}
-
-		final Integer fMin = Integer.parseInt(fMinSpinner.getText());
-		final Integer fMax = Integer.parseInt(fMaxSpinner.getText());
-		final Integer tMax = Integer.parseInt(this.vMaxSpinner.getText());
-		final Integer nLines = Integer.parseInt(this.nLinesPerPageSpinner.getText());
-		final List<Property> properties = propsArea.getSelectedProperties();
-		
-		index.setNLinesPerPage(nLinesPerPageSpinner.getSelection());
-		index.setVMax(vMaxSpinner.getSelection());
-		
-		index.setParameters(query, properties, fMin, fMax, tMax, nLines);
-		index.setDirty();
-	}
-
+	/** The N ligne p page spinner. */
+	@Parameter(key=IndexPreferences.N_LINES_PER_PAGE)
+	protected Spinner nLinesPerPageSpinner;
 	
 	/**
-	 * Computes index.
+	 * Word properties selector.
 	 */
-	@Override
-	public void updateEditorFromResult(final boolean update) {
-		
-		//System.out.println("PROPERTIES: "+properties);
-//		title = "Index...";
-//		try {
-//			JobHandler jobhandler = new JobHandler(title) {
-//				@Override
-//				protected IStatus run(IProgressMonitor monitor) {
-//					this.runInit(monitor);
-//					try {
-//						JobsTimer.start();
-//
-//						monitor.worked(95);
-//						// refresh ui
-//						syncExec(new Runnable() {
-//							@Override
-//							public void run() {
+	@Parameter(key=IndexPreferences.PROPERTIES)
+	protected PropertiesSelector<WordProperty> propertiesSelector;
+	
 
-								QueriesView.refresh();
-								RVariablesView.refresh();
-
-								if (!queryWidget.isDisposed()) {
-									queryWidget.memorize();
-								}
-								
-								fillDisplayArea();
-
-								viewer.getTable().setFocus();
-//							}
-//						});
-//
-//					} catch (ThreadDeath td) {
-//						return Status.CANCEL_STATUS;
-//					} catch (Exception e) {
-//						e.printStackTrace();
-//						System.out.println(e.getLocalizedMessage());
-//						try {
-//							System.out.println(RCPMessages.LastCQPError+CQPEngine.getCqiClient().getLastCQPError());
-//						} catch (Exception e1) {
-//							System.out.println(IndexUIMessages.IndexEditor_10+e1);
-//							org.txm.rcp.utils.Logger.printStackTrace(e1);
-//						}
-//						Log.severe("Error while computing Index: "+e.getLocalizedMessage());
-//					} finally {
-//						monitor.done();
-//						JobsTimer.stopAndPrint();
-//					}
-//					return Status.OK_STATUS;
-//				}
-//			};
-//			jobhandler.startJob();
-//
-//		} catch (Exception e1) {
-//			org.txm.rcp.utils.Logger.printStackTrace(e1);
-//		}
-	}
-
 	/**
 	 * Creates the part control.
 	 *
@@ -274,8 +162,15 @@
 	 */
 	@Override
 	public void _createPartControl(Composite parent) {
-//		super.createPartControl(parent);
 
+		
+		this.index = (Index) this.getResult();
+
+		
+		// Computing listener
+		ComputeSelectionListener computeSelectionListener = new ComputeSelectionListener(this);
+		ComputeKeyListener computeKeyListener = new ComputeKeyListener(this);
+		
 		Composite paramArea = this.getCommandParametersGroup();
 		paramArea.setLayout(new FormLayout());
 
@@ -300,9 +195,8 @@
 		// | Query: [ (v)] [Search] |
 		// Query:
 		queryLabel = new Label(queryArea, SWT.NONE);
-		queryLabel.setText(TXMCoreMessages.QUERY_1);
-		queryLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false,
-				true));
+		queryLabel.setText(TXMCoreMessages.common_query);
+		queryLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, true));
 
 		// [ (v)]
 		queryWidget = new AssistedQueryWidget(queryArea, SWT.DROP_DOWN,	index.getCorpus());
@@ -310,61 +204,38 @@
 		layoutData.horizontalAlignment = GridData.FILL;
 		layoutData.grabExcessHorizontalSpace = true;
 		queryWidget.setLayoutData(layoutData);
+		queryWidget.addKeyListener(computeKeyListener);
 
-		KeyListener listener = new KeyListener() {
-			@Override
-			public void keyPressed(KeyEvent e) {
-				if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
-					updateResultFromEditor();
-					compute(true);
-				}
-			}
-			@Override
-			public void keyReleased(KeyEvent e) {
-			}
-		};
-		queryWidget.addKeyListener(listener);
+		
+		// Word properties selector
+		propertiesSelector = new PropertiesSelector<WordProperty>(queryArea, SWT.NONE);
+		propertiesSelector.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
+		propertiesSelector.setLayout(new GridLayout(3, false));
+		try {
+			propertiesSelector.setProperties(index.getCorpus().getOrderedProperties());
+		}
+		catch (CqiClientException e) {
+			Log.printStackTrace(e);
+		}
+		// Listener
+		propertiesSelector.addSelectionListener(computeSelectionListener);
+		
+		//Search button
+		searchButton = new Button(queryArea, SWT.BOLD);
+		searchButton.setText(TXMUIMessages.SEARCH);
 
-		// select focus properties
-		propsArea = new PropertiesSelector<Property>(queryArea, SWT.NONE);
-		propsArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
-		propsArea.setLayout(new GridLayout(3, false));
-		propsArea.addValueChangeListener(new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				if (!initializing && TXMPreferences.getBoolean(RCPPreferences.AUTO_UPDATE_EDITOR, RCPPreferences.PREFERENCES_NODE)) {
-					updateResultFromEditor();
-					compute(false);
-				}
-			}
-		});
-
-		//propsArea
-		go = new Button(queryArea, SWT.BOLD);
-		go.setText(TXMUIMessages.SEARCH);
-
-		Font f = go.getFont();
+		Font f = searchButton.getFont();
 		FontData defaultFont = f.getFontData()[0];
 		defaultFont.setStyle(SWT.BOLD);
-		Font newf = new Font(go.getDisplay(), defaultFont);
-		go.setFont(newf);
+		Font newf = new Font(searchButton.getDisplay(), defaultFont);
+		searchButton.setFont(newf);
 
 		layoutData = new GridData(GridData.VERTICAL_ALIGN_CENTER);
 		layoutData.horizontalAlignment = GridData.FILL;
 		layoutData.grabExcessHorizontalSpace = false;
-		go.setLayoutData(layoutData);
+		searchButton.setLayoutData(layoutData);
+		searchButton.addSelectionListener(computeSelectionListener);
 
-		SelectionListener listener2 = new SelectionListener() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				updateResultFromEditor();
-				compute(true);
-			}
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) { }
-		};
-		go.addSelectionListener(listener2);
-
 		// Filters
 		Composite filtercontrols = new Composite(paramArea, SWT.NONE);
 		FormData filtersLayoutData = new FormData();
@@ -384,7 +255,7 @@
 		tmp.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		Label lFmin = new Label(filtercontrols, SWT.NONE);
-		lFmin.setText(TXMCoreMessages.FMIN_1);
+		lFmin.setText(TXMCoreMessages.common_fMin);
 		lFmin.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
 
 		GridData fieldsGridData = new GridData(GridData.VERTICAL_ALIGN_END);
@@ -396,7 +267,7 @@
 		fMinSpinner.setIncrement(1);
 		fMinSpinner.setPageIncrement(100);
 		fMinSpinner.setLayoutData(fieldsGridData);
-		fMinSpinner.addKeyListener(listener);
+		fMinSpinner.addKeyListener(computeKeyListener);
 
 		Label lFmax = new Label(filtercontrols, SWT.NONE);
 		lFmax.setText(TXMCoreMessages.FMAX_1);
@@ -408,7 +279,7 @@
 		fMaxSpinner.setIncrement(1);
 		fMaxSpinner.setPageIncrement(100);
 		fMaxSpinner.setLayoutData(fieldsGridData);
-		fMaxSpinner.addKeyListener(listener);
+		fMaxSpinner.addKeyListener(computeKeyListener);
 
 		Label lVmax = new Label(filtercontrols, SWT.NONE);
 		lVmax.setText(TXMCoreMessages.VMAX_1);
@@ -420,7 +291,7 @@
 		vMaxSpinner.setIncrement(1);
 		vMaxSpinner.setPageIncrement(100);
 		vMaxSpinner.setLayoutData(fieldsGridData);
-		vMaxSpinner.addKeyListener(listener);
+		vMaxSpinner.addKeyListener(computeKeyListener);
 
 		Label lNLigneppage = new Label(filtercontrols, SWT.NONE);
 		lNLigneppage.setText(IndexUIMessages.IndexEditor_8);
@@ -440,7 +311,7 @@
 			public void widgetDefaultSelected(SelectionEvent e) {
 				index.setTopLine(0);
 				index.setNLinesPerPage(nLinesPerPageSpinner.getSelection());
-				fillDisplayArea();
+				fillResultArea();
 				viewer.getTable().select(0);
 				viewer.getTable().showSelection();
 			}
@@ -461,7 +332,7 @@
 			public void widgetSelected(SelectionEvent e) {
 				index.setTopLine(0);
 				index.setNLinesPerPage(nLinesPerPageSpinner.getSelection());
-				fillDisplayArea();
+				fillResultArea();
 				viewer.getTable().select(0);
 				viewer.getTable().showSelection();
 			}
@@ -477,7 +348,7 @@
 				int top = i*nLinesPerPageSpinner.getSelection();
 				
 				index.setTopLine(top);
-				fillDisplayArea();
+				fillResultArea();
 				
 				viewer.getTable().select(0);
 				viewer.getTable().showSelection();
@@ -491,7 +362,7 @@
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				index.setTopLine(index.getTopIndex() + index.getNLinesPerPage());
-				fillDisplayArea();
+				fillResultArea();
 				viewer.getTable().select(0);
 				viewer.getTable().showSelection();
 			}
@@ -506,7 +377,7 @@
 				int top = index.getTopIndex() - index.getNLinesPerPage();
 				if (top < 0) { top = 0; }
 				index.setTopLine(top);
-				fillDisplayArea();
+				fillResultArea();
 				viewer.getTable().select(0);
 				viewer.getTable().showSelection();
 			}
@@ -533,8 +404,7 @@
 		FormLayout resultLayout = new FormLayout();
 		resultArea.setLayout(resultLayout);
 
-		viewer = new TableViewer(resultArea, SWT.MULTI
-				| SWT.FULL_SELECTION | SWT.BORDER);
+		viewer = new TableViewer(resultArea, SWT.MULTI | SWT.FULL_SELECTION | SWT.BORDER);
 		viewer.getTable().setLinesVisible(true);
 		viewer.getTable().setHeaderVisible(true);
 		viewer.getTable().addKeyListener(new TableKeyListener(viewer));
@@ -606,7 +476,7 @@
 				}
 
 				StatusLine.setMessage(TXMUIMessages.SORT_DONE);
-				fillDisplayArea();
+				fillResultArea();
 			}
 
 			@Override
@@ -643,7 +513,7 @@
 					}
 				}
 				StatusLine.setMessage(TXMUIMessages.SORT_DONE);
-				fillDisplayArea();
+				fillResultArea();
 			}
 
 			@Override
@@ -673,112 +543,51 @@
 		separatorColumn.setText(""); //$NON-NLS-1$
 		separatorColumn.pack();
 		paramArea.pack();
-		initializeFields();
 
 		// Register the context menu
-		TXMEditor.initContextMenu(this.viewer.getTable(), "IndexEditorContextMenu", this.getSite(), this.viewer); // $NON-NLS-1$
+		TXMEditor.initContextMenu(this.viewer.getTable(), this.getSite(), this.viewer);
 		
-		viewer.getTable().pack();
-		parent.layout(true);
+		
+		if (queryWidget != null && !queryWidget.isDisposed()) {
+			queryWidget.setFocus();
+		}
+
 	}
 
-	/**
-	 * Gets the pointed column.
-	 *
-	 * @param mouseposition the mouseposition
-	 * @return the pointed column
-	 */
-	public int getPointedColumn(Point mouseposition) {
-		int x = mouseposition.x; // + lineTableViewer.getTable().get;
-		int sumWidthColumn = this.nColumn.getWidth();
-		if (x < sumWidthColumn)
-			return 0;
+	
+	
 
-		sumWidthColumn += this.unitColumn.getWidth();
-		if (x < sumWidthColumn)
-			return 1;
-
-		sumWidthColumn += this.freqColumn.getWidth();
-		if (x < sumWidthColumn)
-			return 2;
-
-		return 2;
+	@Override
+	public void updateResultFromEditor() {
+		// nothing to do
 	}
 
-
-
-	boolean initializing = false; // prevent properties widget listener to activate when adding new properties (and refresh the result)
+	
 	/**
-	 * Initialize fields.
+	 * Computes index.
 	 */
-	public void initializeFields() {
-		initializing = true;
+	@Override
+	public void updateEditorFromResult(final boolean update) {
 
-		// query
-		Query q = index.getQuery();
-		if (q != null) {
-			this.queryWidget.memorize(index.getQuery().getQueryString());
-		} else { // no query
-			queryWidget.setText(""); //$NON-NLS-1$
-		}
+		QueriesView.refresh();
+		RVariablesView.refresh();
 
-		// props
-		if (index.getProperties() != null && index.getProperties().size() > 0) {
-			ArrayList<Property> availables = new ArrayList<Property>();
-			try {
-				for (Property p : index.getCorpus().getOrderedProperties())
-					if (!index.getProperties().contains(p))
-						availables.add(p);
-			} catch (CqiClientException e) {
-				org.txm.rcp.utils.Logger.printStackTrace(e);
-				initializing = false;
-			}
-			ArrayList<Property> props = new ArrayList<Property>();
-			props.addAll(index.getProperties());
-			this.propsArea.setProperties(availables, props);
-		} else {
-			this.propsArea.setCorpus(index.getCorpus());
+		if (!queryWidget.isDisposed()) {
+			queryWidget.memorize();
 		}
 
-		// min, max
-		if (index.getFilterFmin() != null) {
-			this.fMinSpinner.setSelection(index.getFilterFmin());
-		} else {
-			this.fMinSpinner.setSelection(this.getIntParameterValue(IndexPreferences.F_MIN));
-		}
+		fillResultArea();
 
-		if (index.getFilterFmax() != null) {
-			this.fMaxSpinner.setSelection(index.getFilterFmax());
-		} else {
-			this.fMaxSpinner.setSelection(this.getIntParameterValue(IndexPreferences.F_MAX));
-		}
+		viewer.getTable().setFocus();
+	}
 
-		if (index.getFilterVmax() != null) {
-			this.vMaxSpinner.setSelection(index.getFilterVmax());
-		} else {
-			this.vMaxSpinner.setSelection(this.getIntParameterValue(IndexPreferences.V_MAX));
-		}
 
-		if (index.getNLinesPerPage() != null) {
-			this.nLinesPerPageSpinner.setSelection(index.getNLinesPerPage());
-		} else {
-			this.nLinesPerPageSpinner.setSelection(this.getIntParameterValue(IndexPreferences.N_LINES_PER_PAGE));
-		}
 
-		queryWidget.setFocus();
-
-		if (queryWidget != null && !queryWidget.isDisposed()) {
-			queryWidget.setFocus();
-		}
-
-		initializing = false;
-	}
-
 	/**
-	 * Fill display area using the index top index and index number of result per page parameters.
+	 * Fill result area using the index top and index number of results per page parameters.
 	 *
 	 */
-	public void fillDisplayArea() {
+	public void fillResultArea() {
 		// System.out.println("call fill from "+from+" to "+to);
 		int from = index.getTopIndex();
 		
@@ -788,8 +597,10 @@
 		List<Line> lines = null;
 		if (index.getV() > 0) {
 			lines = index.getLines(from, to);
-		} else
+		}
+		else {
 			lines = new ArrayList<Line>();
+		}
 
 		navigationArea.setInfoLineText(""+(from + 1), //$NON-NLS-1$
 				"-" + (to) + " / " + index.getV()); //$NON-NLS-1$ //$NON-NLS-2$
@@ -806,23 +617,18 @@
 		lVInfo.getParent().layout();
 
 		String unitColumnHeader = ""; //$NON-NLS-1$
-		for (Property p : index.getProperties())
+		for (Property p : index.getProperties()) {
 			unitColumnHeader += p.getName() + index.getPropertySeparator();
-		if (unitColumnHeader.length() > 0)
-			unitColumnHeader = unitColumnHeader.substring(0, unitColumnHeader
-					.length() - 1);
+		}
+		if (unitColumnHeader.length() > 0) {
+			unitColumnHeader = unitColumnHeader.substring(0, unitColumnHeader.length() - 1);
+		}
 		unitColumn.setText(unitColumnHeader);
 
 		viewer.setInput(lines);
-		viewer.refresh();
 
 		// Refresh and pack the columns
-		viewer.getControl().setRedraw(false);
-		viewer.refresh();
-		for (TableColumn col : viewer.getTable().getColumns()) {
-			col.pack();
-		}
-		viewer.getControl().setRedraw(true);
+		TXMEditor.packColumns(viewer);
 		
 	}
 
Index: tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/DictionnaryEditor.java
===================================================================
--- tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/DictionnaryEditor.java	(revision 722)
+++ tmp/org.txm.index.rcp/src/org/txm/index/rcp/editors/DictionnaryEditor.java	(revision 723)
@@ -20,7 +20,7 @@
 	public void _createPartControl(final Composite parent) {
 		super._createPartControl(parent);
 		
-		this.propsArea.setMaxPropertyNumber(1);
+		this.propertiesSelector.setMaxPropertyNumber(1);
 		this.queryWidget.setText("[]"); //$NON-NLS-1$
 		this.queryWidget.setEnabled(false);
 		this.queryWidget.setVisible(false);
Index: tmp/org.txm.index.rcp/plugin.xml
===================================================================
--- tmp/org.txm.index.rcp/plugin.xml	(revision 722)
+++ tmp/org.txm.index.rcp/plugin.xml	(revision 723)
@@ -113,7 +113,7 @@
          </command>
       </menuContribution>
                <menuContribution
-            locationURI="popup:IndexEditorContextMenu">
+            locationURI="popup:org.txm.index.rcp.editors.IndexEditor">
          <command
                commandId="org.txm.rcp.commands.link.ToConcordance"
                style="push">
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 722)
+++ tmp/org.txm.cooccurrence.rcp/src/org/txm/cooccurrence/rcp/editors/CooccurrencesEditor.java	(revision 723)
@@ -64,6 +64,7 @@
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
+import org.txm.concordance.core.preferences.ConcordancePreferences;
 import org.txm.cooccurrence.core.functions.Cooccurrence;
 import org.txm.cooccurrence.core.functions.comparators.CLineComparator;
 import org.txm.cooccurrence.core.functions.comparators.DistComparator;
@@ -76,10 +77,14 @@
 import org.txm.cooccurrence.rcp.messages.CooccurrenceUIMessages;
 import org.txm.core.messages.TXMCoreMessages;
 import org.txm.core.preferences.TXMPreferences;
+import org.txm.core.results.Parameter;
 import org.txm.core.results.TXMParameters;
 import org.txm.rcp.editors.TXMEditor;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.editors.TableKeyListener;
+import org.txm.rcp.editors.listeners.ComputeKeyListener;
+import org.txm.rcp.editors.listeners.ComputeListener;
+import org.txm.rcp.editors.listeners.ComputeSelectionListener;
 import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.swt.widget.AssistedQueryWidget;
@@ -107,6 +112,7 @@
 
 	// params
 	/** The query widget. */
+	@Parameter(key=CooccurrencePreferences.QUERY)
 	AssistedQueryWidget queryWidget;
 
 	/** The props area. */
@@ -174,7 +180,7 @@
 	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
 		super.init(site, input);
 
-		this.cooc = (Cooccurrence) ((TXMResultEditorInput<Cooccurrence>) input).getResult();
+		this.cooc = (Cooccurrence) ((TXMResultEditorInput<?>) input).getResult();
 	}
 
 	/**
@@ -232,7 +238,7 @@
 		queryArea.setLayout(new GridLayout(3, false));
 
 		Label queryLabel = new Label(queryArea, SWT.NONE);
-		queryLabel.setText(TXMCoreMessages.QUERY_1);
+		queryLabel.setText(TXMCoreMessages.common_query);
 		queryLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, true));
 
 		// [ (v)]
@@ -241,20 +247,8 @@
 		layoutData.horizontalAlignment = GridData.FILL;
 		layoutData.grabExcessHorizontalSpace = true;
 		queryWidget.setLayoutData(layoutData);
-		queryWidget.addKeyListener(new KeyListener() {
-			@Override
-			public void keyPressed(KeyEvent e) {
-				// System.out.println("key pressed : "+e.keyCode);
-				if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
-					cooc.setQuery(queryWidget.getQuery());
-					compute(true);
-				}
-			}
-
-			@Override
-			public void keyReleased(KeyEvent e) { }
-		});
-
+		queryWidget.addKeyListener(new ComputeKeyListener(this));
+		
 //		final Button go = new Button(queryArea, SWT.BOLD);
 //		go.setText(CooccurrenceUIMessages.CooccurrencesEditor_2);
 //
@@ -301,14 +295,7 @@
 		propsArea.setLayout(new GridLayout(4, false));
 		propsArea.setCorpus(this.getCorpus());
 		propsArea.setText(CooccurrenceUIMessages.CooccurrencesEditor_3);
-		propsArea.addValueChangeListener(new Listener() {
-			@Override
-			public void handleEvent(Event event) {
-				if (TXMPreferences.getBoolean(RCPPreferences.AUTO_UPDATE_EDITOR, RCPPreferences.PREFERENCES_NODE)) {
-					compute(true);
-				}
-			}
-		});
+		propsArea.addValueChangeListener(new ComputeListener(this));
 		/*
 		 * FormData propsLayoutData = new FormData(); propsLayoutData.top = new
 		 * FormAttachment (queryArea, 0); propsLayoutData.left = new
@@ -325,24 +312,13 @@
 		Label seuilLabel = new Label(filtercontrols, SWT.NONE);
 		seuilLabel.setText(CooccurrenceUIMessages.CooccurrencesEditor_4);
 
-		SelectionListener thListener = new SelectionListener() {
-			
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				cooc.setThresfold(TFreq.getSelection(), TCount.getSelection(), TScore.getSelectionCount());
-				compute(true);
-			}
-			
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) { }
-		};
 		
 		TFreq = new Spinner(filtercontrols, SWT.BORDER);
 		TFreq.setMinimum(1);
 		TFreq.setMaximum(99999);
 		TFreq.setIncrement(1);
 		TFreq.setPageIncrement(100);
-		TFreq.addSelectionListener(thListener);
+		TFreq.addSelectionListener(new ComputeSelectionListener(this));
 
 		seuilLabel = new Label(filtercontrols, SWT.NONE);
 		seuilLabel.setText(CooccurrenceUIMessages.CooccurrencesEditor_5);
@@ -351,26 +327,13 @@
 		TCount.setMaximum(99999);
 		TCount.setIncrement(1);
 		TCount.setPageIncrement(100);
-		TCount.addSelectionListener(thListener);
+		TCount.addSelectionListener(new ComputeSelectionListener(this));
 
 		seuilLabel = new Label(filtercontrols, SWT.NONE);
 		seuilLabel.setText(CooccurrenceUIMessages.CooccurrencesEditor_6);
 		TScore = new Text(filtercontrols, SWT.BORDER);
-		TScore.addSelectionListener(thListener);
-		TScore.addKeyListener(new KeyListener() {
-			@Override
-			public void keyPressed(KeyEvent e) {
-				// System.out.println("key pressed : "+e.keyCode);
-				if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
-					cooc.setThresfold(TFreq.getSelection(), TCount.getSelection(), TScore.getSelectionCount());
-					compute(true);
-				}
-			}
-
-			@Override
-			public void keyReleased(KeyEvent e) {
-			}
-		});
+		TScore.addSelectionListener(new ComputeSelectionListener(this));
+		TScore.addKeyListener(new ComputeKeyListener(this));
 		// empant
 		empantPanel = new EmpantWidget(paramArea, SWT.NONE, this.getCorpus());
 
@@ -380,21 +343,7 @@
 		empantLayoutData.left = new FormAttachment(0);
 		empantLayoutData.right = new FormAttachment(100);
 		empantPanel.setLayoutData(empantLayoutData);
-		empantPanel.addSelectionListener(new SelectionListener() {
-			
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				cooc.setStructure(empantPanel.getStruct());
-				cooc.setMaxLeft(empantPanel.getMaxLeft() + 1);
-				cooc.setMinLeft(empantPanel.getMinLeft() + 1);
-				cooc.setMinRight(empantPanel.getMinRight() + 1);
-				cooc.setMaxRight(empantPanel.getMaxRight() + 1);
-				cooc.setIncludeXpivot(empantPanel.getXPivot());
-			}
-			
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) { }
-		});
+		empantPanel.addSelectionListener(new ComputeSelectionListener(this));
 		// result
 		Composite resultArea = this.getResultArea();
 		// FormData resultLayoutData = new FormData();
@@ -738,9 +687,9 @@
 	public void updateEditorFromResult(boolean update) {
 
 		// FIXME: new method
-		Display.getDefault().syncExec(new Runnable() {
-			@Override
-			public void run() {
+//		Display.getDefault().syncExec(new Runnable() {
+//			@Override
+//			public void run() {
 
 				
 				String txt = "tp " + cooc.getNumberOfKeyword() + ", vc " + cooc.getNumberOfDifferentCooccurrents() + ", tc " + cooc.getNumberOfCooccurrents(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -764,8 +713,8 @@
 				RVariablesView.refresh();
 
 				viewer.getTable().setFocus();
-			}
-		});
+//			}
+//		});
 		
 		// FIXME: old method
 //		JobHandler jobhandler = new JobHandler(NLS.bind(CooccurrenceUIMessages.CooccurrencesEditor_12, cooc.getCorpus())) {
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 722)
+++ tmp/org.txm.index.core/src/org/txm/index/core/functions/Index.java	(revision 723)
@@ -100,19 +100,19 @@
 
 	// PARAMETERS
 	/**
-	 * The fmax filter value parameter.
+	 * Maximum frequency filter value.
 	 */
 	@Parameter(key=IndexPreferences.F_MAX)
-	protected Integer pFmaxFilter;
+	protected int pFmaxFilter;
 	
 	/**
-	 * The fmin filter value parameter.
+	 * Minimum frequency filter value.
 	 */
 	@Parameter(key=IndexPreferences.F_MIN)
-	protected Integer pFminFilter;
+	protected int pFminFilter;
 	
 	/**
-	 * The number of lines shown per page parameter.
+	 * Number of lines to display per page.
 	 */
 	@Parameter(key=IndexPreferences.N_LINES_PER_PAGE)
 	protected Integer pNLinesPerPage;
@@ -120,7 +120,7 @@
 	/**
 	 * The word properties shown.
 	 */
-	@Parameter
+	@Parameter(key=IndexPreferences.PROPERTIES)
 	protected List<Property> pProperties;
 	
 	/**
@@ -132,7 +132,7 @@
 	/**
 	 * The CQP query.
 	 */
-	@Parameter
+	@Parameter(key=IndexPreferences.QUERY)
 	protected Query pQuery;
 	
 	/**
@@ -464,27 +464,29 @@
 
 
 	/**
-	 * remove linen which frequency is not in the [Fmin,Fmax] interval parameters.
+	 * Removes lines with frequency not in [Fmin,Fmax] range.
 	 *
 	 **/
 	public void filterLines() {
-		if (pFminFilter == null && pFmaxFilter == null) return;
-		if (!(pFminFilter > 0 && pFmaxFilter > 0 && pFminFilter <= pFmaxFilter)) return;
+		
+		if (!(pFminFilter > 0 && pFmaxFilter > 0 && pFminFilter <= pFmaxFilter)) {
+			return;
+		}
 
-		Log.info("Filtering Fmin="+pFminFilter+" and Fmax="+pFmaxFilter);
+		Log.info("Filtering Fmin = " + pFminFilter + " and Fmax = " + pFmaxFilter); //$NON-NLS-1$  //$NON-NLS-2$
 
 		for (int i = 0; i < lines.size(); i++) { // for each line
 
 			Line line = lines.get(i);
 			int f = line.getFrequency();
-			if (pFminFilter != null && f < pFminFilter) { // if its frequency is not in the interval, remove it
+			if (f < pFminFilter) { // if its frequency is not in the interval, remove it
 
 				nTotalTokens -= line.getFrequency();
 				lines.remove(i);
 				i--;
 				continue; // no need to go further the line is removed
 			}
-			if (pFmaxFilter != null && f > pFmaxFilter) { // if its frequency is not in the interval, remove it
+			if (f > pFmaxFilter) { // if its frequency is not in the interval, remove it
 
 				nTotalTokens -= line.getFrequency();
 				lines.remove(i);
Index: tmp/org.txm.index.core/src/org/txm/index/core/preferences/IndexPreferences.java
===================================================================
--- tmp/org.txm.index.core/src/org/txm/index/core/preferences/IndexPreferences.java	(revision 722)
+++ tmp/org.txm.index.core/src/org/txm/index/core/preferences/IndexPreferences.java	(revision 723)
@@ -5,6 +5,7 @@
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.prefs.Preferences;
 import org.txm.core.preferences.TXMPreferences;
+import org.txm.core.results.Parameter;
 
 /**
  * Preferences initializer and manager.
@@ -20,11 +21,35 @@
 	
 	public static final String PROPERTIES = PREFERENCES_PREFIX + "properties"; //$NON-NLS-1$
 	public static final String QUERY = PREFERENCES_PREFIX + "query"; //$NON-NLS-1$
+	
+	/**
+	 * Minimum frequency filter value.
+	 */
 	public static final String F_MIN = PREFERENCES_PREFIX + "f_min"; //$NON-NLS-1$
+	
+	/**
+	 * Maximum frequency filter value.
+	 */
 	public static final String F_MAX = PREFERENCES_PREFIX + "f_max"; //$NON-NLS-1$
+	
+	/**
+	 * V max filter. 
+	 */
 	public static final String V_MAX = PREFERENCES_PREFIX + "v_max"; //$NON-NLS-1$
+	
+	/**
+	 * Number of lines to display per page.
+	 */
 	public static final String N_LINES_PER_PAGE = PREFERENCES_PREFIX + "n_lines_per_page"; //$NON-NLS-1$
+	
+	/**
+	 * 
+	 */
 	public static final String PROPERTIES_SEPARATOR = PREFERENCES_PREFIX + "properties_separator"; //$NON-NLS-1$
+	
+	/**
+	 * 
+	 */
 	public static final String N_TOP_INDEX = PREFERENCES_PREFIX + "n_top_index"; //$NON-NLS-1$
 
 	@Override
Index: tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java
===================================================================
--- tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java	(revision 722)
+++ tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/results/ChartResult.java	(revision 723)
@@ -334,6 +334,14 @@
 
 
 	/**
+	 * Gets a chart creator for this chart result according to its current type and current charts engine. 
+	 * @return
+	 */
+	public ChartCreator getChartCreator()	{
+		return this.chartsEngine.getChartCreator(this);
+	}
+	
+	/**
 	 * @param chartType the chartType to set
 	 */
 	public void setChartType(String chartType) {
Index: tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java
===================================================================
--- tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java	(revision 722)
+++ tmp/org.txm.chartsengine.core/src/org/txm/chartsengine/core/ChartsEngine.java	(revision 723)
@@ -38,14 +38,6 @@
 	public final static String extensionPointId = "org.txm.chartsengine.chartsengine"; //$NON-NLS-1$
 	
 	/**
-	 * Chart type constants.
-	 */
-	@Deprecated
-	// FIXME: became useless since the ChartResult is stored in the renderer
-	public final static int CHART_TYPE_PARTITION_DIMENSIONS = 0, CHART_TYPE_SPECIFICITIES = 1, CHART_TYPE_PROGRESSION = 2, CHART_TYPE_CA_FACTORIAL_MAP = 3, CHART_TYPE_CA_SINGULAR_VALUES = 4,
-			CHART_TYPE_CAH_2D = 5, CHART_TYPE_CAH_3D = 6;
-
-	/**
 	 * Constants for output formats and file extensions.
 	 */
 	public final static String OUTPUT_FORMAT_JPEG = "jpeg", OUTPUT_FORMAT_PDF = "pdf", OUTPUT_FORMAT_PNG = "png", OUTPUT_FORMAT_PS = "ps", OUTPUT_FORMAT_SVG = "svg", OUTPUT_FORMAT_BMP = "bmp", OUTPUT_FORMAT_GIF = "gif";
@@ -158,16 +150,6 @@
 
 	
 	/**
-	 *  Gets a chart creator for the specified result data type.
-	 * @param resultDataType
-	 * @return
-	 */
-	public ChartCreator getChartCreator(Class resultDataType)	{
-		return this.getChartCreator(resultDataType);
-	}
-
-	
-	/**
 	 * Gets a list of all installed chart creators for the specified result. 
 	 * @param resultDataType
 	 * @return
Index: tmp/org.txm.synopticeditor.rcp/src/org/txm/synopticedition/rcp/editors/SynopticEditionEditor.java
===================================================================
--- tmp/org.txm.synopticeditor.rcp/src/org/txm/synopticedition/rcp/editors/SynopticEditionEditor.java	(revision 722)
+++ tmp/org.txm.synopticeditor.rcp/src/org/txm/synopticedition/rcp/editors/SynopticEditionEditor.java	(revision 723)
@@ -880,7 +880,7 @@
 	}
 
 	/**
-	 * Clear all highlighted words
+	 * Clears all highlighted words.
 	 */
 	public void removeHighlightWords() {
 		for (EditionPanel p : editionPanels.values()) {
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/ReferencePattern.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/ReferencePattern.java	(revision 722)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/ReferencePattern.java	(revision 723)
@@ -186,7 +186,7 @@
 				title += p.getName()+", "; //$NON-NLS-1$
 		}
 		if (title.length() == 0)
-			title = TXMCoreMessages.ReferencePattern_3;
+			title = TXMCoreMessages.common_reference;
 		else
 			title = title.substring(0, title.length()-2);
 		return title;
Index: tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/CQPSearchEngineCoreMessages.java
===================================================================
--- tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/CQPSearchEngineCoreMessages.java	(revision 722)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/core/messages/CQPSearchEngineCoreMessages.java	(revision 723)
@@ -15,9 +15,6 @@
 
 	private static final String BUNDLE_NAME = "org.txm.searchengine.cqp.core.messages.messages"; //$NON-NLS-1$
 
-	
-	
-	
 	static {
 		// initialize resource bundle
 		Utf8NLS.initializeMessages(BUNDLE_NAME, CQPSearchEngineCoreMessages.class);
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 722)
+++ tmp/org.txm.searchengine.cqp.core/src/org/txm/searchengine/cqp/CQPEngine.java	(revision 723)
@@ -200,7 +200,7 @@
 				System.out.println("Failed to load CQP corpora of "+b.getName()+" corpus.");
 			}
 		}
-		System.out.println(TXMCoreMessages.DONE);
+		System.out.println(TXMCoreMessages.common_done);
 
 		return state;
 	}
Index: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/ReferencerCoreMessages.java
===================================================================
--- tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/ReferencerCoreMessages.java	(revision 0)
+++ tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/ReferencerCoreMessages.java	(revision 723)
@@ -0,0 +1,30 @@
+package org.txm.referencer.core.messages;
+
+import org.eclipse.osgi.util.NLS;
+import org.txm.utils.messages.Utf8NLS;
+
+/**
+ * Referencer core messages.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
+public class ReferencerCoreMessages extends NLS {
+
+	private static final String BUNDLE_NAME = "org.txm.referencer.core.messages.messages"; //$NON-NLS-1$
+	
+	
+	public static String Referencer_1;
+	public static String Referencer_2;
+	
+	
+	
+	static {
+		// initialize resource bundle
+		Utf8NLS.initializeMessages(BUNDLE_NAME, ReferencerCoreMessages.class);
+	}
+	
+	
+	
+}

Property changes on: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/ReferencerCoreMessages.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages.properties
===================================================================
--- tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages.properties	(revision 0)
+++ tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages.properties	(revision 723)
@@ -0,0 +1,3 @@
+
+Referencer_1 = Referencer
+Referencer_2 = Referencer export failed: 

Property changes on: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages_ru.properties
===================================================================

Property changes on: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages_ru.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages_fr.properties	(revision 0)
+++ tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages_fr.properties	(revision 723)
@@ -0,0 +1,3 @@
+
+Referencer_1 = Références
+Referencer_2 = Références : l'export a échoué :  

Property changes on: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/messages_fr.properties
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/package.html
===================================================================
--- tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/package.html	(revision 0)
+++ tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/package.html	(revision 723)
@@ -0,0 +1 @@
+Core message keys : contains the low level shared messages
\ No newline at end of file

Property changes on: tmp/org.txm.referencer.core/src/org/txm/referencer/core/messages/package.html
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.referencer.core/src/org/txm/referencer/core/functions/Referencer.java
===================================================================
--- tmp/org.txm.referencer.core/src/org/txm/referencer/core/functions/Referencer.java	(revision 722)
+++ tmp/org.txm.referencer.core/src/org/txm/referencer/core/functions/Referencer.java	(revision 723)
@@ -56,10 +56,10 @@
 import java.util.List;
 import java.util.Map;
 
-import org.txm.core.messages.TXMCoreMessages;
 import org.txm.core.results.Parameter;
 import org.txm.core.results.TXMParameters;
 import org.txm.core.results.TXMResult;
+import org.txm.referencer.core.messages.ReferencerCoreMessages;
 import org.txm.referencer.core.preferences.ReferencerPreferences;
 import org.txm.searchengine.cqp.AbstractCqiClient;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
@@ -76,7 +76,10 @@
 import org.txm.utils.logger.Log;
 
 /**
- * The Class Referencer computes the references of a query
+ * The Class Referencer computes the references of a query
+ * 
+ * @author xxx?
+ * @author sjacquot
  */
 public class Referencer extends TXMResult  {
 
@@ -121,19 +124,19 @@
 	
 	
 	/** The hierarchic sort. */
-	@Parameter(key=ReferencerPreferences.SORT_BY_FREQ)
-	private boolean pHierarchicSort;
+	@Parameter(key=ReferencerPreferences.SORT_BY_FREQUENCIES)
+	protected boolean pHierarchicSort;
 	
-	@Parameter
-	List<StructuralUnitProperty> pPattern;
+	@Parameter(key=ReferencerPreferences.PATTERN)
+	protected List<StructuralUnitProperty> pPattern;
 	
 	/** The prop. */
-	@Parameter
-	Property pProperty;
+	@Parameter(key=ReferencerPreferences.UNIT_PROPERTY)
+	protected Property pProperty;
 
 	/** The query. */
-	@Parameter
-	Query pQuery;
+	@Parameter(key=ReferencerPreferences.QUERY)
+	protected Query pQuery;
 
 	
 	
@@ -197,30 +200,33 @@
 	}
 
 	/**
-	 * Clear all lines.
+	 * Clears all lines.
 	 */
-	public void clearAllLines()
-	{
-		for(Line line : lines) { // we need to recompute lines' references
+	public void clearAllLines()	{
+		for(Line line : lines) { // we need to recompute lines references
 			line.clear();
 		}
 	}
 
 	/**
-	 * Call in order all stages to compute the referencer.
+	 * Calls in order all stages to compute the referencer.
 	 *
 	 * @return true, if successful
-	 */
+	 */
+	@Override
 	protected boolean _compute() {
 		try {
-			if (!getQueryMatches())
-				return false;
+			if (!getQueryMatches()) {
+				return false;
+			}
 
-			if (!getQueryindexes())
-				return false;
+			if (!getQueryindexes()) {
+				return false;
+			}
 
-			if (!groupPositionsbyId())
+			if (!groupPositionsbyId()) {
 				return false;
+			}
 		}
 		catch(CqiClientException e) {
 			e.printStackTrace();
@@ -252,8 +258,7 @@
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 * @throws CqiServerError the cqi server error
 	 */
-	public List<Line> getLines() throws CqiClientException, IOException, CqiServerError
-	{
+	public List<Line> getLines() throws CqiClientException, IOException, CqiServerError {
 		return getLines(0,lines.size());
 	}
 
@@ -267,19 +272,19 @@
 	 * @throws IOException Signals that an I/O exception has occurred.
 	 * @throws CqiServerError the cqi server error
 	 */
-	public List<Line> getLines(int from, int to) throws CqiClientException, IOException, CqiServerError
-	{
-		if (from < 0)
-			from = 0;
-		if (to > lines.size())
-			to = lines.size();
+	public List<Line> getLines(int from, int to) throws CqiClientException, IOException, CqiServerError {
+		if (from < 0) {
+			from = 0;
+		}
+		if (to > lines.size()) {
+			to = lines.size();
+		}
 
 		HashMap<Integer, Line> lineswithoutpropvalue = new HashMap<Integer, Line>();
 
 		AbstractCqiClient cqiClient = CorpusManager.getCorpusManager().getCqiClient();
 		//build Missing lines
-		for(int i = from ; i < to ; i++)// for each position group
-		{
+		for(int i = from ; i < to ; i++) { // for each position group
 			Line l = lines.get(i);
 			if (l.notcomputed) {
 				lineswithoutpropvalue.put(l.id, l);
@@ -397,10 +402,10 @@
 	 * @throws CqiClientException 
 	 */
 	public boolean getQueryMatches() throws CqiClientException{
-
-		result = this.getCorpus().query(pQuery, TXMCoreMessages.Referencer_1, false);
-		if (result.getNMatch() == 0)
-			return false;
+		result = this.getCorpus().query(pQuery, ReferencerCoreMessages.Referencer_1, false);
+		if (result.getNMatch() == 0) {
+			return false;
+		}
 		matches = result.getMatches();
 		result.drop();
 		return true;
@@ -501,7 +506,7 @@
 			// if ("UTF-8".equals(encoding)) writer.write('\ufeff'); // UTF-8 BOM
 			toTxt(writer, 0, lines.size() - 1, colseparator, txtseparator);
 		} catch (Exception e) {
-			System.err.println(TXMCoreMessages.Referencer_2 + Log.toString(e));
+			System.err.println(ReferencerCoreMessages.Referencer_2 + Log.toString(e));
 			return false;
 		}
 		return true;
@@ -559,12 +564,8 @@
 	@Override
 	public boolean loadParameters() throws CqiClientException {
 		this.pQuery = new Query(this.getStringParameterValue(ReferencerPreferences.QUERY));
-
-		String s = this.getStringParameterValue(ReferencerPreferences.PATTERN);
-		this.pPattern = StructuralUnitProperty.fromStringToList(getCorpus(), s);
-
-		s = this.getStringParameterValue(ReferencerPreferences.PROPERTY);
-		this.pProperty = getCorpus().getProperty(s);
+		this.pPattern = StructuralUnitProperty.fromStringToList(this.getCorpus(), this.getStringParameterValue(ReferencerPreferences.PATTERN));
+		this.pProperty = this.getCorpus().getProperty(this.getStringParameterValue(ReferencerPreferences.UNIT_PROPERTY));
 		return true;
 	}
 
Index: tmp/org.txm.referencer.core/src/org/txm/referencer/core/preferences/ReferencerPreferences.java
===================================================================
--- tmp/org.txm.referencer.core/src/org/txm/referencer/core/preferences/ReferencerPreferences.java	(revision 722)
+++ tmp/org.txm.referencer.core/src/org/txm/referencer/core/preferences/ReferencerPreferences.java	(revision 723)
@@ -5,26 +5,33 @@
 import org.osgi.service.prefs.Preferences;
 import org.txm.core.preferences.TXMPreferences;
 
+/**
+ * Default preferences.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
 public class ReferencerPreferences extends TXMPreferences {
 
-public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(ReferencerPreferences.class).getSymbolicName();
+	public static final String PREFERENCES_NODE = FrameworkUtil.getBundle(ReferencerPreferences.class).getSymbolicName();
 
-	/** The Constant SORTBYFREQ. */
-	//FIXME: to extract to referencer plug-in
-	public static final String SORT_BY_FREQ = "sorttype"; //$NON-NLS-1$
+	public static final String PREFERENCES_PREFIX = "referencer_"; //$NON-NLS-1$
+	
+	
+	public static final String SORT_BY_FREQUENCIES = PREFERENCES_PREFIX + "sort_by_frequencies"; //$NON-NLS-1$
+	public static final String QUERY = PREFERENCES_PREFIX + "query"; //$NON-NLS-1$
+	public static final String UNIT_PROPERTY = PREFERENCES_PREFIX + "unit_property"; //$NON-NLS-1$
+	public static final String PATTERN = PREFERENCES_PREFIX + "pattern"; //$NON-NLS-1$
 
-	public static final String QUERY = "query"; //$NON-NLS-1$
-	public static final String PROPERTY = "property"; //$NON-NLS-1$
-	public static final String PATTERN = "pattern"; //$NON-NLS-1$
-
 	@Override
 	public void initializeDefaultPreferences() {
 		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
 
-		preferences.putBoolean(SORT_BY_FREQ, false); //$NON-NLS-1$
+		preferences.putBoolean(SORT_BY_FREQUENCIES, false);
 
 		preferences.put(QUERY, ""); //$NON-NLS-1$
-		preferences.put(PROPERTY, "word"); //$NON-NLS-1$
+		preferences.put(UNIT_PROPERTY, "word"); //$NON-NLS-1$
 		preferences.put(PATTERN, "text_id"); //$NON-NLS-1$
 	}
 }
Index: tmp/org.txm.statsengine.r.rcp/plugin.xml
===================================================================
--- tmp/org.txm.statsengine.r.rcp/plugin.xml	(revision 722)
+++ tmp/org.txm.statsengine.r.rcp/plugin.xml	(revision 723)
@@ -70,8 +70,7 @@
          <command
                commandId="org.txm.rcp.commands.R.CopySelection"
                label="%command.label.129"
-               style="push"
-               tooltip="%command.label.129">
+               style="push">
          </command>
       </menuContribution>
       <menuContribution
@@ -257,5 +256,41 @@
                </view>
          
    </extension>
+   <extension
+         point="org.eclipse.ui.decorators">
+      <decorator
+            class=" org.txm.statsengine.r.rcp.decorators.RDecorator"
+            icon="icons/decorators/R.png"
+            id="org.txm.rcp.decorators.RDecorator"
+            label="%decorator.label"
+            lightweight="false"
+            location="TOP_LEFT"
+            objectClass="java.lang.Object"
+            state="true">
+      </decorator>
+   </extension>
+   <extension
+         point="org.eclipse.ui.perspectives">
+               <perspective
+            class="org.txm.statsengine.r.rcp.perspectives.RPerspective"
+            icon="icons/logos/Rcran.png"
+            id="org.txm.statsengine.r.rcp.perspectives.RPerspective"
+            name="%perspective.name.0">
+      </perspective>
+         
+         
+   </extension>
+   <extension
+         point="org.eclipse.core.expressions.definitions">
+      <definition
+            id="RPerspectiveSelected">
+         <with
+               variable="activeWorkbenchWindow.activePerspective">
+            <equals
+                  value="org.txm.statsengine.r.rcp.perspectives.RPerspective">
+            </equals>
+         </with>
+      </definition>
+   </extension>
 
 </plugin>
Index: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/decorators/RDecorator.java
===================================================================
--- tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/decorators/RDecorator.java	(revision 0)
+++ tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/decorators/RDecorator.java	(revision 723)
@@ -0,0 +1,91 @@
+// Copyright © 2010-2013 ENS de Lyon.
+// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
+// Lyon 2, University of Franche-Comté, University of Nice
+// Sophia Antipolis, University of Paris 3.
+// 
+// The TXM platform is free software: you can redistribute it
+// and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation,
+// either version 2 of the License, or (at your option) any
+// later version.
+// 
+// The TXM platform is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+// PURPOSE. See the GNU General Public License for more
+// details.
+// 
+// You should have received a copy of the GNU General
+// Public License along with the TXM platform. If not, see
+// http://www.gnu.org/licenses.
+// 
+// 
+// 
+// $LastChangedDate:$
+// $LastChangedRevision:$
+// $LastChangedBy:$ 
+//
+package org.txm.statsengine.r.rcp.decorators;
+
+import java.lang.reflect.Method;
+
+import org.eclipse.jface.viewers.ILabelDecorator;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+import org.txm.rcp.IImageKeys;
+import org.txm.rcp.utils.OverlayImageIcon;
+
+// TODO: Auto-generated Javadoc
+/**
+ * The Class RDecorator.
+ */
+public class RDecorator extends LabelProvider implements ILabelDecorator
+{
+	
+	/**
+	 * Instantiates a new r decorator.
+	 */
+	public RDecorator()
+	{
+		super();
+	}
+	// Method to decorate Image 
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object)
+	 */
+	@Override
+	public Image decorateImage(Image image, Object object)
+	{
+		String symbol= null;
+		try {
+			Method getname = object.getClass().getMethod("getSymbol"); //$NON-NLS-1$
+			symbol = (String)getname.invoke(object);
+		} catch (Exception e) {return null;}
+		
+		if (symbol == null) {
+			return null;
+		}
+		//System.out.println("decorate "+symbol);
+		// Overlay custom image over base image 
+		try {
+			Image image2;
+			OverlayImageIcon overlayIcon = new OverlayImageIcon(image, IImageKeys.RDECORATION);
+			image2 = overlayIcon.getImage();
+			return image2;
+		}
+		catch(NullPointerException e) {
+		}
+		return null;
+		// The image should be disposed when the plug-in is 
+		// disabled or on shutdown 
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, java.lang.Object)
+	 */
+	@Override
+	public String decorateText(String text, Object element) {
+		// TODO Auto-generated method stub
+		return null;
+	}	
+}

Property changes on: tmp/org.txm.statsengine.r.rcp/src/org/txm/statsengine/r/rcp/decorators/RDecorator.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.statsengine.r.rcp/OSGI-INF/l10n/bundle.properties
===================================================================
--- tmp/org.txm.statsengine.r.rcp/OSGI-INF/l10n/bundle.properties	(revision 722)
+++ tmp/org.txm.statsengine.r.rcp/OSGI-INF/l10n/bundle.properties	(revision 723)
@@ -1,18 +1,32 @@
 
+command.label.129 = Copy
+
+command.label.142 = New session
+
 command.name.45 = Run R script
 
 command.name.46 = Execute Text Selection
 
 command.name.53 = Send to R
 
+command.name.59 = OpenEmptyTextEditor
+
+command.name.61 = show svg help
+
+command.name.64 = CopySelection
+
 command.name.90 = Check R packages
 
 command.name.93 = Reconnect to RWorkspace
 
+decorator.label = R Decorator
+
 menu.label.11 = R
 
 page.name = Statistics Engine
 
+perspective.name.0 = R
+
 view.name.5 = R variables
 
 view.name.6 = R Console
Index: tmp/org.txm.statsengine.r.rcp/OSGI-INF/l10n/bundle_ru.properties
===================================================================
--- tmp/org.txm.statsengine.r.rcp/OSGI-INF/l10n/bundle_ru.properties	(revision 722)
+++ tmp/org.txm.statsengine.r.rcp/OSGI-INF/l10n/bundle_ru.properties	(revision 723)
@@ -1,12 +1,24 @@
 
+command.label.129 = Копировать
+
+command.label.142 = Новый сеанс
+
 command.name.45 = Выполнить скрипт R
 
 command.name.46 = Выполнить выделенные строки как скрипт R 
 
 command.name.53 = Отправить в R
 
+command.name.59 = OpenEmptyTextEditor
+
+command.name.61 = show svg help
+
+command.name.64 = CopySelection
+
 command.name.90 = Добавить текст
 
+decorator.label = Декоратор R
+
 menu.label.11 = R
 
 page.name = Статистическая машина
Index: tmp/org.txm.statsengine.r.rcp/OSGI-INF/l10n/bundle_fr.properties
===================================================================
--- tmp/org.txm.statsengine.r.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 722)
+++ tmp/org.txm.statsengine.r.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 723)
@@ -1,13 +1,30 @@
 
-command.name.45 = Ex\u00E9cuter le script R
-command.name.46 = Ex\u00E9cuter la s\u00E9lection de texte
+command.label.129 = Copier
+
+command.label.142 = Nouvelle session
+
+command.name.45 = Exécuter le script R
+
+command.name.46 = Exécuter la sélection de texte
+
 command.name.53 = Envoyer vers R
-command.name.90 = V\u00E9rifier les packages R
+
+command.name.59 = OpenEmptyTextEditor
+
+command.name.61 = afficher l'aide svg
+
+command.name.64 = CopySelection
+
+command.name.90 = Vérifier les packages R
+
 command.name.93 = Reconnecter le RWorkspace
 
+decorator.label = R Decorator
+
 menu.label.11 = R
 
 page.name = Moteur de Statistiques
 
 view.name.5 = Variables R
+
 view.name.6 = Console R
Index: tmp/org.txm.statsengine.r.rcp/icons/logos/Rcran.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.statsengine.r.rcp/icons/logos/Rcran.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.statsengine.r.rcp/icons/decorators/R.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tmp/org.txm.statsengine.r.rcp/icons/decorators/R.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Index: tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/Activator.java
===================================================================
--- tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/Activator.java	(revision 722)
+++ tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/Activator.java	(revision 723)
@@ -1,49 +0,0 @@
-package org.txm.libs.cqp;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "CQP"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-}
Index: tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/CQPLibPreferences.java
===================================================================
--- tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/CQPLibPreferences.java	(revision 722)
+++ tmp/org.txm.libs.cqp/src/org/txm/libs/cqp/CQPLibPreferences.java	(revision 723)
@@ -85,7 +85,7 @@
 				return; // nothing to do
 			}
 		}
-		Log.info("Updating CWB preferences for CQP version="+currentVersion);
+		Log.info("Updating CWB preferences for CQP version=" + currentVersion);
 		
 		String os = "win";
 		String ext = "";
Index: tmp/org.txm.libs.cqp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.libs.cqp/META-INF/MANIFEST.MF	(revision 722)
+++ tmp/org.txm.libs.cqp/META-INF/MANIFEST.MF	(revision 723)
@@ -3,7 +3,6 @@
 Bundle-Name: CQP libs
 Bundle-SymbolicName: org.txm.libs.cqp;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.txm.libs.cqp.Activator
 Require-Bundle: org.txm.utils;bundle-version="1.0.0";visibility:=reexport,
  org.txm.core;visibility:=reexport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Index: tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/preferences/LexicalTablePreferences.java
===================================================================
--- tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/preferences/LexicalTablePreferences.java	(revision 722)
+++ tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/preferences/LexicalTablePreferences.java	(revision 723)
@@ -22,22 +22,22 @@
 	public static final String PREFERENCES_PREFIX = "lexical_table_"; //$NON-NLS-1$
 
 	/**
-	 * The minimal occurrence frequency to show in the table.
+	 * Minimum occurrence frequency to display in table.
 	 */
 	public static final String F_MIN = PREFERENCES_PREFIX + "f_min"; //$NON-NLS-1$
 	
 	/**
-	 * The maximum number of lines to show in the table
+	 * Maximum number of lines to display in table.
 	 */
 	public static final String V_MAX = PREFERENCES_PREFIX + "v_max"; //$NON-NLS-1$
 	
 	/**
-	 * The property to count
+	 * Unit property to count.
 	 */
-	public static final String PROPERTY = PREFERENCES_PREFIX + "property"; //$NON-NLS-1$
+	public static final String UNIT_PROPERTY = PREFERENCES_PREFIX + "unit_property"; //$NON-NLS-1$
 	
 	/**
-	 * if true the table computed from an Index will use all the occurrences from the corpus to add the #RESTE# line composed of the others words
+	 * If true, the table computed from an Index will use all the occurrences from the corpus to add the #RESTE# line composed of the others words
 	 */
 	public static final String USE_ALL_OCCURRENCES = PREFERENCES_PREFIX + "use_all_occurrences"; //$NON-NLS-1$
 	
@@ -46,7 +46,7 @@
 		Preferences preferences = DefaultScope.INSTANCE.getNode(PREFERENCES_NODE);
 		preferences.putInt(F_MIN, 2);
 		preferences.putInt(V_MAX, 200);
-		preferences.put(PROPERTY, "word"); //$NON-NLS-1$
+		preferences.put(UNIT_PROPERTY, DEFAULT_UNIT_PROPERTY);
 		preferences.putBoolean(USE_ALL_OCCURRENCES, true);
 	}
 	
Index: tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/statsengine/r/data/LexicalTableImpl.java
===================================================================
--- tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/statsengine/r/data/LexicalTableImpl.java	(revision 722)
+++ tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/statsengine/r/data/LexicalTableImpl.java	(revision 723)
@@ -51,7 +51,6 @@
 import cern.colt.Arrays;
 import cern.colt.matrix.DoubleFactory2D;
 import cern.colt.matrix.DoubleMatrix2D;
-//import org.txm.functions.queryindex.*;
 
 
 
Index: tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/functions/LexicalTable.java
===================================================================
--- tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/functions/LexicalTable.java	(revision 722)
+++ tmp/org.txm.lexicaltable.core/src/org/txm/lexicaltable/core/functions/LexicalTable.java	(revision 723)
@@ -48,7 +48,7 @@
 	/**
 	 * The property.
 	 */
-	@Parameter(key=LexicalTablePreferences.PROPERTY)
+	@Parameter(key=LexicalTablePreferences.UNIT_PROPERTY)
 	private Property pProperty;
 	/**
 	 * Minimum frequency.
@@ -164,7 +164,7 @@
 	@Override
 	public boolean loadParameters() {
 		try {
-			this.pProperty = this.getCorpus().getProperty(this.getStringParameterValue(LexicalTablePreferences.PROPERTY));
+			this.pProperty = this.getCorpus().getProperty(this.getStringParameterValue(LexicalTablePreferences.UNIT_PROPERTY));
 		}
 		catch (CqiClientException e) {
 			// TODO Auto-generated catch block
@@ -386,6 +386,7 @@
 			return false;
 		}
 		
+		// FIXME new version, to validate
 		//this.statsData.filter(this.pVMaxFilter, this.pfMinFilter);
 		// FIXME old version
 		this.statsData.cut(this.pVMaxFilter);
@@ -404,8 +405,8 @@
 		if (parameters.containsKey(LexicalTablePreferences.F_MIN)) {
 			this.pFMinFilter = parameters.getInteger(LexicalTablePreferences.F_MIN);
 		}
-		if (parameters.containsKey(LexicalTablePreferences.PROPERTY)) {
-			String s = parameters.get(LexicalTablePreferences.PROPERTY).toString();
+		if (parameters.containsKey(LexicalTablePreferences.UNIT_PROPERTY)) {
+			String s = parameters.get(LexicalTablePreferences.UNIT_PROPERTY).toString();
 			this.pProperty = getCorpus().getProperty(s);
 		}
 		
Index: tmp/org.txm.core/src/java/org/txm/ToolboxOld.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/ToolboxOld.java	(revision 722)
+++ tmp/org.txm.core/src/java/org/txm/ToolboxOld.java	(revision 723)
@@ -424,10 +424,9 @@
 			if (workspace == null || workspace.getProject("default") == null) { //$NON-NLS-1$
 				Log.severe(TXMCoreMessages.Toolbox_14 + location); 
 				stateWorkspace = false;
-				System.out.println(TXMCoreMessages.FAILED);
 				return false;
 			} else {
-				System.out.println(TXMCoreMessages.DONE);
+				System.out.println(TXMCoreMessages.common_done);
 			}
 		} catch (Exception e) {
 			System.err.println(TXMCoreMessages.Toolbox_workspace_init_failed + TXMPreferences.getString(TBXPreferences.PREFERENCES_NODE, TBXPreferences.WORKSPACE_LOCATION)); 
Index: tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java	(revision 722)
+++ tmp/org.txm.core/src/java/org/txm/core/preferences/TXMPreferences.java	(revision 723)
@@ -53,6 +53,7 @@
 // we'll use the ProjectScope.
 public abstract class TXMPreferences extends AbstractPreferenceInitializer {
 
+	
 	// FIXME: here we must use a ProjectScope when we'll use IProject for the corporas of TXM
 	public static IScopeContext scope = InstanceScope.INSTANCE;
 
@@ -61,7 +62,15 @@
 	 */
 	public static ArrayList<String> alternativeNodesQualifiers = new ArrayList<String>();
 
+	
 	/**
+	 * Default unit/token property String.
+	 */
+	public final static String DEFAULT_UNIT_PROPERTY = "word"; //$NON-NLS-1$
+
+	
+	
+	/**
 	 * Stores a pairs of key / value in a local node dedicated to the specified result. The node qualifier is generated by the <code>Object.toString()</code> method.
 	 * 
 	 * @param key
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 722)
+++ tmp/org.txm.core/src/java/org/txm/core/results/TXMResult.java	(revision 723)
@@ -182,8 +182,55 @@
 		return this.children.size() > 0;
 	}
 
+	/**
+	 * Gets a current parameter specified by its annotation "key" attribute and its annotation "type" attribute.
+	 * @param key
+	 * @param parameterType
+	 * @return
+	 */
+	public Object getParameter(String key) {
+		try {
+			Field field = this.getField(key); 
+			if(field != null)	{
+				field.setAccessible(true);
+				return field.get(this);	
+			}
+		}
+		catch (IllegalArgumentException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		catch (IllegalAccessException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return null;
+	}
+	
 
 	/**
+	 * Gets a member field according to its key.
+	 * @param key
+	 * @return the field if exists otherwise null
+	 */
+	public Field getField(String key)	{
+		
+		Field field = null; 
+		
+		List<Field> fields = this.getAllFields();
+
+		for (Field f : fields) {
+			Parameter parameter = f.getAnnotation(Parameter.class);
+			if (parameter != null && parameter.key().equals(key)) {
+				field = f;
+				break;
+			}
+		}
+		
+		return field;
+	}
+	
+	/**
 	 * Returns all the member fields of the class instance.
 	 * @return the list of declared fields
 	 */
@@ -281,35 +328,8 @@
 	}
 
 
-	/**
-	 * Gets a current parameter specified by its annotation "key" attribute and its annotation "type" attribute.
-	 * @param key
-	 * @param parameterType
-	 * @return
-	 */
-	public Object getParameter(String key) {
 
-		List<Field> fields = this.getAllFields();
 
-		for (Field f : fields) {
-			Parameter parameter = f.getAnnotation(Parameter.class);
-			if (parameter == null) {
-				continue;
-			}
-			f.setAccessible(true);
-			if (parameter.key().equals(key)) {
-				try {
-					return f.get(this);
-				}
-				catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		return null;
-	}
-
-
 	/**
 	 * Checks if a parameter value has changed since last computing.
 	 * @param key
@@ -1209,7 +1229,7 @@
 		// create the reversed string
 		StringBuilder b = new StringBuilder();
 		for (int i = branch.size() - 1; i >= 0; i--) {
-			b.append(branch.get(i).getClass().getSimpleName() + ": \"" + branch.get(i).getSimpleName() + "\" / ");
+			b.append("[" + branch.get(i).getClass().getSimpleName() + ": \"" + branch.get(i).getSimpleName() + "\"] / ");
 		}
 		b.deleteCharAt(b.length() - 3);
 		b.deleteCharAt(b.length() - 2);
Index: tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties	(revision 722)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages_ru.properties	(revision 723)
@@ -1,18 +1,17 @@
 
-COMPUTE_DONE_NO_RESULT = Ни одного результата
-
 PROPERTY_1 = Свойство
 
-QUERY_1 = Запрос:
+common_delete          = удалить
+common_description     = Описание
+common_lowestFrequency = Минимальная частотность
+common_mode            = 
+common_numberOfLines   = Число строк
+common_ok              = OK
+common_pleaseWait      = Пожалуйста, подождите...
+common_queries         = Запросы: 
+common_query           = Запрос:
+common_structuralUnit  = Структурная единица: 
+common_structure       = Структура
+common_units           = Единицы
 
-common_delete         = удалить
-common_description    = Описание
-common_mode           = 
-common_ok             = OK
-common_pleaseWait     = Пожалуйста, подождите...
-common_queries        = Запросы: 
-common_structuralUnit = Структурная единица: 
-common_structure      = Структура
-common_units          = Единицы
-
 error_error = 
Index: tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java	(revision 722)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/TXMCoreMessages.java	(revision 723)
@@ -1,6 +1,7 @@
 package org.txm.core.messages;
 
 import org.eclipse.osgi.util.NLS;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.utils.messages.Utf8NLS;
 
 /**
@@ -29,7 +30,7 @@
 	public static String common_delete;
 	public static String common_ok;
 	public static String common_mode;
-	
+	public static String common_numberOfLines;
 	public static String common_pleaseWait;
 
 	public static String error_error;
@@ -40,20 +41,19 @@
 	public static String ApplicationWorkbenchAdvisor_6;
 	
 	public static String PROPERTY_1;
+	public static String common_lowestFrequency;
+	
 
-	public static String FMIN_1;
+	public static String common_fMin;
 	public static String FMIN_2;
 	public static String FMAX_1;
 	public static String FMAX_2;
 	public static String VMAX_1;
-	public static String QUERY_1;
+	public static String common_query;
 	public static String T;
 	public static String V;
-	public static String COMPUTE_DONE_NO_RESULT;
-
 	
-	public static String FAILED;
-	public static String DONE;			
+	public static String common_done;
 	public static String AbsoluteFrequency_1;
 	public static String AbstractCqiClient_2;
 	public static String Base_0;
@@ -94,15 +94,10 @@
 	public static String Corpus_3;
 	public static String Corpus_4;
 	public static String Corpus_5;
-	public static String Corpus_6;
-	public static String Corpus_7;
 	public static String Corpus_8;
 	public static String CqiClient_0;
-	public static String CqiClient_1;
-	public static String CqiClient_3;
 	public static String CqiClient_32;
 	public static String CqiClient_33;
-	public static String CqiClient_34;
 	public static String CwbEncode_0;
 	public static String CwbEncode_21;
 	public static String CwbEncode_23;
@@ -114,14 +109,10 @@
 	public static String CwbProcess_3;
 	public static String CwbProcess_4;
 	public static String CwbProcess_5;
-	public static String DOUBLE_VECTOR_ADDED_TO_WORKSPACE;
 	public static String DROP_PARTITION;
 	public static String DROP_QUERYRESULT;
 	public static String DROP_SUBCORPUS;
-	public static String END_SUBCORPUS_LEXICON;
 	public static String END_SUBCORPUS_SIZE;
-	public static String EVALUATED_EXPRESSION;
-	public static String FAILED_INIT_CONNECTION_R;
 	public static String FilterManager_0;
 	public static String FilterManager_1;
 	public static String Filter_7;
@@ -129,13 +120,9 @@
 	public static String GroovyImportScriptRunner_0;
 	public static String GroovyImportScriptRunner_1;
 	public static String GroovyImportScriptRunner_3;
-	public static String INT_VECTOR_ADDED_TO_WORKSPACE;
 
 	public static String LEXICON;
-	public static String LEXICON_ADDED;
-	public static String MATRIX_ADDED_TO_WORKSPACE;
 	public static String MainCorpus_0;
-	public static String MainCorpus_1;
 	public static String MainCorpus_2;
 	public static String MemCqiClient_0;
 	public static String MemCqiClient_1;
@@ -153,7 +140,6 @@
 	public static String NetCqiClient_97;
 	public static String NetCqiServer_0;
 	public static String NetCqiServer_1;
-	public static String PACKAGE_LOADED;
 	public static String PARTITION_CREATED;
 	public static String PART_CREATED;
 	public static String Page_3;
@@ -161,14 +147,9 @@
 	public static String PartitionFocus_2;
 	public static String PartitionFocus_3;
 	public static String PartitionFocus_4;
-	public static String Partition_1;
 	public static String Partition_18;
-	public static String Partition_2;
 	public static String Partition_21;
-	public static String Partition_4;
 	public static String Partition_9;
-	public static String PatchCwbRegistry_0;
-	public static String PatchCwbRegistry_1;
 	public static String PatchCwbRegistry_13;
 	public static String PatchCwbRegistry_16;
 	public static String PatchCwbRegistry_2;
@@ -185,26 +166,17 @@
 	public static String Project_1;
 	public static String Project_10;
 	public static String Project_11;
-	public static String Project_12;
-	public static String Project_13;
 	public static String Project_14;
 	public static String Project_15;
-	public static String Project_16;
 	public static String Project_17;
 	public static String Project_18;
 	public static String Project_2;
-	public static String Project_25;
 	public static String Project_26;
-	public static String Project_27;
 	public static String Project_28;
-	public static String Project_3;
 	public static String Project_31;
-	public static String Project_4;
-	public static String Project_5;
 	public static String Project_6;
 	public static String Project_7;
 	public static String Project_8;
-	public static String Project_9;
 	public static String QUERY;
 	public static String QUERYING_PARTITION;
 	public static String QueryIndex_2;
@@ -220,41 +192,24 @@
 	public static String READ_2D_INT_ARRAY_FROM_CQI_SERVER;
 	public static String READ_BOOLEAN_FROM_CQI_SERVER;
 	public static String READ_BYTE_FROM_CQI_SERVER;
-	public static String READ_HEADER_FROM_CQI_SERVER;
 	public static String READ_INTEGER_FROM_CQI_SERVER;
 	public static String READ_INT_ARRAY_FROM_CQI_SERVER;
 	public static String READ_STRING_ARRAY_FROM_CQI_SERVER;
 	public static String READ_STRING_FROM_CQI_SERVER;
-	public static String RETURNING_CACHED_LEXICON;
-	public static String RETURN_FROM_QUERY;
-	public static String ReferencePattern_3;
-	public static String Referencer_1;
-	public static String Referencer_2;
+	public static String common_reference;
 	public static String RelativeFrequency_3;
-	public static String SERVER_STARTED;
 	public static String SERVER_STOPED;
-	public static String STARTING_SERVER;
 	public static String STOPING_SERVER;
 	public static String SUBCORPUS_CREATED;
 	public static String SUBCORPUS_LEXICON;
 	public static String SUBCORPUS_SIZE;
-	public static String Selection_0;
-	public static String Selection_1;
-	public static String Selection_2;
 	public static String Selection_26;
-	public static String Selection_3;
-	public static String Selection_4;
 	public static String Selection_5;
 	public static String Selection_6;
 	public static String Selection_7;
 	public static String Selection_8;
 	public static String Selection_9;
-	public static String StreamGobbler_0;
-	public static String StreamGobbler_1;
-	public static String StreamGobbler_2;
-	public static String StreamGobbler_3;
 	public static String StructuralUnitProperty_0;
-	public static String Subcorpus_1;
 	public static String Subcorpus_2;
 	public static String Subcorpus_3;
 	public static String Summary_13;
@@ -279,24 +234,19 @@
 	public static String TigerXmlIndexing_6;
 	public static String TigerXmlIndexing_7;
 	public static String Toolbox_0;
-	public static String Toolbox_1;
 	public static String Toolbox_10;
-	public static String Toolbox_11;
 	public static String Toolbox_12;
 	public static String Toolbox_14;
 	public static String Toolbox_15;
 	public static String Toolbox_16;
 	public static String Toolbox_17;
 	public static String Toolbox_18;
-	public static String Toolbox_2;
-	public static String Toolbox_21;
 	public static String Toolbox_22;
 	public static String Error_CONNECTION_FAILED;
 
 	public static String Toolbox_27;
 	public static String Toolbox_28;
 	public static String Toolbox_29;
-	public static String Toolbox_3;
 	public static String Toolbox_30;
 	public static String Toolbox_31;
 	public static String Toolbox_33;
@@ -306,42 +256,19 @@
 	public static String Toolbox_39;
 	public static String Toolbox_4;
 	public static String Toolbox_40;
-	public static String Toolbox_7;
-	public static String Toolbox_8;
-	public static String Toolbox_9;
 	public static String Toolbox_connected_to_corpus_sever;
-	public static String Toolbox_wait_failed;
 	public static String Toolbox_workspace_init;
 	public static String Toolbox_workspace_init_failed;
 	public static String Toolbox_wrong_port;
-	public static String TxmObject_0;
-	public static String TxmObject_1;
 	public static String TxmObject_2;
-	public static String TxmRenderer_1;
-	public static String TxmRenderer_5;
-	public static String TxmRenderer_6;
-	public static String TxmRenderer_7;
-	public static String VARIABLE_REMOVED;
 	public static String ValidateXml_0;
 	public static String ValidateXml_1;
 	public static String ValidateXml_2;
 	public static String ValidateXml_3;
-	public static String WORKSPACE_PURGED;
-	public static String Workspace_0;
-	public static String Workspace_1;
-	public static String Workspace_10;
 	public static String Workspace_2;
-	public static String Workspace_26;
-	public static String Workspace_27;
-	public static String Workspace_28;
-	public static String Workspace_29;
 	public static String Workspace_3;
-	public static String Workspace_30;
-	public static String Workspace_31;
 	public static String Workspace_4;
-	public static String Workspace_5;
 	public static String Workspace_6;
-	public static String Workspace_7;
 	public static String Workspace_8;
 	
 	
Index: tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties	(revision 722)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages_fr.properties	(revision 723)
@@ -12,8 +12,6 @@
 
 BuildCwbEncodeArgs_0 = Le fichier ''{0}'' est introuvable.
 
-COMPUTE_DONE_NO_RESULT = Aucun résultat
-
 CONNECTING_CQI_CLIENT = Connexion au moteur de recherche avec les paramètres suivants : {0}:{1}@{2}{3}...
 
 CQI_CLIENT_CONNECTED = Connexion au moteur de recherche établie.
@@ -53,16 +51,11 @@
 Corpus_3        = , Encodage : 
 Corpus_4        = , Langue : 
 Corpus_5        = Pas de valeur donnée
-Corpus_6        = ** Corpus : la référence au texte 
-Corpus_7        = \ est manquante
 Corpus_8        = \ dans
 
 CqiClient_0  = Récupération de la dernière erreur CQP
-CqiClient_1  = Lecture de CQI CTRL LAST GENERAL ERROR
-CqiClient_3  = ** Echec de la lecture de la dernière erreur CQP
 CqiClient_32 = Moteur de recherche lancé...
 CqiClient_33 = ** La connexion au moteur de recherche a échoué.
-CqiClient_34 = Moteur de recherche lancé.
 
 CwbEncode_0  = le dossier n'existe pas :
 CwbEncode_21 = Le dossier "bin" n'existe pas : 
@@ -77,29 +70,18 @@
 CwbProcess_4 = Processus arrêté : 
 CwbProcess_5 = ** Echec de localisation de CQP : 
 
-DONE = Terminé.
-
-DOUBLE_VECTOR_ADDED_TO_WORKSPACE = Le vecteur "{1}" ({0,number,integer} valeurs numériques "doubles") a été transmis au Moteur Statistique.
-
 DROP_PARTITION   = Suppression de la partition {0}
 DROP_QUERYRESULT = Suppression du résultat de requête {0}
 DROP_SUBCORPUS   = Suppression du sous-corpus {0}
 
-END_SUBCORPUS_LEXICON = Lexique du sous-corpus {0} calculé en {1} ms
-END_SUBCORPUS_SIZE    = Taille du sous-corpus {0} ({1}) calculée en {2} ms
+END_SUBCORPUS_SIZE = Taille du sous-corpus {0} ({1}) calculée en {2} ms
 
-EVALUATED_EXPRESSION = L''expression ''{0}'' a été évaluée.
-
 Error_CONNECTION_FAILED = ** Echec de connexion au moteur de recherche avec les paramètres suivants : 
 
 FAILED = Échec.
 
-FAILED_INIT_CONNECTION_R = ** Echec de connexion au serveur statistique.
-
 FMAX_1 = Fmax : 
 
-FMIN_1 = Fmin : 
-
 FilterManager_0 = ** Erreur du gestionnaire de filtre : initialisation 
 FilterManager_1 = \ n'existe pas.
 
@@ -111,16 +93,9 @@
 GroovyImportScriptRunner_1 = > début de l'exécution de 
 GroovyImportScriptRunner_3 = > fin de l'exécution
 
-INT_VECTOR_ADDED_TO_WORKSPACE = Le vecteur "{1}" ({0,number,integer} valeurs numériques "entières") a été transmis au Moteur Statistique.
-
 LEXICON = Lexique
 
-LEXICON_ADDED = Le lexique "{1}" ({0,number,integer} entrées) a été transmis au Moteur Statistique.
-
-MATRIX_ADDED_TO_WORKSPACE = La matrice "{2}" ({0,number,integer} lignes et {1,number,integer} colonnes) a été transmise au Moteur Statistique.
-
 MainCorpus_0 = \ n'est pas un identifiant de corpus CQP valide. Il doit être en majuscule.
-MainCorpus_1 = \ dans
 MainCorpus_2 = Suppression du dossier de corpus binaire : 
 
 MemCqiClient_0  = Erreur interne CQi : 
@@ -143,8 +118,6 @@
 NetCqiServer_0 = ** cqpserver stdout: 
 NetCqiServer_1 = ** cqpserver stderr: 
 
-PACKAGE_LOADED = Bibliothèque {0} chargée.
-
 PARTITION_CREATED = Partition {0} créée en {1} ms
 
 PART_CREATED      = Partie {0} créée en {1} ms
@@ -158,15 +131,10 @@
 PartitionFocus_3 = Le focus de la partie {0} n''appartient pas à la partition {1}.
 PartitionFocus_4 = ** Nom de partition inconnu.
 
-Partition_1      = \ dans
 Partition_18     = Erreur lors de la récupération de la dernière erreur CQP : 
-Partition_2      = \ dans
 Partition_21     = Attention : la partition n'a pu être sauvegardée
-Partition_4      = \ requête : 
 Partition_9      = ** Echec de la création de la partie :
 
-PatchCwbRegistry_0  = Mise à jour du registre du corpus "{0}"
-PatchCwbRegistry_1  = '
 PatchCwbRegistry_13 = Le fichier registry source n'existe pas
 PatchCwbRegistry_16 = Le fichier 'registry' est introuvable
 PatchCwbRegistry_2  = Mise à jour du corpus 
@@ -184,33 +152,22 @@
 Project_1  = Le fichier de déclaration de corpus n'a pas été trouvé
 Project_10 = Project.load: erreur dans le fichier XML du workspace: 
 Project_11 = Erreur lors  de la récupération des 
-Project_12 = Chargement du corpus {0}...
-Project_13 = Ajout des textes : 
 Project_14 = Erreur : le fichier 'import.xml' ne contient pas de version
 Project_15 = Erreur : la version du fichier 'import.xml' est trop ancienne pour que le corpus soit chargé
-Project_16 = Le nom de corpus a été changé de {0} à {1} 
 Project_17 = Erreur : le corpus ne sera pas chargé
 Project_18 = Paramètres : 
 Project_2  = Attention, l''attribut ''name'' du corpus n''est pas défini dans la définition XML du fichier {0}.
-Project_25 = Erreur : le dossier 'registry' n'existe pas
 Project_26 = ** Erreur : le dossier d'entrée n'est pas conforme au format de corpus binaire de TXM :  
-Project_27 = Erreur lors de la reécriture du fichier 'registry' : 
 Project_28 = TXM a besoin des dossiers suivants : 
-Project_3  = Attention : deux corpus partagent le même identifiant (@name) dans leur fichier de configuration : {0}
 Project_31 = et le fichier
-Project_4  = Suppression des doublons de la liste des corpus:
-Project_5  = Analyse du dossier...
 Project_6  = Erreur lors du chargement du corpus avec : 
 Project_7  = Erreur lors du chargement du corpus avec : 
 Project_8  = Le fichier de paramétrage de corpus est introuvable (ou illisible). : {0}. Le corpus correspondant ne sera pas disponible. 
-Project_9  = base
 
 QUERY = Requête sur {0} : {1} <- {2}
 
 QUERYING_PARTITION = Requête sur la partition {0}
 
-QUERY_1            = Requête :
-
 QueryIndex_2 = Attention : requête dupliquée : 
 QueryIndex_3 = Attention: échec de la requête:
 
@@ -227,54 +184,30 @@
 READ_2D_INT_ARRAY_FROM_CQI_SERVER    = Tableau d''entiers reçu du serveur CQi : {0}
 READ_BOOLEAN_FROM_CQI_SERVER         = Booléen reçu du serveur CQi : {0}
 READ_BYTE_FROM_CQI_SERVER            = Octet reçu du serveur CQi : {0}
-READ_HEADER_FROM_CQI_SERVER          = Entête reçue du serveur CQi : {0}
 READ_INTEGER_FROM_CQI_SERVER         = Entier reçu du serveur CQi : {0}
 READ_INT_ARRAY_FROM_CQI_SERVER       = Tableau d''entiers reçu du serveur CQi : {0}
 READ_STRING_ARRAY_FROM_CQI_SERVER    = Tableau de chaines reçu du serveur CQi : {0}
 READ_STRING_FROM_CQI_SERVER          = Chaine reçue du serveur CQi : {0}
 
-RETURNING_CACHED_LEXICON = Recyclage du lexique {0}
-
-RETURN_FROM_QUERY        = {0} occurrences trouvées en {1} ms
-
-ReferencePattern_3 = Référence
-
-Referencer_1 = Références
-Referencer_2 = Références : l'export a échoué :  
-
 RelativeFrequency_3 = Fréquence Relative %
 
-SERVER_STARTED = Moteur de recherche lancé 
-SERVER_STOPED  = Moteur de recherche arrêté
+SERVER_STOPED = Moteur de recherche arrêté
 
-STARTING_SERVER = Lancement du moteur de recherche : {0}
-
 STOPING_SERVER = Arrêt du moteur de recherche
 
 SUBCORPUS_CREATED = Sous-corpus {0} créé en {1} ms
 SUBCORPUS_LEXICON = Calcul du lexique du sous-corpus {0}
 SUBCORPUS_SIZE    = Calcul de la taille du sous-corpus {0}
 
-Selection_0  = \ nombre de mots : 
-Selection_1  = \ nombre de textes : 
-Selection_2  = \ valeur : 
 Selection_26 = Echec de la récupération des valeurs de structures de
-Selection_3  = Propriété : 
-Selection_4  = nombre de mots : 
 Selection_5  = Métadonnées de textes : 
 Selection_6  = Erreur : le corpus
 Selection_7  = n'a pas de 'Base'
 Selection_8  = Erreur : pas de structures trouvées pour la métadonnée d'identifiant : 
 Selection_9  = Erreur lors de la récupération des metadonnées du corpus
 
-StreamGobbler_0 = Initialisation de l'enregistreur de journal
-StreamGobbler_1 = démarrage de l'enregistreur de journal
-StreamGobbler_2 = Arrêt de l'enregistreur de journal
-StreamGobbler_3 = Interruption de l'enregistreur de journal
-
 StructuralUnitProperty_0 = ** Echec de lecture des valeurs de la propriété de structure 
 
-Subcorpus_1 = \ dans
 Subcorpus_2 = Attention : le sous-corpus n'a pu être sauvegardé.
 Subcorpus_3 = \ n'est pas un identifiant de sous-corpus CQP valide. Il doit être en majuscules suivies de caractères minuscules.
 
@@ -306,22 +239,17 @@
 TigerXmlIndexing_7 = SAX : 
 
 Toolbox_0                         = ** Le fichier 
-Toolbox_1                         = ** Plateforme : les paramètres SERVER_PATH_TO_EXECUTABLE, SERVER_PATH_TO_REGISTRY et SERVER_PATH_TO_INIT_FILE doivent être renseignés dans le fichier '.properties' donné à la plateforme 
 Toolbox_10                        = ** Pas d'espace de travail trouvé, création d'un nouvel espace de travail dans le dossier 
-Toolbox_11                        = Mis à jour avec : 
 Toolbox_12                        = Chargement de l'espace de travail à partir du fichier 
 Toolbox_14                        = ** Echec de lecture de l'espace de travail à partir du fichier 
 Toolbox_15                        = ** Erreur :
 Toolbox_16                        = \ n'existe pas.
 Toolbox_17                        = Fin du test d'attente de CQP
 Toolbox_18                        = ** Échec du test d'attente de CQP : 
-Toolbox_2                         = ** Erreur : valeur nulle pour la clé 
-Toolbox_21                        = \ R :
 Toolbox_22                        = \ Espace de travail : 
 Toolbox_27                        = \ et  
 Toolbox_28                        = Erreur lors du démarage du mode mémoire de CQP
 Toolbox_29                        = ** Échec de la connexion au moteur de recherche : 
-Toolbox_3                         = vrai
 Toolbox_30                        = - mauvais login/mot de passe/nom de machine/port :
 Toolbox_31                        = Echec de la commande 'taskkill /IM cqpserver.exe /F': 
 Toolbox_33                        = - ou le moteur de recherche n'a pas été lancé avec la ligne de commande : 
@@ -331,60 +259,40 @@
 Toolbox_39                        = Echec de l'exécution de '
 Toolbox_4                         = Avec les paramètres suivants :
 Toolbox_40                        = ' :
-Toolbox_7                         = Le chemin vers le programme R est null
-Toolbox_8                         = Clés non définies :
-Toolbox_9                         = Paramètres de la plateforme :
 Toolbox_connected_to_corpus_sever = connecté.
-Toolbox_wait_failed               = ** Echec de l'attente du processus interrompu
 Toolbox_workspace_init            = Chargement des sous-corpus et des partitions...
 Toolbox_workspace_init_failed     = ** Echec de l'initialisation de l'espace de travail : 
 Toolbox_wrong_port                = ** La connexion au moteur de recherche a échoué : le port fourni en paramètre n'est pas un nombre entier
 
-TxmObject_0 = ** Echec de l'accès à l'objet parent
-TxmObject_1 = TxmObject : delete : l'objet parent est nul
 TxmObject_2 = Erreur de la sauvegarde de l'attribut
 
-TxmRenderer_1 = TxmRenderer: erreur: pas de corpus trouvé
-TxmRenderer_5 = ligne : 
-TxmRenderer_6 = prop
-TxmRenderer_7 = mdc :
-
-VARIABLE_REMOVED = La variable R "{0}" a été supprimée.
-
 ValidateXml_0 = Validation XML : 
 ValidateXml_1 = est un dossier
 ValidateXml_2 = n'existe pas
 ValidateXml_3 = n'a pas les bon droits de lecture
 
-WORKSPACE_PURGED = Moteur Statistique nettoyé.
+Workspace_2 = ** Echec du chargement de l'espace de travail :
+Workspace_3 = Projet : 
+Workspace_4 = \	Base : 
+Workspace_6 = ** Echec de la création du fichier d'espace de travail : 
+Workspace_8 = Le fichier XML d'espace de travail est mal formé. Un nouveau doit être regénéré...
 
-Workspace_0  = , index 
-Workspace_1  = \	\	\	Édition : 
-Workspace_10 = corpus :
-Workspace_2  = ** Echec du chargement de l'espace de travail :
-Workspace_26 = \	\	\	\	Page : 
-Workspace_27 = \ identifiant de mot 
-Workspace_28 = \	\	Script : 
-Workspace_29 = , type :  
-Workspace_3  = Projet : 
-Workspace_30 = \	Corpus : 
-Workspace_31 = \	\	Texte : 
-Workspace_4  = \	Base : 
-Workspace_5  = \	\	Texte : 
-Workspace_6  = ** Echec de la création du fichier d'espace de travail : 
-Workspace_7  = \ pages
-Workspace_8  = Le fichier XML d'espace de travail est mal formé. Un nouveau doit être regénéré...
+common_cols            = Colonnes
+common_delete          = Supprimer
+common_description     = Description
+common_done            = Terminé.
+common_fMin            = Fmin : 
+common_lowestFrequency = Fréquence minimale
+common_mode            = Mode
+common_numberOfLines   = Nombre de lignes
+common_ok              = OK
+common_pleaseWait      = Veuillez patienter...
+common_queries         = Requêtes : 
+common_query           = Requête :
+common_reference       = Référence
+common_rows            = Lignes
+common_structuralUnit  = Unité structurelle : 
+common_structure       = Structure
+common_units           = Unités
 
-common_cols           = Colonnes
-common_delete         = Supprimer
-common_description    = Description
-common_mode           = Mode
-common_ok             = OK
-common_pleaseWait     = Veuillez patienter...
-common_queries        = Requêtes : 
-common_rows           = Lignes
-common_structuralUnit = Unité structurelle : 
-common_structure      = Structure
-common_units          = Unités
-
 error_error = ** Erreur : {0}.
Index: tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties
===================================================================
--- tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties	(revision 722)
+++ tmp/org.txm.core/src/java/org/txm/core/messages/messages.properties	(revision 723)
@@ -16,8 +16,6 @@
 
 BuildCwbEncodeArgs_0 = The file ''{0}'' cannot be found.
 
-COMPUTE_DONE_NO_RESULT = Done: no result
-
 CONNECTING_CQI_CLIENT = Connecting to the Search Engine with the following parameters: {0}:{1}@{2}{3}
 
 CQI_CLIENT_CONNECTED = Connected to the Search Engine.
@@ -57,16 +55,11 @@
 Corpus_3        = , Encoding : 
 Corpus_4        = , Language : 
 Corpus_5        = No values given
-Corpus_6        = ** Corpus: the reference to text 
-Corpus_7        = \ is broken
 Corpus_8        = \ in \	\	\	\	\	\	\	\	
 
 CqiClient_0  = Get Last CQP error
-CqiClient_1  = Read CQI CTRL LAST GENERAL ERROR
-CqiClient_3  = ** Failed to get last CQP error
 CqiClient_32 = Search Engine launched...
 CqiClient_33 = ** failed to connect to Search Engine.
-CqiClient_34 = Running SearchEngine in memory mode.
 
 CwbEncode_0  = The directory does not exists: 
 CwbEncode_21 = The "binary" directory does not exists: 
@@ -81,29 +74,19 @@
 CwbProcess_4 = Process stoped: 
 CwbProcess_5 = ** Can't find CQP location : 
 
-DONE = Done.
-
-DOUBLE_VECTOR_ADDED_TO_WORKSPACE = Vector "{1}" ({0,number,integer} "doubles") transmitted to the Statistics Engine.
-
 DROP_PARTITION   = Deleting partition {0}
 DROP_QUERYRESULT = Deleting query results {0}
 DROP_SUBCORPUS   = Deleting subcorpus {0}
 
-END_SUBCORPUS_LEXICON = Lexicon of subcorpus {0} computed in {1} ms
-END_SUBCORPUS_SIZE    = size of subcorpus {0} ({1}) computed in {2} ms
+END_SUBCORPUS_SIZE = size of subcorpus {0} ({1}) computed in {2} ms
 
-EVALUATED_EXPRESSION = Expression "{0}" evaluated.
-
 Error_CONNECTION_FAILED = ** Error : while connection to search engine, with the following parameters: 
 
 FAILED = Failed.
 
-FAILED_INIT_CONNECTION_R = ** Failed to connect to Statistics Engine.
-
 FMAX_1 = Fmax: 
 FMAX_2 = , fmax 
 
-FMIN_1 = Fmin: 
 FMIN_2 = , fmin 
 
 FilterManager_0 = ** Filter manager error : initialization 
@@ -117,16 +100,9 @@
 GroovyImportScriptRunner_1 = > beginning execution of 
 GroovyImportScriptRunner_3 = > end of execution 
 
-INT_VECTOR_ADDED_TO_WORKSPACE = Vector "{1}" ({0,number,integer} "int") transmitted to Statistics Engine.
-
 LEXICON = Lexicon 
 
-LEXICON_ADDED = Lexicon "{1}" ({0,number,integer} entries) transmitted to Statistics Engine.
-
-MATRIX_ADDED_TO_WORKSPACE = Matrix "{2}" ({0,number,integer} rows and {1,number,integer} columns) transmitted to Statistics Engine.
-
 MainCorpus_0 = \ is not a valid CQP ID for a corpus. It must be in uppercase characters.
-MainCorpus_1 = \ in 
 MainCorpus_2 = Delete binary directory: 
 
 MemCqiClient_0  = Internal CQi error: 
@@ -149,8 +125,6 @@
 NetCqiServer_0 = ** cqpserver stdout: 
 NetCqiServer_1 = ** cqpserver stderr: 
 
-PACKAGE_LOADED = Library {0} loaded.
-
 PARTITION_CREATED = Partition {0} created in {1} ms
 
 PART_CREATED      = Part {0} created in {1} ms
@@ -164,15 +138,10 @@
 PartitionFocus_3 = The {0} part focus doesn''t belong to partition {1}.
 PartitionFocus_4 = ** Unknown partition name.
 
-Partition_1      = \ in 
 Partition_18     = Failed to get last CQP error: 
-Partition_2      = \ in 
 Partition_21     = Warning: the partition could not be saved in workspace: 
-Partition_4      = \ query: 
 Partition_9      = ** Failed to create part: 
 
-PatchCwbRegistry_0  = "{0}" corpus registry update
-PatchCwbRegistry_1  = ' corpus
 PatchCwbRegistry_13 = Source registry does not exists: 
 PatchCwbRegistry_16 = Can't find registry file
 PatchCwbRegistry_2  = Updating 
@@ -190,33 +159,22 @@
 Project_1  = The corpus declaration file is not found too: 
 Project_10 = Project.load: workspace XML file error: 
 Project_11 = Failed to load base parameters from file: 
-Project_12 = Loading {0} corpus...  
-Project_13 = Adding texts: 
 Project_14 = Error: no version in import.xml file
 Project_15 = Error: the corpus version is too old to be loaded.
-Project_16 = Corpus name has been changed from {0} to {1} 
 Project_17 = Error: skipping the loading of corpus: 
 Project_18 = PARAMS: 
 Project_2  = Warning in corpus definition: no name attribute defined in its XML file : {0}
-Project_25 = Error: registry directory does not exist ! 
 Project_26 = ** Error: ''{0}'' corpus directory is not conformant to TXM corpus binary format: corpus skipped." 
-Project_27 = Error while patching registry file: 
 Project_28 = TXM needs folders: 
-Project_3  = Project: load: malformed base node: duplicated 
 Project_31 = and file 
-Project_4  = Remove duplicate corpus from corpus list: 
-Project_5  = Analysing directory...
 Project_6  = Failed to load corpus with params: 
 Project_7  = Failed to load base with parameters file: 
 Project_8  = Can't read corpus parameters file: 
-Project_9  = base
 
 QUERY = Query on {0} : {1} <- {2}
 
 QUERYING_PARTITION = Querying partition {0}
 
-QUERY_1            = Query:
-
 QueryIndex_2 = Warning : duplicate query entry : 
 QueryIndex_3 = Warning: query failed: 
 
@@ -233,54 +191,30 @@
 READ_2D_INT_ARRAY_FROM_CQI_SERVER    = Read string 2D integer from the CQi server : {0}
 READ_BOOLEAN_FROM_CQI_SERVER         = Read boolean from the CQi server : {0}
 READ_BYTE_FROM_CQI_SERVER            = Read byte from the CQi server : {0}
-READ_HEADER_FROM_CQI_SERVER          = Read header from the CQi server : {0}
 READ_INTEGER_FROM_CQI_SERVER         = Read integer from the CQi server : {0}
 READ_INT_ARRAY_FROM_CQI_SERVER       = Read integer array from the CQi server : {0}
 READ_STRING_ARRAY_FROM_CQI_SERVER    = Read string array from the CQi server : {0}
 READ_STRING_FROM_CQI_SERVER          = Read string from the CQi server : {0}
 
-RETURNING_CACHED_LEXICON = Recycling the lexicon {0}
+RelativeFrequency_3 = Relative Frequency %
 
-RETURN_FROM_QUERY        = {0} matches found in {1} ms
+SERVER_STOPED = Search Engine stopped
 
-ReferencePattern_3 = Reference
-
-Referencer_1 = Referencer
-Referencer_2 = Referencer export failed: 
-
-RelativeFrequency_3 = Relative Frenquency %
-
-SERVER_STARTED = Search Engine started 
-SERVER_STOPED  = Search Engine stopped
-
-STARTING_SERVER = Starting Search Engine: {0}
-
 STOPING_SERVER = Stopping the Search Engine
 
 SUBCORPUS_CREATED = Subcorpus {0} created in {1} ms
 SUBCORPUS_LEXICON = Computing the lexicon of subcorpus {0}
 SUBCORPUS_SIZE    = Computing the size of subcorpus {0}
 
-Selection_0  = \ number of words : 
-Selection_1  = \ number of texts : 
-Selection_2  = \ value : 
 Selection_26 = Failed to get sup values of 
-Selection_3  = Property : 
-Selection_4  = number of words : 
 Selection_5  = Text metadata: 
 Selection_6  = Selection error: the corpus 
 Selection_7  = has no base
 Selection_8  = Can't find structural unit for metadata with id: 
 Selection_9  = Error while getting metadatas from Base.importMetadatas: 
 
-StreamGobbler_0 = Initializing log recorder
-StreamGobbler_1 = Starting log recorder
-StreamGobbler_2 = Stopping log recorder
-StreamGobbler_3 = Interrupting log recorder
-
 StructuralUnitProperty_0 = ** Failed to access structural property values 
 
-Subcorpus_1 = \ in 
 Subcorpus_2 = Warning: the subcorpus could not be saved in workspace: 
 Subcorpus_3 = \ is not a valid CQP ID for a subcorpus. It must be an uppercase character followed by lowercase characters.
 
@@ -314,22 +248,17 @@
 TigerXmlIndexing_7 = SAX: 
 
 Toolbox_0                         = ** File
-Toolbox_1                         = ** Platform : the parameters SERVER_PATH_TO_EXECUTABLE, SERVER_PATH_TO_REGISTRY et SERVER_PATH_TO_INIT_FILE must be specified in a given '.properties' file.
 Toolbox_10                        = ** No worlspace found. Creating a new one.
-Toolbox_11                        = Updating with : 
 Toolbox_12                        = Loading workspace from file : 
 Toolbox_14                        = ** Error loadgin workspace from file : 
 Toolbox_15                        = ** Error : 
 Toolbox_16                        = \ does not exists
 Toolbox_17                        = End of CQP wait test
 Toolbox_18                        = ** Error while waiting for CQP
-Toolbox_2                         = ** Error: null value for key 
-Toolbox_21                        = \ R: 
 Toolbox_22                        = \ Workspace: 
 Toolbox_27                        = \ and 
 Toolbox_28                        = Failed to start MemCqiClient: 
 Toolbox_29                        = ** Error while connecting to search engine.
-Toolbox_3                         = true
 Toolbox_30                        = - wrong login or password or port : 
 Toolbox_31                        = Failed to exec 'taskkill /IM cqpserver.exe /F': 
 Toolbox_33                        = - or the engine was not started with the command line: 
@@ -339,28 +268,15 @@
 Toolbox_39                        = Failed to exec '
 Toolbox_4                         = With parameters: 
 Toolbox_40                        = ': 
-Toolbox_7                         = The path to R program is null
-Toolbox_8                         = Undefined keys : 
-Toolbox_9                         = Platform parameters: 
 Toolbox_connected_to_corpus_sever = connected
-Toolbox_wait_failed               = ** Failed to wait for the interrupted process
 Toolbox_workspace_init            = Loading subcorpora and partitions... 
 Toolbox_workspace_init_failed     = ** Error during workspace initialisation :
 Toolbox_wrong_port                = ** Error : the connexion to the server failed : wrong port format
 
-TxmObject_0 = ** Failed to get parent object
-TxmObject_1 = TxmObject: delete: parent object is null
 TxmObject_2 = Failed to save attribute 
 
-TxmRenderer_1 = TxmRenderer: error: no corpus found for result 
-TxmRenderer_5 = line: 
-TxmRenderer_6 = prop 
-TxmRenderer_7 = mdc: 
-
 V = , v 
 
-VARIABLE_REMOVED = R Variable "{0}" deleted.
-
 VMAX_1 = Vmax:
 
 ValidateXml_0 = XmlValidation: 
@@ -368,35 +284,28 @@
 ValidateXml_2 = does not exists
 ValidateXml_3 = is not read-able
 
-WORKSPACE_PURGED = Statistics Engine cleaned up.
+Workspace_2 = ** Failed to load workspace: 
+Workspace_3 = Project: 
+Workspace_4 = \	Base: 
+Workspace_6 = ** Failed to create empty workspace file: 
+Workspace_8 = Workspace XML file is mal formed. We need to recreate one...
 
-Workspace_0  = , index 
-Workspace_1  = \	\	\	Edition: 
-Workspace_10 = corpus: 
-Workspace_2  = ** Failed to load workspace: 
-Workspace_26 = \	\	\	\	Page: 
-Workspace_27 = \ wordid 
-Workspace_28 = \	\	Script: 
-Workspace_29 = , type:  
-Workspace_3  = Project: 
-Workspace_30 = \	Corpora: 
-Workspace_31 = \	\	Text: 
-Workspace_4  = \	Base: 
-Workspace_5  = \	\	Text: 
-Workspace_6  = ** Failed to create empty workspace file: 
-Workspace_7  = \ pages
-Workspace_8  = Workspace XML file is mal formed. We need to recreate one...
+common_cols            = Cols
+common_delete          = Delete
+common_description     = Description
+common_done            = Done.
+common_fMin            = Fmin: 
+common_lowestFrequency = Lowest frequency
+common_mode            = Mode
+common_numberOfLines   = Number of lines
+common_ok              = OK
+common_pleaseWait      = Please wait...
+common_queries         = Queries:
+common_query           = Query:
+common_reference       = Reference
+common_rows            = Rows
+common_structuralUnit  = Structural Unit:
+common_structure       = Structure
+common_units           = Units
 
-common_cols           = Cols
-common_delete         = Delete
-common_description    = Description
-common_mode           = Mode
-common_ok             = OK
-common_pleaseWait     = Please wait...
-common_queries        = Queries:
-common_rows           = Rows
-common_structuralUnit = Structural Unit:
-common_structure      = Structure
-common_units          = Units
-
 error_error = ** Error: {0}.
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java	(revision 722)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditor.java	(revision 723)
@@ -19,6 +19,7 @@
 import org.eclipse.ui.part.EditorPart;
 import org.eclipse.ui.part.MultiPageEditorPart;
 import org.txm.chartsengine.core.ChartsEngine;
+import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
 import org.txm.chartsengine.core.results.ChartResult;
 import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
 import org.txm.chartsengine.rcp.events.EventCallBack;
@@ -94,20 +95,13 @@
 	 * @param swtComponentsProvider
 	 * @param chartEditorInput
 	 */
-	protected ChartEditor(SWTChartsComponentsProvider swtComponentsProvider, ChartEditorInput chartEditorInput) {
+	protected ChartEditor(ChartEditorInput chartEditorInput) {
 		this.setInput(chartEditorInput);
 		this.setPartName(chartEditorInput.getName());
 		
 		this.wasAlreadyOpened = false;
 	}
 
-	/**
-	 * 
-	 * @param chartEditorInput
-	 */
-	public ChartEditor(ChartEditorInput<ChartResult> chartEditorInput) {
-		this(SWTChartsComponentsProvider.getCurrent(), chartEditorInput);
-	}
 	
 	/**
 	 * Subclasses manual creation.
@@ -174,79 +168,57 @@
 		SWTChartsComponentsProvider.initDefaultContextMenus(this.chartComposite);
 	}
 	
+
 	/**
 	 * 
 	 * @param result
-	 * @return
 	 */
-//	public static ChartEditor openEditor(ChartResult result) {
-//		return openEditor(result, SWTChartsComponentsProvider.getCurrent());
-//	}
-
 	public static void openEditor(ChartResult result) {
 		openEditor(result, result.getClass().getName());
 	}
 
 	
-	public static void openEditor(ChartResult result, String editorPartId)	{
-		compute(new ChartEditorInput(result), editorPartId, false, null);
-	}
-
-	
 	/**
 	 * 
 	 * @param result
-	 * @param chartsComponentsProvider
-	 * @return
+	 * @param editorPartId
 	 */
-	public static void openEditor(ChartResult result, SWTChartsComponentsProvider chartsComponentsProvider) {
-		compute(new ChartEditorInput(result), result.getClass().getName(), false, null);
-		//return chartsComponentsProvider.openEditor(result);
+	public static void openEditor(ChartResult result, String editorPartId)	{
+		compute(new ChartEditorInput(result), editorPartId, false, null);
 	}
 
 
+
 	@Override
 	public void updateResultFromEditor() {
 		// does nothing by default
 	}
 	
-//	@Override
-//	public void updateEditorFromResult(boolean update) {
-//		// nothing to do
-//	}
-	
 	/**
 	 * Synchronizes the editor with the chart result. 
 	 * Dedicated to dynamically change the editor components from the stored result.
 	 */
 	public abstract void updateEditorFromChart(boolean update);
 	
-//	@Override
-//	public final void updateEditorFromResult(boolean update) { updateEditorFromChart(update);
 	
-	
-	
 	@Override
 	public final void updateEditorFromResult(boolean update) {
 		
-		
 		this.updateEditorFromChart(update);
 		
 		// check that the charts engine used for the result matches the SWT components provider otherwise fin a suitable components provider
 		if(this.getResult().getChartsEngine() != this.getSWTChartsComponentsProvider().getChartsEngine())	{
 			this.getEditorInput().setSWTChartsComponentsProvider(SWTChartsComponentsProvider.getComponentsProvider(this.getResult().getChartsEngine()));
 			this.getSWTChartsComponentsProvider().setChartsEngine(this.getResult().getChartsEngine());
-			System.err.println("ChartEditor.__updateEditorFromResult(): charts engine used to create the chart does not match the editor one. The SWT components provider has been changed to match it: " + this.getSWTChartsComponentsProvider() + ".");
 			
+			Log.warning("ChartEditor.__updateEditorFromResult(): charts engine used to create the chart does not match the editor one. The SWT components provider has been changed to match it: " + this.getSWTChartsComponentsProvider() + "."); //$NON-NLS-1$
+			
 			// recreating the chart composite
 			Composite parent = this.chartComposite.getParent();
 			this.chartComposite.dispose();
 			this.chartComposite = this.getSWTChartsComponentsProvider().createComposite(this, parent);
 			
 			GridData gd = new GridData(GridData.FILL_BOTH);
-//			gd.grabExcessVerticalSpace = true;
-//			gd.grabExcessHorizontalSpace = true;
-			//gd.horizontalSpan = 2; // 2 for match the command parameters toolbar AND the chart toolbar
 			this.chartComposite.setLayoutData(gd);
 			parent.layout();
 		}
@@ -311,9 +283,9 @@
 				contributions[i].getAttribute("resultDataClass") != null //$NON-NLS-1$
 				&& contributions[i].getAttribute("resultDataClass").equals(this.getResult().getClass().getName()) //$NON-NLS-1$
 				
-				&& ((contributions[i].getAttribute("chartType") == null && this.getChartType() == null
+				&& ((contributions[i].getAttribute("chartType") == null && this.getChartType().equals(ChartsEnginePreferences.DEFAULT_CHART_TYPE)
 					||
-					contributions[i].getAttribute("chartType") != null && this.getChartType() != null && contributions[i].getAttribute("chartType").equals(this.getChartType())
+					contributions[i].getAttribute("chartType") != null && !this.getChartType().equals(ChartsEnginePreferences.DEFAULT_CHART_TYPE) && contributions[i].getAttribute("chartType").equals(this.getChartType())
 					)  //$NON-NLS-1$
 				)
 				
@@ -326,22 +298,22 @@
 					EventCallBackHandler mouseHandler = this.chartComposite.getMouseCallBackHandler();
 					if(mouseHandler != null && mouseHandler.getEventCallBack(eventCallBack.getClass()) == null)	 {
 
-						Log.info("ChartEditor.createPartControl(): call back of type " + eventCallBack.getClass()
-								+ " registered in mouse handler (chart editor = " + this.getClass()
-								+ ", result data class = " + this.getResult().getClass()
-								+ ", chart type = " + this.getChartType()
-								+ ").");
+						Log.info("ChartEditor.registerEventCallBackExtensions(): call back of type " + eventCallBack.getClass()  //$NON-NLS-1$
+								+ " registered in mouse handler (chart editor = " + this.getClass()  //$NON-NLS-1$
+								+ ", result data class = " + this.getResult().getClass()  //$NON-NLS-1$
+								+ ", chart type = " + this.getChartType()  //$NON-NLS-1$
+								+ ").");  //$NON-NLS-1$
 						
 						mouseHandler.registerEventCallBack(eventCallBack);
 					}
 					EventCallBackHandler keyboardHandler = this.chartComposite.getKeyCallBackHandler();
 					if(keyboardHandler != null && keyboardHandler.getEventCallBack(eventCallBack.getClass()) == null)	 {
 						
-						Log.info("ChartEditor.createPartControl(): call back of type " + eventCallBack.getClass()
-								+ " registered in key handler (chart editor = " + this.getClass()
-								+ ", result data class = " + this.getResult().getClass()
-								+ ", chart type = " + this.getChartType()
-								+ ").");
+						Log.info("ChartEditor.registerEventCallBackExtensions(): call back of type " + eventCallBack.getClass()  //$NON-NLS-1$
+								+ " registered in key handler (chart editor = " + this.getClass()  //$NON-NLS-1$
+								+ ", result data class = " + this.getResult().getClass()  //$NON-NLS-1$
+								+ ", chart type = " + this.getChartType()  //$NON-NLS-1$
+								+ ").");  //$NON-NLS-1$
 						
 						keyboardHandler.registerEventCallBack(eventCallBack);
 					}
Index: tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditorInput.java
===================================================================
--- tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditorInput.java	(revision 722)
+++ tmp/org.txm.chartsengine.rcp/src/org/txm/chartsengine/rcp/editors/ChartEditorInput.java	(revision 723)
@@ -7,7 +7,6 @@
 import org.txm.chartsengine.core.results.ChartResult;
 import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
 import org.txm.core.preferences.TXMPreferences;
-import org.txm.core.results.TXMResult;
 import org.txm.rcp.editors.TXMResultEditorInput;
 
 /**
@@ -18,10 +17,6 @@
 public class ChartEditorInput<T extends ChartResult> extends TXMResultEditorInput<ChartResult> {
 
 
-	@Deprecated
-	protected String name;
-	
-	
 	/**
 	 * SWT chart components provider used to create the chart editor.
 	 * Store it allows the switch of component provider in the RCP in keeping the chart editors in a coherent state.
@@ -172,12 +167,6 @@
 		this.chartContainer = chartContainer;
 	}
 
-//	public void setChart(Object chart) {
-//		this.chart = chart;
-//	}
-
-	
-
 	/**
 	 * Set the <code>SWTChartsComponentsProvider</code> to link to this editor input and to use for reading the chart object.
 	 * @param swtChartsComponentsProvider the swtChartsComponentsProvider to set
@@ -187,7 +176,6 @@
 	}
 
 
-
 	/**
 	 * Gets a string representing the type of the chart as defined in the chart creator extension.
 	 * @return the chartType or <code>null</code> if there only one chart type needed for the linked <code>TXMResult</code>. 
Index: tmp/org.txm.partition.core/plugin.xml
===================================================================
--- tmp/org.txm.partition.core/plugin.xml	(revision 722)
+++ tmp/org.txm.partition.core/plugin.xml	(revision 723)
@@ -10,24 +10,20 @@
    <extension
          point="org.txm.chartsengine.chartcreator">
       <ChartCreator
-            chartsEngineName="jfreechart_charts_engine"
             class="org.txm.partition.core.chartsengine.jfreechart.JFCPartitionDimensionsBarChartCreator"
             fileNamePrefix="partition_dimensions_bar">
       </ChartCreator>
       <ChartCreator
             chartType="Partition Dimensions Pie Chart"
-            chartsEngineName="jfreechart_charts_engine"
             class="org.txm.partition.core.chartsengine.jfreechart.JFCPartitionDimensionsPieChartCreator"
             fileNamePrefix="partition_dimensions_pie">
       </ChartCreator>
       <ChartCreator
-            chartsEngineName="r_charts_engine"
             class="org.txm.partition.core.chartsengine.r.RPartitionDimensionsBarChartCreator"
             fileNamePrefix="partition_dimensions_bar">
       </ChartCreator>
       <ChartCreator
             chartType="Partition Dimensions Pie Chart"
-            chartsEngineName="r_charts_engine"
             class="org.txm.partition.core.chartsengine.r.RPartitionDimensionsPieChartCreator"
             fileNamePrefix="partition_dimensions_pie">
       </ChartCreator>
Index: tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/jfreechart/JFCPartitionDimensionsBarChartCreator.java
===================================================================
--- tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/jfreechart/JFCPartitionDimensionsBarChartCreator.java	(revision 722)
+++ tmp/org.txm.partition.core/src/org/txm/partition/core/chartsengine/jfreechart/JFCPartitionDimensionsBarChartCreator.java	(revision 723)
@@ -10,11 +10,9 @@
 import org.jfree.data.general.DatasetUtilities;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
-import org.txm.chartsengine.core.ChartsEngine;
 import org.txm.chartsengine.core.preferences.ChartsEnginePreferences;
 import org.txm.chartsengine.core.results.ChartResult;
 import org.txm.chartsengine.jfreechart.core.JFCChartCreator;
-import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
 import org.txm.chartsengine.jfreechart.core.themes.base.ExtendedNumberAxis;
 import org.txm.chartsengine.jfreechart.core.themes.base.SymbolAxisBetweenTicks;
 import org.txm.partition.core.chartsengine.base.Utils;
@@ -42,8 +40,6 @@
 
 		// Create the chart
         chart = this.getChartsEngine().createXYBarChart(dataset, null, PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_X_AXIS_LABEL, PartitionCoreMessages.CHARTSENGINE_PARTITION_DIMENSIONS_Y_AXIS_LABEL, false, true);
-        ((IRendererWithItemSelection) chart.getXYPlot().getRenderer()).setChartType(ChartsEngine.CHART_TYPE_PARTITION_DIMENSIONS);
-
         // Custom range axis for ticks drawing options
         chart.getXYPlot().setRangeAxis(new ExtendedNumberAxis((NumberAxis) chart.getXYPlot().getRangeAxis(), false, true, 0, DatasetUtilities.findMaximumRangeValue(chart.getXYPlot().getDataset()).doubleValue()));
 
Index: tmp/org.txm.progression.core/plugin.xml
===================================================================
--- tmp/org.txm.progression.core/plugin.xml	(revision 722)
+++ tmp/org.txm.progression.core/plugin.xml	(revision 723)
@@ -4,12 +4,10 @@
    <extension
          point="org.txm.chartsengine.chartcreator">
       <ChartCreator
-            chartsEngineName="jfreechart_charts_engine"
             class="org.txm.progression.core.chartsengine.jfreechart.JFCProgressionCumulativeChartCreator"
             fileNamePrefix="progression_cumulative">
       </ChartCreator>
       <ChartCreator
-            chartsEngineName="r_charts_engine"
             class="org.txm.progression.core.chartsengine.r.RProgressionCumulativeChartCreator"
             fileNamePrefix="progression_cumulative">
       </ChartCreator>
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/base/Utils.java
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/base/Utils.java	(revision 722)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/base/Utils.java	(revision 723)
@@ -1,6 +1,5 @@
 package org.txm.progression.core.chartsengine.base;
 
-import org.txm.chartsengine.core.ChartsEngine;
 import org.txm.progression.core.functions.Progression;
 import org.txm.progression.core.messages.ProgressionCoreMessages;
 
@@ -56,13 +55,5 @@
 		return title;
 	}
 	
-	/**
-	 * Gets a chart creator from the specified charts engine.
-	 * @param chartsEngine
-	 * @return
-	 */
-	public static ProgressionChartCreator getChartCreator(ChartsEngine chartsEngine)	{
-		return (ProgressionChartCreator) chartsEngine.getChartCreator(Progression.class);
-	}
-	
+
 }
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/JFCProgressionCumulativeChartCreator.java
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/JFCProgressionCumulativeChartCreator.java	(revision 722)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/JFCProgressionCumulativeChartCreator.java	(revision 723)
@@ -101,7 +101,6 @@
 
 
 
-        ((IRendererWithItemSelection) chart.getXYPlot().getRenderer()).setChartType(ChartsEngine.CHART_TYPE_PROGRESSION);
         ((IRendererWithItemSelection) chart.getXYPlot().getRenderer()).getItemsSelector().setResult(progression);
 
 		
Index: tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/themes/highcharts/renderers/ProgressionItemSelectionRenderer.java
===================================================================
--- tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/themes/highcharts/renderers/ProgressionItemSelectionRenderer.java	(revision 722)
+++ tmp/org.txm.progression.core/src/org/txm/progression/core/chartsengine/jfreechart/themes/highcharts/renderers/ProgressionItemSelectionRenderer.java	(revision 723)
@@ -54,7 +54,6 @@
 	 */
 	public ProgressionItemSelectionRenderer() {
 		super();
-		this.setChartType(ChartsEngine.CHART_TYPE_PROGRESSION);
 		// FIXME: simple selection mode
 		//((MultipleItemsSelector) this.multipleItemsSelector).setSimpleSelectionMode(true);
 	}
Index: tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java
===================================================================
--- tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java	(revision 722)
+++ tmp/org.txm.concordance.core/src/org/txm/concordance/core/functions/Concordance.java	(revision 723)
@@ -106,7 +106,11 @@
 
 	private ArrayList<Property> availableRightSortProperties;
 
+
 	
+	/** The query. */
+	@Parameter(key=ConcordancePreferences.QUERY)
+	protected Query pQuery;
 	
 	
 	/** The keyword analysis properties */
@@ -133,10 +137,6 @@
 	@Parameter(key=ConcordancePreferences.LEFT_CONTEXT_SIZE)
 	protected Integer pLeftContextSize;
 	
-	/** The query. */
-	@Parameter
-	protected Query pQuery;
-	
 	/** The right context size. */
 	@Parameter(key=ConcordancePreferences.RIGHT_CONTEXT_SIZE)
 	protected Integer pRightContextSize;
Index: tmp/org.txm.libs.cqp.win32/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.libs.cqp.win32/META-INF/MANIFEST.MF	(revision 722)
+++ tmp/org.txm.libs.cqp.win32/META-INF/MANIFEST.MF	(revision 723)
@@ -3,7 +3,7 @@
 Bundle-Name: CQP.win32
 Bundle-SymbolicName: org.txm.libs.cqp.win32
 Bundle-Version: 1.1.0.qualifier
-Fragment-Host: org.txm.libs.cqp;bundle-version="1.0.0.qualifier"
+Fragment-Host: org.txm.libs.cqp
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Textometrie.org
 Eclipse-PlatformFilter: (osgi.os=win32)
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryBarRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryBarRenderer.java	(revision 722)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryBarRenderer.java	(revision 723)
@@ -189,7 +189,6 @@
 
 		 	// Gray scale rendering mode
 		 	if(color.getRed() == color.getGreen() &&  color.getGreen() == color.getBlue())	{
-			 	// FIXME : other version, fixed color
 			 	color = Color.RED;
 		 	}
 		 	// Color rendering and Monochrome modes
@@ -226,17 +225,8 @@
 		// Do nothing for bar renderer
 	}
 
-	@Override
-	public int getChartType() {
-		return this.mouseOverItemSelector.getChartType();
-	}
 
 	@Override
-	public void setChartType(int chartType) {
-		this.mouseOverItemSelector.setChartType(chartType);
-	}
-
-	@Override
 	public void init() {
 		// TODO Auto-generated method stub
 		
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYBarRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYBarRenderer.java	(revision 722)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYBarRenderer.java	(revision 723)
@@ -178,18 +178,8 @@
 		// Do nothing for bar renderer
 	}
 
-	@Override
-	public int getChartType() {
-		return this.itemsSelector.getChartType();
-	}
 
 	@Override
-	public void setChartType(int chartType) {
-		this.itemsSelector.setChartType(chartType);
-	}
-
-
-	@Override
 	public void init() {
 		// TODO Auto-generated method stub
 		
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryLineAndShapeRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryLineAndShapeRenderer.java	(revision 722)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryLineAndShapeRenderer.java	(revision 723)
@@ -149,19 +149,8 @@
 	}
 
 
-	@Override
-	public int getChartType() {
-		return this.mouseOverItemSelector.getChartType();
-	}
 
-
 	@Override
-	public void setChartType(int chartType) {
-		this.mouseOverItemSelector.setChartType(chartType);
-	}
-
-
-	@Override
 	public void updateDatasetForDrawingSelectedItemAsLast() {
 		// FIXME : to remove when validated
 		//this.itemSelector.setItemDrawnAtLast(this);
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryStepRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryStepRenderer.java	(revision 722)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionCategoryStepRenderer.java	(revision 723)
@@ -145,18 +145,8 @@
 	}
 
 
-	@Override
-	public int getChartType() {
-		return this.mouseOverItemSelector.getChartType();
-	}
 
-
 	@Override
-	public void setChartType(int chartType) {
-		this.mouseOverItemSelector.setChartType(chartType);
-	}
-
-	@Override
 	public void updateDatasetForDrawingSelectedItemAsLast() {
 		// FIXME : to remove when validated
 		//this.itemSelector.setItemDrawnAtLast(this);
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYCardinalSplineRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYCardinalSplineRenderer.java	(revision 722)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYCardinalSplineRenderer.java	(revision 723)
@@ -346,18 +346,8 @@
 	}
 
 
-	@Override
-	public int getChartType() {
-		return this.mouseOverItemSelector.getChartType();
-	}
 
 	@Override
-	public void setChartType(int chartType) {
-		this.mouseOverItemSelector.setChartType(chartType);
-	}
-
-
-	@Override
 	public void init() {
 		// TODO Auto-generated method stub
 		
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYSplineRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYSplineRenderer.java	(revision 722)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYSplineRenderer.java	(revision 723)
@@ -365,18 +365,8 @@
 	}
 
 
-	@Override
-	public int getChartType() {
-		return this.mouseOverItemSelector.getChartType();
-	}
 
 	@Override
-	public void setChartType(int chartType) {
-		this.mouseOverItemSelector.setChartType(chartType);
-	}
-
-
-	@Override
 	public void init() {
 		// TODO Auto-generated method stub
 		
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYLineAndShapeRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYLineAndShapeRenderer.java	(revision 722)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYLineAndShapeRenderer.java	(revision 723)
@@ -224,18 +224,7 @@
 	}
 
 
-	@Override
-	public int getChartType() {
-		return this.multipleItemsSelector.getChartType();
-	}
 
-
-	@Override
-	public void setChartType(int chartType) {
-		this.multipleItemsSelector.setChartType(chartType);
-	}
-
-
 //	
 //    @Override
 //    public XYItemRendererState initialise(Graphics2D g2, Rectangle2D dataArea,
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYStepRenderer.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYStepRenderer.java	(revision 722)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/renderers/ItemSelectionXYStepRenderer.java	(revision 723)
@@ -151,18 +151,8 @@
 	}
 
 
-	@Override
-	public int getChartType() {
-		return this.multipleItemsSelector.getChartType();
-	}
 
-
 	@Override
-	public void setChartType(int chartType) {
-		this.multipleItemsSelector.setChartType(chartType);
-	}
-
-	@Override
 	public void updateDatasetForDrawingSelectedItemAsLast() {
 		// FIXME: put the mouse over item series at last in the dataset
 //		this.getPlot().getDatasetRenderingOrder().
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/HighchartsDefaultTheme.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/HighchartsDefaultTheme.java	(revision 722)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/themes/highcharts/defaulttheme/HighchartsDefaultTheme.java	(revision 723)
@@ -345,9 +345,7 @@
 
 
 	    	// For drawing tick marks between categories and not in theirs middle
-	    	if(((IRendererWithItemSelection)renderer).getChartType() != ChartsEngine.CHART_TYPE_CAH_2D)	{
-	    		plot.setDomainAxis(new CategoryAxisBetweenTicks(plot.getDomainAxis()));
-	    	}
+    		plot.setDomainAxis(new CategoryAxisBetweenTicks(plot.getDomainAxis()));
 
 	    	plot.getDomainAxis().setAxisLinePaint(Color.decode("#C0D0E0"));
 	    	plot.getDomainAxis().setTickMarkPaint(Color.decode("#C0D0E0"));
@@ -365,15 +363,8 @@
 	    	if(renderer instanceof ItemSelectionCategoryBarRenderer)	{
 	    		ItemSelectionCategoryBarRenderer barRenderer = (ItemSelectionCategoryBarRenderer) renderer;
 	    		barRenderer.setDrawBarOutline(true);
+	    		barRenderer.setMaximumBarWidth(0.1);
 
-		    	if(((IRendererWithItemSelection)renderer).getChartType() == ChartsEngine.CHART_TYPE_CAH_2D)	{
-		    		barRenderer.setMaximumBarWidth(0.001);
-		    	}
-		    	else	{
-		    		barRenderer.setMaximumBarWidth(0.1);
-		    	}
-
-		    	//
 	    		barRenderer.setItemMargin(0.1);		// the space between bar of same category
 
 		    	plot.getDomainAxis().setLowerMargin(0); // the space before the items in the axis
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/renderers/interfaces/IRendererWithItemSelection.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/renderers/interfaces/IRendererWithItemSelection.java	(revision 722)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/renderers/interfaces/IRendererWithItemSelection.java	(revision 723)
@@ -29,22 +29,6 @@
 	public void updateDatasetForDrawingSelectedItemAsLast();
 	
 	/**
-	 * Returns the chart type as defined by {@link ChartsEngine} constants.
-	 * @return
-	 */
-	@Deprecated
-	// FIXME: became useless since the ChartResult is stored in the renderer
-	public int getChartType();
-	
-	/**
-	 * Sets the chart type  
-	 * @param chartType
-	 */
-	@Deprecated
-	// FIXME: became useless since the ChartResult is stored in the renderer
-	public void setChartType(int chartType);
-	
-	/**
      * Returns the plot that the renderer has been assigned to (where
      * <code>null</code> indicates that the renderer is not currently assigned
      * to a plot).
Index: tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/renderers/MouseOverItemSelector.java
===================================================================
--- tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/renderers/MouseOverItemSelector.java	(revision 722)
+++ tmp/org.txm.chartsengine.jfreechart.core/src/org/txm/chartsengine/jfreechart/core/renderers/MouseOverItemSelector.java	(revision 723)
@@ -47,13 +47,6 @@
 	protected int yCoord;
 	
 	/**
-	 * The chart type linked to the item selector.
-	 */
-	// FIXME: if now we store the TXM result data we may do not need the chart type anymore
-	// (NOTE: the 2 variables may be useful for example to dissociate CA Factorial Map and CA Singular Values which have the same CA result)
-	protected int chartType;
-	
-	/**
 	 * Linked chart result.
 	 */
 	protected ChartResult result; 
@@ -78,7 +71,6 @@
 	 */
 	public MouseOverItemSelector(IRendererWithItemSelection renderer) {
 		this.renderer = renderer;
-		this.chartType = -1;
 		this.active = true;
 		
 		this.itemsToDrawAsLastElements = new HashMap<Integer, List<Integer>>();
@@ -185,22 +177,6 @@
 
 
 	/**
-	 * @return the chartType
-	 */
-	public int getChartType() {
-		return chartType;
-	}
-
-
-	/**
-	 * @param chartType the chartType to set
-	 */
-	public void setChartType(int chartType) {
-		this.chartType = chartType;
-	}
-
-
-	/**
 	 * Checks if the item selection is enabled or disabled
 	 * @return the active state
 	 */
Index: tmp/org.txm.ahc.rcp/plugin.xml
===================================================================
--- tmp/org.txm.ahc.rcp/plugin.xml	(revision 722)
+++ tmp/org.txm.ahc.rcp/plugin.xml	(revision 723)
@@ -121,7 +121,7 @@
                   ifEmpty="false"
                   operator="and">
                <instanceof
-                     value="org.txm.ahc.core.functions.CAH">
+                     value="org.txm.ahc.core.functions.AHC">
                </instanceof>
             </iterate>
          </with>
Index: tmp/org.txm.wordcloud.core/plugin.xml
===================================================================
--- tmp/org.txm.wordcloud.core/plugin.xml	(revision 722)
+++ tmp/org.txm.wordcloud.core/plugin.xml	(revision 723)
@@ -4,12 +4,10 @@
    <extension
          point="org.txm.chartsengine.chartcreator">
       <ChartCreator
-            chartsEngineName="TMP_jfreechart_charts_engine"
             class="org.txm.wordcloud.core.chartsengine.jfreechart.JFCWordCloudChartCreator"
             fileNamePrefix="wordcloud">
       </ChartCreator>
       <ChartCreator
-            chartsEngineName="r_charts_engine"
             class="org.txm.wordcloud.core.chartsengine.r.RWordCloudChartCreator"
             fileNamePrefix="wordcloud">
       </ChartCreator>
Index: tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java
===================================================================
--- tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java	(revision 722)
+++ tmp/org.txm.progression.rcp/src/org/txm/progression/rcp/chartsengine/events/ProgressionEventCallBack.java	(revision 723)
@@ -10,7 +10,6 @@
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.osgi.util.NLS;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
@@ -27,10 +26,8 @@
 import org.txm.objects.Page;
 import org.txm.objects.Text;
 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.rcp.editors.TXMResultEditorInput;
-import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.utils.SWTEditorsUtils;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Property;
@@ -174,7 +171,7 @@
 					
 					ChartMouseEvent chartEvent = (ChartMouseEvent) o;
 					ChartEntity entity = chartEvent.getEntity();
-					final ArrayList<Integer> selectedPointPositions = Utils.getChartCreator(chartEditor.getChartsEngine()).getSelectedPointPositions(chartEditor.getChart());
+					final ArrayList<Integer> selectedPointPositions = ((ProgressionChartCreator) chartEditor.getResult().getChartCreator()).getSelectedPointPositions(chartEditor.getChart());
 	
 					if(event.getID() == MouseEvent.MOUSE_CLICKED && mouseEvent.getClickCount() == 2 && eventArea == EventCallBack.AREA_ITEM && !selectedPointPositions.isEmpty()) {
 	
@@ -226,7 +223,7 @@
 					// Arrow keys
 					if(keyEvent.getKeyCode() == KeyEvent.VK_LEFT || keyEvent.getKeyCode() == KeyEvent.VK_RIGHT)	{
 					
-						final ArrayList<Integer> selectedPointPositions = Utils.getChartCreator(chartEditor.getChartsEngine()).getSelectedPointPositions(chartEditor.getChart());
+						final ArrayList<Integer> selectedPointPositions = ((ProgressionChartCreator) chartEditor.getResult().getChartCreator()).getSelectedPointPositions(chartEditor.getChart());
 	
 						// Get the linked concordance editors and update the one linked to the progression curve if it exists
 						ArrayList<EditorPart> linkedConcordancesEditors = chartEditor.getLinkedEditors(ConcordanceEditor.class);
@@ -268,7 +265,7 @@
 //		ArrayList<Integer> selectedSeries = chartEditor.getEditorInput().getSWTChartComponentsProvider().getChartsEngine().getProgressionChartSelectedSeries(chartEditor.getChart());
 //		String query = ((Progression) chartEditor.getResultData()).getQueries().get(selectedSeries.get(selectedSeries.size() - 1).intValue()).getQueryString();
 		
-		int lastSelectedSeries = Utils.getChartCreator(chartEditor.getChartsEngine()).getLastSelectedSeries(chartEditor.getChart());
+		int lastSelectedSeries = ((ProgressionChartCreator) chartEditor.getResult().getChartCreator()).getLastSelectedSeries(chartEditor.getChart());
 		String query = ((Progression) chartEditor.getResult()).getQueries().get(lastSelectedSeries).getQueryString();
 
 		// Remove "[" and "]" only if it's a simple query as "[faire]" 
@@ -426,7 +423,7 @@
 		
 		try {
 		
-			ArrayList<Color> seriesColors = chartEditor.getChartsEngine().getChartCreator(Progression.class).getSeriesShapesColors(chartEditor.getChart());
+			ArrayList<Color> seriesColors = chartEditor.getChartsEngine().getChartCreator(chartEditor.getResult()).getSeriesShapesColors(chartEditor.getChart());
 			RGBA selectedWordColor = new RGBA(255, 10, 10);
 
 			//FIXME: old color
@@ -461,7 +458,7 @@
 			List<String> selectedWordIds = selectedWordMatch.getValuesForProperty(corpus.getProperty("id")); //$NON-NLS-1$;
 
 			// Get all words to highlight from the progression chart data set
-			ArrayList<ArrayList<Integer>> allPointPositionsBySeries = ((ProgressionChartCreator)chartEditor.getEditorInput().getChartsEngine().getChartCreator(Progression.class)).getAllPointPositionsBySeries(chartEditor.getChart());
+			ArrayList<ArrayList<Integer>> allPointPositionsBySeries = ((ProgressionChartCreator)chartEditor.getEditorInput().getChartsEngine().getChartCreator(chartEditor.getResult())).getAllPointPositionsBySeries(chartEditor.getChart());
 			
 			ArrayList<ArrayList<String>> allWordIds = new ArrayList<ArrayList<String>>(allPointPositionsBySeries.size());
 			for(int i = 0; i < allPointPositionsBySeries.size(); i++) {
Index: tmp/org.txm.searchengine.cqp.rcp/plugin.xml
===================================================================
--- tmp/org.txm.searchengine.cqp.rcp/plugin.xml	(revision 722)
+++ tmp/org.txm.searchengine.cqp.rcp/plugin.xml	(revision 723)
@@ -266,5 +266,47 @@
          </adapter>
       </factory>
    </extension>
+   <extension
+         point="org.eclipse.core.expressions.definitions">
+      <definition
+            id="OneMainCorpusSelected">
+         <with
+               variable="selection">
+            <iterate
+                  ifEmpty="false"
+                  operator="and">
+               <instanceof
+                     value="org.txm.searchengine.cqp.corpus.MainCorpus">
+               </instanceof>
+            </iterate>
+         </with>
+      </definition>
+      <definition
+            id="OneSubCorpusSelected">
+         <with
+               variable="selection">
+            <iterate
+                  ifEmpty="false"
+                  operator="and">
+               <instanceof
+                     value="org.txm.searchengine.cqp.corpus.Subcorpus">
+               </instanceof>
+            </iterate>
+         </with>
+      </definition>
+      <definition
+            id="OneCorpusSelected">
+         <with
+               variable="selection">
+            <iterate
+                  ifEmpty="false"
+                  operator="and">
+               <instanceof
+                     value="org.txm.searchengine.cqp.corpus.Corpus">
+               </instanceof>
+            </iterate>
+         </with>
+      </definition>
+   </extension>
 
 </plugin>
Index: tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java
===================================================================
--- tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java	(revision 722)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/editors/ConcordanceEditor.java	(revision 723)
@@ -112,6 +112,7 @@
 import org.txm.concordance.rcp.widgets.ComplexSortSelector;
 import org.txm.cooccurrence.rcp.messages.CooccurrenceUIMessages;
 import org.txm.core.preferences.TXMPreferences;
+import org.txm.core.results.Parameter;
 import org.txm.core.results.TXMResult;
 import org.txm.internalview.core.functions.InternalView;
 import org.txm.internalview.rcp.editors.InternalViewEditor;
@@ -124,6 +125,8 @@
 import org.txm.rcp.editors.TXMEditor;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.editors.TableKeyListener;
+import org.txm.rcp.editors.listeners.ComputeKeyListener;
+import org.txm.rcp.editors.listeners.ComputeSelectionListener;
 import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.swt.GLComposite;
@@ -137,11 +140,9 @@
 import org.txm.rcp.views.corpora.CorporaView;
 import org.txm.searchengine.cqp.CQPEngine;
 import org.txm.searchengine.cqp.ReferencePattern;
-import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
-import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.utils.logger.Log;
 
 /**
@@ -155,6 +156,10 @@
 
 	String locale = TXMPreferences.getString(RCPPreferences.UI_LOCALE, RCPPreferences.PREFERENCES_NODE);
 
+	
+	private static final String BACKTOTEXT_COMMAND_ID = "org.txm.rcp.extensionpoint.backtotext"; //$NON-NLS-1$
+
+	
 	/** The lineids. */
 	List<String> lineids;
 
@@ -198,11 +203,8 @@
 	/** The mouseposition. */
 	private Point mouseposition;
 
-	/** The query widget. */
-	private AssistedQueryWidget queryWidget;
-
 	/** The line table viewer. */
-	private TableViewer viewer, viewer2;
+	protected TableViewer viewer, viewer2;
 
 	/** The reference column. */
 	private TableColumn referenceColumn;
@@ -259,8 +261,6 @@
 	/** The navigation area. */
 	private NavigationWidget navigationWidget;
 
-	/** The is setup shown. */
-	private boolean isSetupShown = true;
 
 	/** The hide btn: hides the form
 	 * TODO: remove the button when the TXMEditorToolbar is fully functionnal. */
@@ -269,39 +269,23 @@
 	/** The query size. */
 	protected Point querySize;
 
-	/** The parent. */
-	private Composite parent;
 
-	private ArrayList<Property> availableLeftSortProperties;
-
-	private ArrayList<Property> availableRightSortProperties;
-
 	private Sash sash;
 
 	HashSet<ConcordanceEditorExtension> extensions = new HashSet<ConcordanceEditorExtension>();
 
 	private Listener tableResizeListener;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	public void doSave(IProgressMonitor monitor) { }
+	
+	
+	
+	/** The query widget. */
+	@Parameter(key=ConcordancePreferences.QUERY)
+	protected AssistedQueryWidget queryWidget;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#doSaveAs()
-	 */
-	@Override
-	public void doSaveAs() { }
+	
+	
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
-	 */
-	@Override
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
 	/**
 	 * Sets the standard comparators.
 	 */
@@ -310,20 +294,25 @@
 			standardComparators.add(standardComparatorClassName[i]);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
 	@Override
-	public void init(IEditorSite site, IEditorInput input)
-			throws PartInitException {
-		setSite(site);
-		setInput(input);
+	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+		super.init(site, input);
+		
+		TXMResult result = this.getResult();
+		
+		if (!(result instanceof Concordance)) {
+			throw new PartInitException("Can not open ConcordanceEditor with " + result + ".");
+		}
+		this.concordance = (Concordance)result;
 
-		initializeEditor();
+		this.standardComparators = new ArrayList<LineComparator>();
+		this.userDefinedComparators = new ArrayList<LineComparator>();
+		this.setStandardComparators();
+		concordance.setNLinePerPage(TXMPreferences.getInt(ConcordancePreferences.N_LINES_PER_PAGE, ConcordancePreferences.PREFERENCES_NODE));
 
+
 		// fetch extensions
-		IConfigurationElement[] config = Platform.getExtensionRegistry()
-				.getConfigurationElementsFor(ConcordanceEditorExtension.EXTENSION_ID);
+		IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(ConcordanceEditorExtension.EXTENSION_ID);
 		Log.warning("Installing ConcordanceEditorExtension...");
 		Log.warning(Arrays.toString(config));
 
@@ -355,30 +344,9 @@
 		}
 	}
 
-	private void initializeEditor() throws PartInitException {
 
-		TXMResultEditorInput<Concordance> input = getEditorInput();
-		TXMResult result = input.getResult();
-		if (!(result instanceof Concordance)) {
-			throw new PartInitException("Cannot open ConcordanceEditor with "+result);
-		}
-		this.concordance = (Concordance)result;
-
-		this.standardComparators = new ArrayList<LineComparator>();
-		this.userDefinedComparators = new ArrayList<LineComparator>();
-		new ArrayList<LineComparator>();
-		setStandardComparators();
-		concordance.setNLinePerPage(TXMPreferences.getInt(ConcordancePreferences.N_LINES_PER_PAGE, ConcordancePreferences.PREFERENCES_NODE));
-
-		setPartName(concordance.getName());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public void _createPartControl(Composite parent) {
-//		super.createPartControl(parent); // create the top toolbar, display area and bottom toolbar
 
 		Composite controlArea = getCommandParametersGroup();
 
@@ -390,8 +358,6 @@
 			if (complexsorter != null) {
 				complexsorter.setComparators(this);
 			}
-
-			fillDisplayArea();
 		} catch(Exception e) {
 			System.out.println("Error while building interface: "+e.getLocalizedMessage());
 			Log.printStackTrace(e);
@@ -956,22 +922,8 @@
 		// queryWidget = new QueryWidget(queryArea, SWT.DROP_DOWN);
 		queryWidget = new AssistedQueryWidget(queryArea, SWT.DROP_DOWN, concordance.getCorpus());
 		queryWidget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
-		queryWidget.addKeyListener(new KeyListener() {
-			@Override
-			public void keyPressed(KeyEvent e) {
-				// System.out.println("key pressed : "+e.keyCode);
-				if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
-					//updateResultFromEditor();
-					concordance.setQuery(queryWidget.getQuery());
-					compute(true);
-				}
-			}
+		queryWidget.addKeyListener(new ComputeKeyListener(this));
 
-			@Override
-			public void keyReleased(KeyEvent e) {
-			}
-		});
-
 		// | Properties: word/pos [Edit] |
 		propsArea = new PropertiesSelector<Property>(queryArea, SWT.NONE);
 		propsArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false));
@@ -1005,18 +957,8 @@
 		go.setFont(newf);
 
 		go.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
-		go.addSelectionListener(new SelectionListener() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				updateResultFromEditor();
-				compute(true);
-			}
+		go.addSelectionListener(new ComputeSelectionListener(this));
 
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
 		// Complex sort chooser (full line)
 		complexsorter = new ComplexSortSelector(queryArea, SWT.NONE);
 		complexsorter.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true,
@@ -1828,7 +1770,6 @@
 	}
 
 
-	private static final String BACKTOTEXT_COMMAND_ID = "org.txm.rcp.extensionpoint.backtotext"; //$NON-NLS-1$
 	/**
 	 * Open the edition for the selected line.
 	 * The command used to show the edition is an EditionBackToText Extension
@@ -1957,11 +1898,14 @@
 	 */
 	public static class ConcordanceColumnSizeControlListener implements ControlListener {
 		private TableColumn column;
+		
 		public ConcordanceColumnSizeControlListener(TableColumn column) {
 			this.column = column;
 		}
+		
 		@Override
 		public void controlMoved(ControlEvent e) { }
+		
 		@Override
 		public void controlResized(ControlEvent e) {
 			if (column != null && !column.isDisposed() &&column.getWidth() < 5) {
@@ -1976,12 +1920,6 @@
 
 	@Override
 	public void updateResultFromEditor() {
-		Display.getDefault().syncExec(new Runnable() {
-			@Override
-			public void run() {
-				Query query = new Query(queryWidget.getQueryString());
-				concordance.setQuery(query);
-			}
-		});
+		// TODO
 	}
 }
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 722)
+++ tmp/org.txm.concordance.rcp/src/org/txm/concordance/rcp/handlers/ComputeConcordance.java	(revision 723)
@@ -40,9 +40,9 @@
 import org.txm.concordance.rcp.editors.ConcordanceEditor;
 import org.txm.concordance.rcp.messages.ConcordanceUIMessages;
 import org.txm.core.results.TXMParameters;
-import org.txm.core.results.TXMResult;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.TXMWindows;
+import org.txm.rcp.editors.TXMEditor;
 import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.handlers.BaseAbstractHandler;
 import org.txm.rcp.views.corpora.CorporaView;
@@ -98,43 +98,23 @@
 		}
 		
 		Concordance concordance = null;
+
+		// Creating from Corpus
 		if (o instanceof Corpus) {
 			Corpus corpus = (Corpus) o;
 			concordance = new Concordance(corpus);
-		} else if (o instanceof Concordance) {
+		}
+		// Reopening existing result
+		else if (o instanceof Concordance) {
 			concordance = (Concordance)o;
-//		} else if (o instanceof TXMResult) { // called from CorporaView
-//			TXMResult result = (TXMResult)o;
-//			TXMParameters parameters = result.getTXMParameters();
-//			Object p = parameters.get("corpus");
-//			if (p == null) {
-//				System.out.println("Error: no 'corpus' parameter provided");
-//				return false;
-//			}
-//			if (!(p instanceof Corpus)) {
-//				System.out.println("Error: 'corpus' parameter is not a Corpus");
-//				return false;
-//			}
-//			Corpus corpus = (Corpus) p;
-//			concordance = new Concordance(corpus);
-//			concordance.setParameters(parameters);
-		} else {
+		}
+		else {
 			System.out.println("Could not call ComputeConcordance with: "+o);
 			return null;
 		}
 		
-		TXMResultEditorInput editorInput = new TXMResultEditorInput(concordance);
-
-		try {
-			StatusLine.setMessage(ConcordanceUIMessages.ComputeConcordance_0);
-			IEditorPart editor = TXMWindows.getActiveWindow().getActivePage().openEditor(editorInput, ConcordanceEditor.class.getName()); //$NON-NLS-1$
-				if (editor == null) return null;
-				
-			return editor;
-		} catch (PartInitException e) {
-			System.err.println(NLS.bind(ConcordanceUIMessages.GetConcordances_4, e));
-			e.printStackTrace();
-		}
+		StatusLine.setMessage(ConcordanceUIMessages.ComputeConcordance_0);
+		TXMEditor.openEditor(concordance, ConcordanceEditor.class.getName());
 		return null;
 	}
 }
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java	(revision 722)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/editors/CAEditor.java	(revision 723)
@@ -63,6 +63,7 @@
 import org.eclipse.ui.IPropertyListener;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
+import org.txm.ca.core.chartsengine.base.CAChartCreator;
 import org.txm.ca.core.chartsengine.base.Utils;
 import org.txm.ca.core.functions.CA;
 import org.txm.ca.core.functions.Eigenvalues;
@@ -275,8 +276,8 @@
 					selectedLabels[i] = selection[i].getText();
 				}
 
-				CAFactorialMapChartEditor caFactorialMapEditorPart = (CAFactorialMapChartEditor) editors.get(0);
-				Utils.getChartCreator(caFactorialMapEditorPart.getChartsEngine()).updateChartCAFactorialMapHighlightPoints(caFactorialMapEditorPart.getChart(), (e.getSource() == getRowsInfosEditor().getViewer()), selectedLabels);
+				CAFactorialMapChartEditor chartEditor = (CAFactorialMapChartEditor) editors.get(0);
+				((CAChartCreator) chartEditor.getResult().getChartCreator()).updateChartCAFactorialMapHighlightPoints(chartEditor.getChart(), (e.getSource() == getRowsInfosEditor().getViewer()), selectedLabels);
 			}
 		};
 
@@ -291,9 +292,8 @@
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				// Change chart items selection order
-				CAFactorialMapChartEditor caFactorialMapEditorPart = (CAFactorialMapChartEditor) editors.get(0); 
-				Utils.getChartCreator(caFactorialMapEditorPart.getChartsEngine()).
-				updateChartCAFactorialMapSetLabelItemsSelectionOrder(caFactorialMapEditorPart.getChart(), getRowsInfosEditor().getOrdererLabels(), getColsInfosEditor().getOrdererLabels());
+				CAFactorialMapChartEditor chartEditor = (CAFactorialMapChartEditor) editors.get(0); 
+				((CAChartCreator) chartEditor.getResult().getChartCreator()).updateChartCAFactorialMapSetLabelItemsSelectionOrder(chartEditor.getChart(), getRowsInfosEditor().getOrdererLabels(), getColsInfosEditor().getOrdererLabels());
 			}
 
 			@Override
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/chartsengine/events/CAPointSelectionCallBack.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/chartsengine/events/CAPointSelectionCallBack.java	(revision 722)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/chartsengine/events/CAPointSelectionCallBack.java	(revision 723)
@@ -5,7 +5,7 @@
 import java.util.ArrayList;
 
 import org.eclipse.jface.viewers.TableViewer;
-import org.txm.ca.core.chartsengine.base.Utils;
+import org.txm.ca.core.chartsengine.base.CAChartCreator;
 import org.txm.ca.rcp.editors.CAEditor;
 import org.txm.chartsengine.rcp.events.EventCallBack;
 
@@ -30,8 +30,8 @@
 			chartEditor.getComposite().getDisplay().asyncExec(new Runnable () {
 				public void run() {
 	
-					ArrayList<String> rowLabels = Utils.getChartCreator(chartEditor.getChartsEngine()).getCAFactorialMapChartSelectedPoints(chartEditor.getChart(), 0);
-					ArrayList<String> columnLabels = Utils.getChartCreator(chartEditor.getChartsEngine()).getCAFactorialMapChartSelectedPoints(chartEditor.getChart(), 1);
+					ArrayList<String> rowLabels = ((CAChartCreator) chartEditor.getResult().getChartCreator()).getCAFactorialMapChartSelectedPoints(chartEditor.getChart(), 0);
+					ArrayList<String> columnLabels = ((CAChartCreator) chartEditor.getResult().getChartCreator()).getCAFactorialMapChartSelectedPoints(chartEditor.getChart(), 1);
 	
 			        // Update the selected lines in the row and column information tables
 					for(int i = 0; i < rowsInfoViewer.getTable().getItemCount(); i++) {
Index: tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java
===================================================================
--- tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java	(revision 722)
+++ tmp/org.txm.ca.rcp/src/org/txm/ca/rcp/preferences/CAPreferencePage.java	(revision 723)
@@ -39,7 +39,7 @@
 import org.txm.ca.rcp.adapters.CAAdapterFactory;
 import org.txm.ca.rcp.messages.CAUIMessages;
 import org.txm.chartsengine.rcp.SWTChartsComponentsProvider;
-import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.rcp.preferences.TXMPreferencePage;
 import org.txm.rcp.preferences.TXMPreferenceStore;
 
@@ -69,8 +69,8 @@
 		gridData.verticalIndent = 10;
 		ltGroup.setLayoutData(gridData);
 
-		this.addField(new IntegerFieldEditor(CAPreferences.F_MIN, LexicalTableUIMessages.LexicalTablePreferencePage_1, ltGroup));
-		this.addField(new IntegerFieldEditor(CAPreferences.V_MAX, LexicalTableUIMessages.LexicalTableEditor_8, ltGroup));
+		this.addField(new IntegerFieldEditor(CAPreferences.F_MIN, TXMCoreMessages.common_lowestFrequency, ltGroup));
+		this.addField(new IntegerFieldEditor(CAPreferences.V_MAX, TXMCoreMessages.common_numberOfLines, ltGroup));
 		this.addField(new StringFieldEditor(CAPreferences.QUALITY_DISPLAY_FORMAT, CAUIMessages.PreferencePage_0, this.getFieldEditorParent()));
 		this.addField(new StringFieldEditor(CAPreferences.CONTRIB_DISPLAY_FORMAT, CAUIMessages.PreferencePage_1, this.getFieldEditorParent()));
 		this.addField(new StringFieldEditor(CAPreferences.MASS_DISPLAY_FORMAT, CAUIMessages.PreferencePage_5, this.getFieldEditorParent()));
@@ -159,28 +159,12 @@
 
 	
 	
-	
-	
-	
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
 	@Override
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(CAPreferences.PREFERENCES_NODE));
 		//this.setDescription(Messages.CorrespondanceAnalysisEditorInput_10);
 		//this.setTitle(CAUIMessages.CorrespondanceAnalysisEditorInput_10);
 		this.setImageDescriptor(CAAdapterFactory.ICON);
-
-		// FIXME: useless?
-//		if (TxmPreferences.getInt(FMIN, -1) <= 0)
-//			TxmPreferences.set(FMIN, 10);
-//		if (TxmPreferences.getInt(VMAX, -1) <= 0)
-//			TxmPreferences.set(VMAX,200);
-
 	}
 
 	
Index: tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesEditor.java
===================================================================
--- tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesEditor.java	(revision 722)
+++ tmp/org.txm.specificities.rcp/src/org/txm/specificities/rcp/editors/SpecificitiesEditor.java	(revision 723)
@@ -93,7 +93,7 @@
 		new Label(parametersArea, SWT.NONE).setText("Maximum score");
 
 		this.maxScore = new Spinner(parametersArea, SWT.BORDER);
-		this.maxScore.setToolTipText("The maximum score to show");
+		this.maxScore.setToolTipText("The maximum score to display");
 		this.maxScore.setMinimum(0);
 		
 		// result area
@@ -145,7 +145,7 @@
 			// create 2nd column
 			TableColumn typeFrequencyColumn = new TableColumn(viewer.getTable(), SWT.NONE);
 			typeFrequencyColumn.setText(TXMUIMessages.FrequencyListEditorInput_4 + " " + SpecificitiesUIMessages.SpecificitiesTableEditor_11 + " " + this.getResult().getCorpusSize()); //$NON-NLS-1$ //$NON-NLS-2$
-			typeFrequencyColumn.setToolTipText(TXMUIMessages.FrequencyListEditorInput_4 + SpecificitiesUIMessages.SpecificitiesTableEditor_11 + this.getResult().getCorpusSize()); 
+			typeFrequencyColumn.setToolTipText(TXMUIMessages.FrequencyListEditorInput_4 + " " + SpecificitiesUIMessages.SpecificitiesTableEditor_11 + " " + this.getResult().getCorpusSize()); 
 			typeFrequencyColumn.setAlignment(SWT.RIGHT);
 			typeFrequencyColumn.pack();
 			
Index: tmp/org.txm.specificities.core/plugin.xml
===================================================================
--- tmp/org.txm.specificities.core/plugin.xml	(revision 722)
+++ tmp/org.txm.specificities.core/plugin.xml	(revision 723)
@@ -4,12 +4,10 @@
    <extension
          point="org.txm.chartsengine.chartcreator">
       <ChartCreator
-            chartsEngineName="jfreechart_charts_engine"
             class="org.txm.specificities.core.chartsengine.jfreechart.JFCSpecificitiesBarChartCreator"
             fileNamePrefix="specificities">
       </ChartCreator>
       <ChartCreator
-            chartsEngineName="r_charts_engine"
             class="org.txm.specificities.core.chartsengine.r.RSpecificitiesBarChartCreator"
             fileNamePrefix="specificities">
       </ChartCreator>
Index: tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/jfreechart/JFCSpecificitiesBarChartCreator.java
===================================================================
--- tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/jfreechart/JFCSpecificitiesBarChartCreator.java	(revision 722)
+++ tmp/org.txm.specificities.core/src/org/txm/specificities/core/chartsengine/jfreechart/JFCSpecificitiesBarChartCreator.java	(revision 723)
@@ -53,9 +53,6 @@
 	        		true, false, true, true, true, false, false);
         }
 
-        ((IRendererWithItemSelection) chart.getXYPlot().getRenderer()).setChartType(ChartsEngine.CHART_TYPE_SPECIFICITIES);
-
-
 		return chart;
 		
 	}
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/base/Utils.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/base/Utils.java	(revision 722)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/base/Utils.java	(revision 723)
@@ -26,13 +26,5 @@
 		return ChartsEngineCoreMessages.bind(CACoreMessages.charts_factorialMap_title, ca.getParent().getName());
 	}
 
-	/**
-	 * Convenience method to get a CA chart creator from the specified charts engine.
-	 * @param chartsEngine charts engine to look in for a chart creator
-	 * @return a CA chart creator
-	 */
-	public static CAChartCreator getChartCreator(ChartsEngine chartsEngine)	{
-		return (CAChartCreator) chartsEngine.getChartCreator(CA.class);
-	}
 	
 }
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CASingularValuesItemSelectionRenderer.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CASingularValuesItemSelectionRenderer.java	(revision 722)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CASingularValuesItemSelectionRenderer.java	(revision 723)
@@ -36,8 +36,6 @@
 	public CASingularValuesItemSelectionRenderer(CA ca) {
 		super();
 		this.mouseOverItemSelector.setResult(ca);
-		this.setChartType(ChartsEngine.CHART_TYPE_CA_SINGULAR_VALUES);
-
 		this.percentValuesNumberFormat = new DecimalFormat("#.00");
 	}
 
Index: tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CAItemSelectionRenderer.java
===================================================================
--- tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CAItemSelectionRenderer.java	(revision 722)
+++ tmp/org.txm.ca.core/src/org/txm/ca/core/chartsengine/jfreechart/themes/highcharts/renderers/CAItemSelectionRenderer.java	(revision 723)
@@ -21,7 +21,6 @@
 import org.txm.ca.core.chartsengine.jfreechart.datasets.CAXYDataset;
 import org.txm.ca.core.functions.CA;
 import org.txm.ca.core.messages.CACoreMessages;
-import org.txm.chartsengine.core.ChartsEngine;
 import org.txm.chartsengine.core.messages.ChartsEngineCoreMessages;
 import org.txm.chartsengine.jfreechart.core.JFCChartsEngine;
 import org.txm.chartsengine.jfreechart.core.renderers.interfaces.IRendererWithItemSelection;
@@ -44,7 +43,6 @@
 	public CAItemSelectionRenderer(CA ca, JFreeChart chart) {
 		super(ca, chart);
 		this.multipleItemsSelector.setResult(ca);
-		this.setChartType(ChartsEngine.CHART_TYPE_CA_FACTORIAL_MAP);
 	}
 
 
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___LexicalTableEditor.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___LexicalTableEditor.java	(revision 722)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___LexicalTableEditor.java	(revision 723)
@@ -1,169 +0,0 @@
-// Copyright © 2010-2013 ENS de Lyon.
-// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
-// Lyon 2, University of Franche-Comté, University of Nice
-// Sophia Antipolis, University of Paris 3.
-// 
-// The TXM platform is free software: you can redistribute it
-// and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation,
-// either version 2 of the License, or (at your option) any
-// later version.
-// 
-// The TXM platform is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE. See the GNU General Public License for more
-// details.
-// 
-// You should have received a copy of the GNU General
-// Public License along with the TXM platform. If not, see
-// http://www.gnu.org/licenses.
-// 
-// 
-// 
-// $LastChangedDate:$
-// $LastChangedRevision:$
-// $LastChangedBy:$ 
-//
-package org.txm.lexicaltable.rcp.editors;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.EditorPart;
-import org.txm.core.messages.TXMCoreMessages;
-import org.txm.rcp.editors.TableKeyListener;
-import org.txm.searchengine.cqp.corpus.Property;
-
-/**
- * The Class LexicalTableEditor.
- */
-//FIXME: unused?
-public class ___LexicalTableEditor extends EditorPart {
-
-	/**
-	 * Instantiates a new lexical table editor.
-	 */
-	public ___LexicalTableEditor() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/** The Constant ID. */
-	public static final String ID = "LexicalTableEditor"; //$NON-NLS-1$
-
-	/**
-	 * Creates the part control.
-	 *
-	 * @param parent the parent
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	public void createPartControl(Composite parent) {
-		GridLayout parentLayout = new GridLayout(1, false);
-		parent.setLayout(parentLayout);
-
-//		Lexicon lexicon = null; // ((LexicalTableEditorInput)getEditorInput()).getLexicon();
-		Property property = ((___LexicalTableEditorInput) getEditorInput()).getProperty();
-
-		Composite corpusInfo = new Composite(parent, SWT.NONE);
-		GridLayout corpusInfoLayout = new GridLayout(1, false);
-		corpusInfo.setLayout(corpusInfoLayout);
-
-		Label propertyLabel = new Label(corpusInfo, SWT.NONE);
-		propertyLabel.setText(TXMCoreMessages.PROPERTY_1 + property.getName());
-		propertyLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER,
-				false, false));
-
-		Label numberOfTypeLabel = new Label(corpusInfo, SWT.NONE);
-		//numberOfTypeLabel.setText(Messages.bind(Messages.LexicalTable_2, lexicon.nbrOfType()));
-		numberOfTypeLabel.setLayoutData(new GridData(GridData.END,
-				GridData.CENTER, false, false));
-
-		Label numberOfTokenLabel = new Label(corpusInfo, SWT.NONE);
-//		int numberOfToken = lexicon.nbrOfToken();
-//		numberOfTokenLabel.setText(Messages.LexicalTable_3 + numberOfToken);
-		numberOfTokenLabel.setLayoutData(new GridData(GridData.END,
-				GridData.CENTER, false, false));
-
-		TableViewer viewer = new TableViewer(parent, SWT.VIRTUAL | SWT.BORDER
-				| SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		viewer.getTable().addKeyListener(new TableKeyListener(viewer));
-		Table table = viewer.getTable();
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-		/*TableColumn nameColumn = new TableColumn(table, SWT.LEFT);
-		nameColumn.setText(Messages.IndexEditor_27
-				+ lexicon.getProperty().toString());
-		nameColumn.setWidth(320);
-		TableColumn sizeColumn = new TableColumn(table, SWT.RIGHT);
-		sizeColumn.setText(Messages.FrequencyListEditorInput_4);
-		sizeColumn.setWidth(80);
-		int[] freqs = lexicon.getFreq();
-		String[] types = lexicon.getForms();
-		for (int i = 0; i < lexicon.nbrOfType(); i++) {
-			TableItem item = new TableItem(table, SWT.NONE);
-			item.setText(new String[] { types[i], String.valueOf(freqs[i]) });
-		}
-		*/
-		createContextMenu(viewer);
-	}
-
-	/**
-	 * Creates the context menu.
-	 *
-	 * @param tableViewer the table viewer
-	 */
-	private void createContextMenu(TableViewer tableViewer) {
-		MenuManager menuManager = new MenuManager();
-		Menu menu = menuManager.createContextMenu(tableViewer.getTable());
-
-		// Set the MenuManager
-		tableViewer.getTable().setMenu(menu);
-		getSite().registerContextMenu(menuManager, tableViewer);
-		// Make the selection available
-		getSite().setSelectionProvider(tableViewer);
-	}
-
-	@Override
-	public void setFocus() {
-	}
-	
-	@Override
-	public void doSave(IProgressMonitor arg0) {
-		// TODO Auto-generated method stub
-	}
-
-	@Override
-	public void doSaveAs() {
-		// TODO Auto-generated method stub
-	}
-
-	@Override
-	public void init(IEditorSite site, IEditorInput input)
-			throws PartInitException {
-		setSite(site);
-		setInput(input);
-	}
-
-	@Override
-	public boolean isDirty() {
-		return false;
-	}
-
-	@Override
-	public boolean isSaveAsAllowed() {
-		return false;
-	}
-
-
-}
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/TableEditor.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/TableEditor.java	(revision 722)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/TableEditor.java	(revision 723)
@@ -1,226 +0,0 @@
-// Copyright © 2010-2013 ENS de Lyon.
-// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
-// Lyon 2, University of Franche-Comté, University of Nice
-// Sophia Antipolis, University of Paris 3.
-// 
-// The TXM platform is free software: you can redistribute it
-// and/or modify it under the terms of the GNU General Public
-// License as published by the Free Software Foundation,
-// either version 2 of the License, or (at your option) any
-// later version.
-// 
-// The TXM platform is distributed in the hope that it will be
-// useful, but WITHOUT ANY WARRANTY; without even the implied
-// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-// PURPOSE. See the GNU General Public License for more
-// details.
-// 
-// You should have received a copy of the GNU General
-// Public License along with the TXM platform. If not, see
-// http://www.gnu.org/licenses.
-// 
-// 
-// 
-// $LastChangedDate:$
-// $LastChangedRevision:$
-// $LastChangedBy:$ 
-//
-package org.txm.lexicaltable.rcp.editors;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.EditorPart;
-import org.txm.rcp.editors.ITablableEditorInput;
-import org.txm.rcp.editors.TableKeyListener;
-import org.txm.rcp.editors.TableSorter;
-import org.txm.rcp.messages.TXMUIMessages;
-// TODO: Auto-generated Javadoc
-/**
- * Generic editor of tableable objects.
- *
- * @author sloiseau
- */
-public class TableEditor extends EditorPart {
-
-	/** The ID. */
-	static public String ID = "org.txm.rcp.editors.TableEditor"; //$NON-NLS-1$
-	
-	/** The viewer. */
-	private TableViewer viewer;
-	
-	/** The i editor input. */
-	private IEditorInput iEditorInput;
-
-	/** The table sorter. */
-	private TableSorter tableSorter;
-
-	/**
-	 * Linking with the OutlineView.
-	 *
-	 * @param monitor the monitor
-	 */
-	// private OverviewOutlinePage overviewOutlinePage;
-
-	@Override
-	public void doSave(IProgressMonitor monitor) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#doSaveAs()
-	 */
-	@Override
-	public void doSaveAs() {
-		// TODO Auto-generated method stub
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput input)
-			throws PartInitException {
-		setSite(site);
-		setInput(input);
-		this.iEditorInput = input;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#isDirty()
-	 */
-	@Override
-	public boolean isDirty() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
-	 */
-	@Override
-	public boolean isSaveAsAllowed() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	public void createPartControl(Composite parent) {
-		parent.setLayout(new FillLayout());
-
-		viewer = new TableViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL
-				| SWT.MULTI | SWT.FULL_SELECTION | SWT.VIRTUAL);
-		viewer.getTable().addKeyListener(new TableKeyListener(viewer));
-		Table table = viewer.getTable();
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-
-		if (!(iEditorInput instanceof ITablableEditorInput)) {
-			throw new IllegalArgumentException(TXMUIMessages.TableEditor_0);
-		}
-
-		ITablableEditorInput tableInput = (ITablableEditorInput) iEditorInput;
-
-		String[] titles = tableInput.getColumnTitles();
-
-		for (int i = 0; i < titles.length; i++) {
-			final int index = i;
-			final TableViewerColumn column = new TableViewerColumn(viewer,
-					SWT.NONE);
-
-			column.getColumn().setText(titles[i]);
-			column.getColumn().setWidth(100);
-			column.getColumn().setResizable(true);
-			column.getColumn().setMoveable(true);
-
-			column.getColumn().addSelectionListener(new SelectionAdapter() {
-				@Override
-				public void widgetSelected(SelectionEvent e) {
-					tableSorter.setColumn(index);
-					int dir = viewer.getTable().getSortDirection();
-					if (viewer.getTable().getSortColumn() == column.getColumn()) {
-						dir = dir == SWT.UP ? SWT.DOWN : SWT.UP;
-					} else {
-						dir = SWT.DOWN;
-					}
-					viewer.getTable().setSortDirection(dir);
-					viewer.getTable().setSortColumn(column.getColumn());
-					viewer.refresh();
-				}
-			});
-		}
-
-		viewer.setContentProvider(tableInput.getContentProvider());
-		viewer.setLabelProvider(tableInput.getLabelProvider());
-		viewer.setInput(tableInput.getInput());
-
-		tableSorter = new TableSorter();
-		tableSorter.setColumnTypes(tableInput.getColumnTypes());
-		if (this.iEditorInput instanceof ___LexicalTableEditorInput) {
-			___LexicalTableEditorInput ed = (___LexicalTableEditorInput) this.iEditorInput;
-			tableSorter.setLocale(ed.getResult().getPartition().getCorpus().getLocale());
-		}
-		viewer.setSorter(tableSorter);
-
-		createContextMenu(viewer);
-	}
-
-	/**
-	 * Creates the context menu.
-	 *
-	 * @param tableViewer the table viewer
-	 */
-	private void createContextMenu(TableViewer tableViewer) {
-
-		MenuManager menuManager = new MenuManager();
-		Menu menu = menuManager.createContextMenu(tableViewer.getTable());
-
-		// Set the MenuManager
-		tableViewer.getTable().setMenu(menu);
-		getSite().registerContextMenu(menuManager, tableViewer);
-		// Make the selection available
-		getSite().setSelectionProvider(tableViewer);
-	}
-
-	/**
-	 * Gets the table sorter.
-	 *
-	 * @return the table sorter
-	 */
-	public TableSorter getTableSorter() {
-		return tableSorter;
-	}
-
-	/**
-	 * Gets the table viewer.
-	 *
-	 * @return the table viewer
-	 */
-	public TableViewer getTableViewer() {
-		return viewer;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-	 */
-	@Override
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-}
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableDialog.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableDialog.java	(revision 722)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableDialog.java	(revision 723)
@@ -188,7 +188,7 @@
 		maxlinesSpinner.setSelection(vmax);
 		
 		fminLabel = new Label(composite, SWT.NONE);
-		fminLabel.setText(TXMCoreMessages.FMIN_1);
+		fminLabel.setText(TXMCoreMessages.common_fMin);
 		fminLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, true, false));
 		fminSpinner = new Spinner(composite, SWT.BORDER);
 		fminSpinner.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___TableEditor.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___TableEditor.java	(revision 0)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___TableEditor.java	(revision 723)
@@ -0,0 +1,226 @@
+// Copyright © 2010-2013 ENS de Lyon.
+// Copyright © 2007-2010 ENS de Lyon, CNRS, INRP, University of
+// Lyon 2, University of Franche-Comté, University of Nice
+// Sophia Antipolis, University of Paris 3.
+// 
+// The TXM platform is free software: you can redistribute it
+// and/or modify it under the terms of the GNU General Public
+// License as published by the Free Software Foundation,
+// either version 2 of the License, or (at your option) any
+// later version.
+// 
+// The TXM platform is distributed in the hope that it will be
+// useful, but WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+// PURPOSE. See the GNU General Public License for more
+// details.
+// 
+// You should have received a copy of the GNU General
+// Public License along with the TXM platform. If not, see
+// http://www.gnu.org/licenses.
+// 
+// 
+// 
+// $LastChangedDate:$
+// $LastChangedRevision:$
+// $LastChangedBy:$ 
+//
+package org.txm.lexicaltable.rcp.editors;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.EditorPart;
+import org.txm.rcp.editors.ITablableEditorInput;
+import org.txm.rcp.editors.TableKeyListener;
+import org.txm.rcp.editors.TableSorter;
+import org.txm.rcp.messages.TXMUIMessages;
+// TODO: Auto-generated Javadoc
+/**
+ * Generic editor of tableable objects.
+ *
+ * @author sloiseau
+ */
+public class ___TableEditor extends EditorPart {
+
+	/** The ID. */
+	static public String ID = "org.txm.rcp.editors.TableEditor"; //$NON-NLS-1$
+	
+	/** The viewer. */
+	private TableViewer viewer;
+	
+	/** The i editor input. */
+	private IEditorInput iEditorInput;
+
+	/** The table sorter. */
+	private TableSorter tableSorter;
+
+	/**
+	 * Linking with the OutlineView.
+	 *
+	 * @param monitor the monitor
+	 */
+	// private OverviewOutlinePage overviewOutlinePage;
+
+	@Override
+	public void doSave(IProgressMonitor monitor) {
+		// TODO Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.EditorPart#doSaveAs()
+	 */
+	@Override
+	public void doSaveAs() {
+		// TODO Auto-generated method stub
+
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
+	 */
+	@Override
+	public void init(IEditorSite site, IEditorInput input)
+			throws PartInitException {
+		setSite(site);
+		setInput(input);
+		this.iEditorInput = input;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.EditorPart#isDirty()
+	 */
+	@Override
+	public boolean isDirty() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
+	 */
+	@Override
+	public boolean isSaveAsAllowed() {
+		// TODO Auto-generated method stub
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	public void createPartControl(Composite parent) {
+		parent.setLayout(new FillLayout());
+
+		viewer = new TableViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL
+				| SWT.MULTI | SWT.FULL_SELECTION | SWT.VIRTUAL);
+		viewer.getTable().addKeyListener(new TableKeyListener(viewer));
+		Table table = viewer.getTable();
+		table.setHeaderVisible(true);
+		table.setLinesVisible(true);
+
+		if (!(iEditorInput instanceof ITablableEditorInput)) {
+			throw new IllegalArgumentException(TXMUIMessages.TableEditor_0);
+		}
+
+		ITablableEditorInput tableInput = (ITablableEditorInput) iEditorInput;
+
+		String[] titles = tableInput.getColumnTitles();
+
+		for (int i = 0; i < titles.length; i++) {
+			final int index = i;
+			final TableViewerColumn column = new TableViewerColumn(viewer,
+					SWT.NONE);
+
+			column.getColumn().setText(titles[i]);
+			column.getColumn().setWidth(100);
+			column.getColumn().setResizable(true);
+			column.getColumn().setMoveable(true);
+
+			column.getColumn().addSelectionListener(new SelectionAdapter() {
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					tableSorter.setColumn(index);
+					int dir = viewer.getTable().getSortDirection();
+					if (viewer.getTable().getSortColumn() == column.getColumn()) {
+						dir = dir == SWT.UP ? SWT.DOWN : SWT.UP;
+					} else {
+						dir = SWT.DOWN;
+					}
+					viewer.getTable().setSortDirection(dir);
+					viewer.getTable().setSortColumn(column.getColumn());
+					viewer.refresh();
+				}
+			});
+		}
+
+		viewer.setContentProvider(tableInput.getContentProvider());
+		viewer.setLabelProvider(tableInput.getLabelProvider());
+		viewer.setInput(tableInput.getInput());
+
+		tableSorter = new TableSorter();
+		tableSorter.setColumnTypes(tableInput.getColumnTypes());
+		if (this.iEditorInput instanceof ___LexicalTableEditorInput) {
+			___LexicalTableEditorInput ed = (___LexicalTableEditorInput) this.iEditorInput;
+			tableSorter.setLocale(ed.getResult().getPartition().getCorpus().getLocale());
+		}
+		viewer.setSorter(tableSorter);
+
+		createContextMenu(viewer);
+	}
+
+	/**
+	 * Creates the context menu.
+	 *
+	 * @param tableViewer the table viewer
+	 */
+	private void createContextMenu(TableViewer tableViewer) {
+
+		MenuManager menuManager = new MenuManager();
+		Menu menu = menuManager.createContextMenu(tableViewer.getTable());
+
+		// Set the MenuManager
+		tableViewer.getTable().setMenu(menu);
+		getSite().registerContextMenu(menuManager, tableViewer);
+		// Make the selection available
+		getSite().setSelectionProvider(tableViewer);
+	}
+
+	/**
+	 * Gets the table sorter.
+	 *
+	 * @return the table sorter
+	 */
+	public TableSorter getTableSorter() {
+		return tableSorter;
+	}
+
+	/**
+	 * Gets the table viewer.
+	 *
+	 * @return the table viewer
+	 */
+	public TableViewer getTableViewer() {
+		return viewer;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
+	 */
+	@Override
+	public void setFocus() {
+		viewer.getControl().setFocus();
+	}
+}

Property changes on: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___TableEditor.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___LexicalTableEditorInput.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___LexicalTableEditorInput.java	(revision 722)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/___LexicalTableEditorInput.java	(revision 723)
@@ -70,7 +70,7 @@
 		super(table);
 		
 		editors = new ArrayList<EditorPart>();
-		editors.add(new TableEditor());
+		editors.add(new ___TableEditor());
 
 		inputs = new ArrayList<IEditorInput>();
 
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java	(revision 722)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/editors/LexicalTableEditor.java	(revision 723)
@@ -120,11 +120,11 @@
 	
 	/** The minfreqspinner. */
 //	@Parameter(key=LexicalTablePreferences.F_MIN)
-	Spinner fMin;
+	protected Spinner fMin;
 
 	/** The top spinner. */
 //	@Parameter(key=LexicalTablePreferences.V_MAX)
-	Spinner vMax;
+	protected Spinner vMax;
 
 
 	
@@ -139,19 +139,10 @@
 	@Override
 	public void _createPartControl(final Composite parent) {
 		
-//		super.createPartControl(parent);
-		
 		lexicalTable = (LexicalTable) this.getResult();
-		//iTable = lexicalTable.getData();
-
 		
 		Composite paramArea = this.getCommandParametersGroup();
 		
-//		Composite paramArea = new Composite(this.getCommandParametersGroup(), SWT.NONE);
-
-//		GridLayout paramLayout = new GridLayout(5, false);
-//		paramArea.setLayout(paramLayout);
-
 		// Apply button
 		Button keepTop = new Button(paramArea, SWT.PUSH);
 		keepTop.setText(LexicalTableUIMessages.LexicalTableEditor_4);
@@ -162,7 +153,7 @@
 				System.out.println(NLS.bind(LexicalTableUIMessages.LexicalTableEditor_5, vMax.getSelection(), fMin.getSelection()));
 
 				MessageBox messageBox = new MessageBox(e.display.getActiveShell(), SWT.ICON_QUESTION | SWT.YES | SWT.NO);
-				messageBox.setMessage(TXMUIMessages.DeleteLines_1);
+				messageBox.setMessage(TXMUIMessages.common_areYouSure);
 				int response = messageBox.open();
 				if (response != SWT.YES) {
 					return;
@@ -174,7 +165,7 @@
 				} catch (Exception e1) {
 					// TODO Auto-generated catch block
 					org.txm.rcp.utils.Logger.printStackTrace(e1);
-					StatusLine.setMessage("LT: sort error"); //$NON-NLS-1$
+					StatusLine.setMessage("LexicalTable: sorting error."); //$NON-NLS-1$
 				}
 			}
 
@@ -185,12 +176,12 @@
 		
 		// Number of lines
 		Label nLines = new Label(paramArea, SWT.NONE);
-		nLines.setText(LexicalTableUIMessages.LexicalTableEditor_8);
+		nLines.setText(TXMCoreMessages.common_numberOfLines);
 		vMax = new Spinner(paramArea, SWT.BORDER);
 
 		// Fmin
 		Label fmin = new Label(paramArea, SWT.NONE);
-		fmin.setText(LexicalTableUIMessages.LexicalTableEditor_6);
+		fmin.setText(TXMCoreMessages.common_fMin);
 		fMin = new Spinner(paramArea, SWT.BORDER);
 
 		// Merge or delete columns button
@@ -325,8 +316,6 @@
 			}
 		});
 
-		// result
-		//Composite resultArea = new Composite(parent, SWT.NONE);
 		Composite resultArea = this.getResultArea();
 		
 		
@@ -409,7 +398,7 @@
 		this.updateEditorFromResult(false);
 		
 		// Register the context menu
-		TXMEditor.initContextMenu(this.viewer.getTable(), "LexicalTableEditorContextMenu", this.getSite(), this.viewer); // $NON-NLS-1$
+		TXMEditor.initContextMenu(this.viewer.getTable(), this.getSite(), this.viewer); // $NON-NLS-1$
 
 		
 		//this.commandParametersGroup.pack();
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/DeleteLines.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/DeleteLines.java	(revision 722)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/handlers/DeleteLines.java	(revision 723)
@@ -81,7 +81,7 @@
 			Shell shell = d.getActiveShell();
 			MessageBox messageBox = new MessageBox(shell, SWT.ICON_QUESTION
 					| SWT.YES | SWT.NO);
-			messageBox.setMessage(TXMUIMessages.DeleteLines_1);
+			messageBox.setMessage(TXMUIMessages.common_areYouSure);
 			int response = messageBox.open();
 			if (response != SWT.YES)
 				return;
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/preferences/LexicalTablePreferencePage.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/preferences/LexicalTablePreferencePage.java	(revision 722)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/preferences/LexicalTablePreferencePage.java	(revision 723)
@@ -29,6 +29,7 @@
 
 import org.eclipse.jface.preference.IntegerFieldEditor;
 import org.eclipse.ui.IWorkbench;
+import org.txm.core.messages.TXMCoreMessages;
 import org.txm.lexicaltable.core.preferences.LexicalTablePreferences;
 import org.txm.lexicaltable.rcp.adapters.LexicalTableAdapterFactory;
 import org.txm.lexicaltable.rcp.messages.LexicalTableUIMessages;
@@ -37,6 +38,7 @@
 
 /**
  * Lexical Table preferences page.
+ * 
  * @author mdecorde
  * @author sjacquot
  *
@@ -47,10 +49,10 @@
 	@Override
 	public void createFieldEditors() {
 		
-		IntegerFieldEditor fmin = new IntegerFieldEditor(LexicalTablePreferences.F_MIN, LexicalTableUIMessages.LexicalTablePreferencePage_1, this.getFieldEditorParent()); 
+		IntegerFieldEditor fmin = new IntegerFieldEditor(LexicalTablePreferences.F_MIN, TXMCoreMessages.common_lowestFrequency, this.getFieldEditorParent()); 
 		fmin.setValidRange(1, 999999999);
 		
-		IntegerFieldEditor vmax = new IntegerFieldEditor(LexicalTablePreferences.V_MAX, "vmax", this.getFieldEditorParent()); 
+		IntegerFieldEditor vmax = new IntegerFieldEditor(LexicalTablePreferences.V_MAX, TXMCoreMessages.common_numberOfLines, this.getFieldEditorParent()); 
 		vmax.setValidRange(1, 999999999);
 		
 		this.addField(fmin);
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages.properties	(revision 722)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages.properties	(revision 723)
@@ -1,17 +1,9 @@
 
-ComputeLexicalTable_0  = Computing the Lexical Table with {0}
-ComputeLexicalTable_1  = Computing the Lexical Table {0} with the property {1}
 ComputeLexicalTable_10 = Opening the lexical table
 ComputeLexicalTable_12 = User index occurrences
 ComputeLexicalTable_13 = Select which margins you want to use
 ComputeLexicalTable_16 = Use all occurrences
-ComputeLexicalTable_2  = no property
 ComputeLexicalTable_3  = Opening marge configuration dialog
-ComputeLexicalTable_4  = StatEngine is not ready. Canceling command.
-ComputeLexicalTable_5  = Can not create a lexical table with an Index created on a Corpus
-ComputeLexicalTable_6  = Vocabularies must share the same properties: {0}
-ComputeLexicalTable_7  = Vocabularies must share the same partition: {0}
-ComputeLexicalTable_9  = LexicalTable dialog, failed to get corpus size: {0}
 
 LexicalTableEditor_1  = ** Error: different columns number: before
 LexicalTableEditor_10 = Merge or Delete columns
@@ -24,9 +16,6 @@
 LexicalTableEditor_18 = Merging lines
 LexicalTableEditor_4  = Apply
 LexicalTableEditor_5  = Keep: {0} lines, Fmin {1}
-LexicalTableEditor_6  = Fmin:
 LexicalTableEditor_7  = \ after
-LexicalTableEditor_8  = Number of lines
 
 LexicalTablePreferencePage_0 = Lexical table
-LexicalTablePreferencePage_1 = Lowest frequency
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_ru.properties	(revision 722)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_ru.properties	(revision 723)
@@ -5,7 +5,7 @@
 ComputeLexicalTable_12 = Употребления в индексе
 ComputeLexicalTable_13 = Выберите пределы для расчетов
 ComputeLexicalTable_16 = Использовать все употребления
-ComputeLexicalTable_2  = N/A_no property
+ComputeLexicalTable_2  = 
 ComputeLexicalTable_3  = Открытие диалогового окна конфигурации пределов
 ComputeLexicalTable_5  = ** Невозможно построить словарную таблицу из Индекса, рассчитанного на корпусе
 ComputeLexicalTable_6  = ** Списки значений должны строиться на одинаковых сочетаниях свойств: {0}
@@ -23,9 +23,6 @@
 LexicalTableEditor_18 = Объединение строк
 LexicalTableEditor_4  = Оставить
 LexicalTableEditor_5  = Оставить {0} строк, Fmin {1}
-LexicalTableEditor_6  = Fmin :
 LexicalTableEditor_7  = \ после  
-LexicalTableEditor_8  = Число строк 
 
 LexicalTablePreferencePage_0 = Словарная таблица
-LexicalTablePreferencePage_1 = Минимальная частотность
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_fr.properties	(revision 722)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/messages_fr.properties	(revision 723)
@@ -2,7 +2,7 @@
 ComputeLexicalTable_0  = Calcul de la table lexicale avec {0}
 ComputeLexicalTable_1  = Calcul de la table lexicale {0} avec la propriété {1}
 ComputeLexicalTable_10 = Ouverture de la table lexicale
-ComputeLexicalTable_12 = Total  toutes les occurrences recenses par l'index 
+ComputeLexicalTable_12 = Total toutes les occurrences recenses par l'index 
 ComputeLexicalTable_13 = Sélectionnez les marges à utiliser
 ComputeLexicalTable_16 = Total  toutes les occurrences du corpus 
 ComputeLexicalTable_2  = Pas de propriété
@@ -23,9 +23,6 @@
 LexicalTableEditor_18 = Fusion de lignes
 LexicalTableEditor_4  = Appliquer
 LexicalTableEditor_5  = Garder {0} lignes, Fmin {1}
-LexicalTableEditor_6  = Fmin :
 LexicalTableEditor_7  = \ après  
-LexicalTableEditor_8  = Nombre de lignes 
 
 LexicalTablePreferencePage_0 = Table lexicale
-LexicalTablePreferencePage_1 = Fréquence minimale
Index: tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/LexicalTableUIMessages.java
===================================================================
--- tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/LexicalTableUIMessages.java	(revision 722)
+++ tmp/org.txm.lexicaltable.rcp/src/org/txm/lexicaltable/rcp/messages/LexicalTableUIMessages.java	(revision 723)
@@ -18,25 +18,13 @@
 	public static String LexicalTableEditor_18;
 	public static String LexicalTableEditor_4;
 	public static String LexicalTableEditor_5;
-	public static String LexicalTableEditor_6;
 	public static String LexicalTableEditor_7;
-	public static String LexicalTableEditor_8;
 	public static String LexicalTablePreferencePage_0;
-	public static String LexicalTablePreferencePage_1;
-	
-	public static String ComputeLexicalTable_0;
 	public static String ComputeLexicalTable_10;
 	public static String ComputeLexicalTable_12;
 	public static String ComputeLexicalTable_13;
 	public static String ComputeLexicalTable_16;
-	public static String ComputeLexicalTable_1;
-	public static String ComputeLexicalTable_2;
 	public static String ComputeLexicalTable_3;
-	public static String ComputeLexicalTable_4;
-	public static String ComputeLexicalTable_5;
-	public static String ComputeLexicalTable_6;
-	public static String ComputeLexicalTable_7;
-	public static String ComputeLexicalTable_9;
 
 
 	static {
Index: tmp/org.txm.lexicaltable.rcp/plugin.xml
===================================================================
--- tmp/org.txm.lexicaltable.rcp/plugin.xml	(revision 722)
+++ tmp/org.txm.lexicaltable.rcp/plugin.xml	(revision 723)
@@ -97,7 +97,7 @@
          </command>
       </menuContribution>
             <menuContribution
-            locationURI="popup:LexicalTableEditorContextMenu">
+            locationURI="popup:org.txm.lexicaltable.rcp.editors.LexicalTableEditor">
          <command
                commandId="org.txm.lexicaltable.rcp.handlers.DeleteLines"
                style="push">
Index: tmp/org.txm.rcp.feature/feature.xml
===================================================================
--- tmp/org.txm.rcp.feature/feature.xml	(revision 722)
+++ tmp/org.txm.rcp.feature/feature.xml	(revision 723)
@@ -116,6 +116,7 @@
       <import plugin="org.eclipse.core.commands" version="3.6.100" match="greaterOrEqual"/>
       <import plugin="org.txm.libs.rserve"/>
       <import plugin="org.txm.libs.cqp" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.txm.information.core" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.apache.xerces" version="2.9.0" match="greaterOrEqual"/>
       <import plugin="org.txm.partition.core"/>
       <import plugin="org.txm.concordance.rcp"/>
@@ -199,7 +200,25 @@
       <import plugin="org.eclipse.e4.ui.services"/>
       <import plugin="org.eclipse.emf.common"/>
       <import plugin="javax.xml"/>
-      <import plugin="org.codehaus.groovy.eclipse.ui" version="2.9.1" match="greaterOrEqual"/>
+      <import plugin="org.txm.ca.core"/>
+      <import plugin="org.eclipse.jdt.core"/>
+      <import plugin="org.eclipse.jdt.ui"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.eclipse.jdt.debug"/>
+      <import plugin="org.eclipse.jdt.launching"/>
+      <import plugin="org.eclipse.jdt.debug.ui"/>
+      <import plugin="org.codehaus.groovy" version="1.8.6" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.groovy.core" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.junit" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ltk.core.refactoring" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.4.100" match="greaterOrEqual"/>
+      <import plugin="org.codehaus.groovy.eclipse.refactoring" version="2.9.0" match="greaterOrEqual"/>
+      <import plugin="org.codehaus.groovy.eclipse.codebrowsing" version="2.9.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jdt.core.manipulation" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.views"/>
+      <import plugin="org.eclipse.core.variables"/>
+      <import plugin="org.eclipse.search" version="3.6.0" match="greaterOrEqual"/>
+      <import plugin="org.codehaus.groovy.eclipse.compilerResolver" version="2.9.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -224,13 +243,6 @@
          unpack="false"/>
 
    <plugin
-         id="org.txm.cah.rcp"
-         download-size="0"
-         install-size="0"
-         version="1.0.0.qualifier"
-         unpack="false"/>
-
-   <plugin
          id="org.txm.chartsengine.core"
          download-size="0"
          install-size="0"
@@ -529,31 +541,38 @@
          unpack="false"/>
 
    <plugin
-         id="org.txm.wordcloud.core"
+         id="org.eclipse.ui.workbench"
          download-size="0"
          install-size="0"
-         version="1.0.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.txm.wordcloud.rcp"
+         id="org.txm.ahc.rcp"
          download-size="0"
          install-size="0"
-         version="1.0.0.qualifier"
+         version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ui.workbench"
+         id="org.txm.information.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.txm.groovy.rcp"
+         id="org.txm.information.rcp"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.codehaus.groovy.eclipse.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NamedAssistedQueryWidget.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NamedAssistedQueryWidget.java	(revision 722)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/NamedAssistedQueryWidget.java	(revision 723)
@@ -79,7 +79,7 @@
 		
 		l = new Label(this, SWT.NONE);
 		l.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, true));
-		l.setText(TXMCoreMessages.QUERY_1);
+		l.setText(TXMCoreMessages.common_query);
 		
 		magicstick = new Button(this, SWT.PUSH);
 		magicstick.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, false, true));
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/preferences/TXMDirectoryFieldEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/preferences/TXMDirectoryFieldEditor.java	(revision 722)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/preferences/TXMDirectoryFieldEditor.java	(revision 723)
@@ -1,59 +0,0 @@
-package org.txm.rcp.swt.widget.preferences;
-
-import java.awt.Desktop;
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.jface.preference.DirectoryFieldEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.txm.utils.logger.Log;
-
-public class TXMDirectoryFieldEditor extends DirectoryFieldEditor {
-
-	Button openModelDirectoryButton;
-	
-	public TXMDirectoryFieldEditor() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public TXMDirectoryFieldEditor(String name, String labelText,
-			Composite parent) {
-		super(name, labelText, parent);
-		
-		GridLayout gl = (GridLayout) parent.getLayout();
-		//System.out.println("GL size "+gl.numColumns);
-		setChangeButtonText("..."); //$NON-NLS-1$
-		
-		Button changeButton = getChangeControl(parent);
-		changeButton.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-		
-		openModelDirectoryButton = new Button(parent, SWT.PUSH);
-		openModelDirectoryButton.setText("Open...");
-		openModelDirectoryButton.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
-		openModelDirectoryButton.addSelectionListener(new SelectionListener() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				try {
-					Desktop.getDesktop().open(new File(getTextControl().getText()));
-				} catch (IOException e1) {
-					System.out.println("Error while opening model path directory: "+e1); //$NON-NLS-1$
-					Log.printStackTrace(e1);
-				}
-			}
-			
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {}
-		});
-	}
-	
-	@Override
-	public int getNumberOfControls() {
-		return super.getNumberOfControls() + 1;
-	}
-}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/preferences/___TXMDirectoryFieldEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/preferences/___TXMDirectoryFieldEditor.java	(revision 0)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/preferences/___TXMDirectoryFieldEditor.java	(revision 723)
@@ -0,0 +1,60 @@
+package org.txm.rcp.swt.widget.preferences;
+
+import java.awt.Desktop;
+import java.io.File;
+import java.io.IOException;
+
+import org.eclipse.jface.preference.DirectoryFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.txm.utils.logger.Log;
+
+// FIXME: not used
+public class ___TXMDirectoryFieldEditor extends DirectoryFieldEditor {
+
+	Button openModelDirectoryButton;
+	
+	public ___TXMDirectoryFieldEditor() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public ___TXMDirectoryFieldEditor(String name, String labelText,
+			Composite parent) {
+		super(name, labelText, parent);
+		
+		GridLayout gl = (GridLayout) parent.getLayout();
+		//System.out.println("GL size "+gl.numColumns);
+		setChangeButtonText("..."); //$NON-NLS-1$
+		
+		Button changeButton = getChangeControl(parent);
+		changeButton.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+		
+		openModelDirectoryButton = new Button(parent, SWT.PUSH);
+		openModelDirectoryButton.setText("Open...");
+		openModelDirectoryButton.setLayoutData(new GridData(GridData.BEGINNING, GridData.BEGINNING, false, false));
+		openModelDirectoryButton.addSelectionListener(new SelectionListener() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				try {
+					Desktop.getDesktop().open(new File(getTextControl().getText()));
+				} catch (IOException e1) {
+					System.out.println("Error while opening model path directory: "+e1); //$NON-NLS-1$
+					Log.printStackTrace(e1);
+				}
+			}
+			
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) {}
+		});
+	}
+	
+	@Override
+	public int getNumberOfControls() {
+		return super.getNumberOfControls() + 1;
+	}
+}

Property changes on: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/preferences/___TXMDirectoryFieldEditor.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PropertiesSelector.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PropertiesSelector.java	(revision 722)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/swt/widget/PropertiesSelector.java	(revision 723)
@@ -286,8 +286,16 @@
 	 * @param index
 	 */
 	public void setSelectedProperty(int index) {
+		this.setSelectedProperty(this.availableProperties.get(index));
+	}
+	
+	/**
+	 * Sets a unique selected property.
+	 * @param property
+	 */
+	public void setSelectedProperty(P property) {
 		List<P> properties = new ArrayList<P>();
-		properties.add(this.availableProperties.get(0));
+		properties.add(property);
 		this.setSelectedProperties(properties);
 	}
 	
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/RCPPreferences.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/RCPPreferences.java	(revision 722)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/preferences/RCPPreferences.java	(revision 723)
@@ -5,23 +5,29 @@
 import org.txm.core.preferences.TBXPreferences;
 import org.txm.core.preferences.TXMPreferences;
 
+
+/**
+ * 
+ * @author sjacquot
+ *
+ */
 public class RCPPreferences extends TXMPreferences {
 
-	/** The Constant SORTBYFREQ. */
-	//FIXME: to extract to referencer plug-in
-	public static final String SORTBYFREQ = "referencer_sorttype"; //$NON-NLS-1$
+	
+	public static final String PREFERENCES_NODE = RCPPreferences.class.getName();//FrameworkUtil.getBundle(RPreferences.class).getSymbolicName();
 
+
+	
+
 	/** The Constant UI_LOCALE. */
 	public static final String UI_LOCALE = "ui_locale"; //$NON-NLS-1$
 
-	/** The Constant PARTSSORT. */
-	public static final String PARTSSORT = "diag_partssort"; //$NON-NLS-1$
-
-	public static final String PREFERENCES_NODE = RCPPreferences.class.getName();//FrameworkUtil.getBundle(RPreferences.class).getSymbolicName();
-
+	/** The Constant USER_ALERT_DELETE. */
 	public static final String USER_ALERT_DELETE = "user_alert_delete"; //$NON-NLS-1$
 
-	// editors update automatically their result when a form parameter is modified
+	/**
+	 * To auto compute result and refresh editor when a form computing parameter is modified.
+	 */
 	public static final String AUTO_UPDATE_EDITOR = "auto_update_editor"; //$NON-NLS-1$
 
 	public static final String SHOW_SEVERE_DIALOG = "show_severe_dialog"; 
@@ -38,7 +44,6 @@
 	public static final String NO_SESSION = "script_nosession"; //$NON-NLS-1$
 
 	public static final String SAVE_BEFORE_EXECUTION = "script_save_before_execution"; //$NON-NLS-1$
-	/** The Constant USER_ALERT_DELETE. */
 
 	/** The Constant N_LINE_PER_PAGE_DEFAULT. */
 	public static final int N_LINE_PER_PAGE_DEFAULT = 100;
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties	(revision 722)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_ru.properties	(revision 723)
@@ -5,24 +5,20 @@
 
 AddBase_1  = Новый корпус: {0}.
 AddBase_10 = Платформа TXM готова к использованию.
-AddBase_16 = ** Невозможно записать язык {0} как свойство ''LANG'' структуры <txmcorpus>
 AddBase_17 = ** Файл {0} недоступен
 AddBase_19 = Внимание
 AddBase_2  = ** Ошибка загрузки корпуса из папки: {0}.\nНевозможно найти необходимые составные элементы.
 AddBase_20 = Корпус {0} уже существует. Хотите ли вы его заменить?
 AddBase_22 = Файл {0} не соответствует формату TXM.
-AddBase_23 = Корпус {0} не имеет свойства ''LANG'' при структуре <txmcorpus>
 AddBase_24 = ** Не удалось загрузить корпус {0}
 AddBase_25 = Корпус TXM в бинарном формате - это либо файл с расширением .txm или .zip, либо директория с папками 'html', 'data', 'registry', 'txm'
 AddBase_27 = Загрузить корпус
 AddBase_28 = Извлечение бинарного корпуса
-AddBase_29 = Извлечено {0} за {1}
 AddBase_31 = ** Не удалось загрузить бинарный корпус: {0}
 AddBase_32 = Загрузка корпуса в платформу
 AddBase_33 = Перезагрузка платформы
 AddBase_34 = Рабочая среда TXM не инициализирована. Пожалуйста, перезагрузите TXM.
 AddBase_4  = ** Не удалось загрузить бинарный корпу (null error).
-AddBase_7  = ** Не удалось создать бинарный корпус.
 
 AddProject_3 = Введите название проекта
 
@@ -40,41 +36,28 @@
 ApplicationWorkbenchAdvisor_12          = ** Ошибка: переменная среды ''TXMHOME'' задана ({0}), но нет папки: 
 ApplicationWorkbenchAdvisor_13          = ** Не удалось создать папку TXMHOME : {0}
 ApplicationWorkbenchAdvisor_16          = N/A_Removing old corpus backup directory {0}. 
-ApplicationWorkbenchAdvisor_17          = .
 ApplicationWorkbenchAdvisor_18          = Corpora backuped: {0} 
-ApplicationWorkbenchAdvisor_19          = ** Не удалось задать параметры программы TreeTagger : {0}
 ApplicationWorkbenchAdvisor_2           = Загрузка опций установки TXM из: {0}
-ApplicationWorkbenchAdvisor_20          = N/A_ in 
 ApplicationWorkbenchAdvisor_22          = N/A_Processing folder: 
 ApplicationWorkbenchAdvisor_23          = \ ...
 ApplicationWorkbenchAdvisor_24          = N/A_Failed moving old corpus from 
-ApplicationWorkbenchAdvisor_25          = Чтение опций из места установки: {0}
 ApplicationWorkbenchAdvisor_26          = N/A_ to 
 ApplicationWorkbenchAdvisor_27          = Рабочая папка TXM уже существует. Загрузить ранее созданные корпусы?
 ApplicationWorkbenchAdvisor_28          = Сохранение рабочей папки...
 ApplicationWorkbenchAdvisor_3           = Проверка наличия рабочей папки
 ApplicationWorkbenchAdvisor_30          = Перемещение существующих корпусов...
 ApplicationWorkbenchAdvisor_31          = ** Не удалось создать рабочее пространство 'default.xml'
-ApplicationWorkbenchAdvisor_32          = ** TreeTagger не установлен или неверно заданы пути доступа.
-ApplicationWorkbenchAdvisor_33          = Пути доступа к TreeTagger приведены к значениями по умолчанию.
 ApplicationWorkbenchAdvisor_34          = ** Ошибка: не удалсоь создать папку для сохранения корпуса
-ApplicationWorkbenchAdvisor_35          = N/A_\nCorpus 
-ApplicationWorkbenchAdvisor_36          = Перемещение  
 ApplicationWorkbenchAdvisor_37          = \ в 
-ApplicationWorkbenchAdvisor_38          = Внимание: корпус уже был сохранен.
 ApplicationWorkbenchAdvisor_39          = Не хватает папки в директории установки TXM : {0}
-ApplicationWorkbenchAdvisor_4           = Проверка установки TreeTagger
 ApplicationWorkbenchAdvisor_40          = ** Не удалось скопировать файлы из папки TXMINSTALL в TXMHOME: {0}
 ApplicationWorkbenchAdvisor_41          = ** Не удалось задать опции: {0}
-ApplicationWorkbenchAdvisor_42          = \ перемещение 
 ApplicationWorkbenchAdvisor_43          = Corpora {0} not restored, since this setup provides more recent ones.
 ApplicationWorkbenchAdvisor_43_single   = Corpus {0} not restored, since this setup provides more recent ones.
 ApplicationWorkbenchAdvisor_44          = ** Невозможно перенести корпус 
 ApplicationWorkbenchAdvisor_45          = ** Файл не читается: {0}
-ApplicationWorkbenchAdvisor_46          = N/A_\nCorpus 
 ApplicationWorkbenchAdvisor_47          = ** Невозможно сохранить существующие корпусы:
 ApplicationWorkbenchAdvisor_48          = \nCorpus ''{0}'' could not be restored and are moved to ''{1}''.
-ApplicationWorkbenchAdvisor_49          = N/A_Initializing the toolbox...
 ApplicationWorkbenchAdvisor_5           = Стандартный выход
 ApplicationWorkbenchAdvisor_51          = ** Не удалось загрузить корпус из файла: 
 ApplicationWorkbenchAdvisor_52          = ** Не удалось загрузить демонстрационные корпусы: {0}
@@ -82,13 +65,11 @@
 ApplicationWorkbenchAdvisor_54          = Преобразование корпусов из формата TXM 0.5 
 ApplicationWorkbenchAdvisor_55          = \ в формат TXM 0.6.
 ApplicationWorkbenchAdvisor_56          = ** Не удалось преобразовать корпус в формат TXM 0.6
-ApplicationWorkbenchAdvisor_57          = Загрузка преобразованного корпуса 0.5 
 ApplicationWorkbenchAdvisor_58          = Загрузка корпуса 0.6 
 ApplicationWorkbenchAdvisor_59          = ** Ошибка во время загрузки 
 ApplicationWorkbenchAdvisor_60          = ** Ошибка: корпус 
 ApplicationWorkbenchAdvisor_61          = \ не является бинарным корпусом TXM 0.6
 ApplicationWorkbenchAdvisor_7           = Создание рабочего пространства пользователя TXM.
-ApplicationWorkbenchAdvisor_71          = Загрузка демонстрационных корпусов.
 ApplicationWorkbenchAdvisor_8           = Путь установки: {0}
 ApplicationWorkbenchAdvisor_9           = ** Ошибка чтения файла опций установки
 ApplicationWorkbenchAdvisor_init        = Запуск {0}...
@@ -96,7 +77,6 @@
 ApplicationWorkbenchAdvisor_ready       = Готово.
 
 Application_4                           = N/A_This file is not meant to run TXM. Please consult TXM user manual.
-Application_6                           = ** Вы должны установить версию 1.6 Java или более поздниюю, прежде чем запустить TXM, установленная на этой машине версия Java: {0}
 
 AssistedQueryWidget_0 = Ouvrir l'assistant de requêtes
 
@@ -110,8 +90,6 @@
 
 Cannot_ask_simple_when_advance = Невозможно отобразить закладку простых опций, когда пользователь выбрал отображение дополнительных опций
 
-Commands_0 = Ошибка: невозможно инициализировать команды
-
 ComplexSortSelector_0 = Ключи для сортировки:
 ComplexSortSelector_1 = Мульти-сортировка
 ComplexSortSelector_2 = Сортировка
@@ -140,48 +118,15 @@
 ComplexSubcorpusPanel_4  = Запрос 
 ComplexSubcorpusPanel_5  = Обновить
 
-ComputeCoocFromLines_0 = Идет расчет совместной встречаемости
-ComputeCoocFromLines_1 = Открытие таблицы совместной встречаемости
-
-ComputeFrequencyList_2 = Расчет списка значений свойства {0} в корпусе {1}
-
 ComputeIndexFromLines_0 = Выполнить команду Индекс на выделении
 
 ConvertCorpus_0 = 
 
 CorporaView_0 = Корпус
-CorporaView_1 = ** Ошибка: {0}
-CorporaView_2 = ** Не удалось получить размеры корпуса {0}
 CorporaView_3 = ** Произошла ошибка при расчете конкорданса
-CorporaView_5 = ** Произошла ошибка при расчете специфичности
-CorporaView_6 = ** Не удалось открыть окно Мастера ссылок\	
-CorporaView_7 = ** Произошла ошибка при расчете словарной таблицы
-CorporaView_9 = ** Ошибка: не удается проивести запись в {0}
 
 CorpusPage_0  = Издания
-CorpusPage_1  = Добавить издание
-CorpusPage_10 = Свойства слова
-CorpusPage_11 = Добавить определение свойства
-CorpusPage_12 = Добавить опредление свойства структуры
-CorpusPage_13 = Удалить определение свойства
-CorpusPage_14 = Подкорпуса и распределения по умолчанию
-CorpusPage_15 = Добавить подкорпус
-CorpusPage_17 = Удалить подкорпус
-CorpusPage_18 = Добавить распределение
-CorpusPage_2  = Удалить издание
-CorpusPage_20 = Удалить распределение
-CorpusPage_21 = Добавить запрос
-CorpusPage_23 = Удалить запрос
-CorpusPage_24 = Свойства структуры
-CorpusPage_25 = Добавить определение свойства структуры
-CorpusPage_27 = Удалить определение свойства структуры
-CorpusPage_28 = Использовать только эти тесты при словарной сегментации
-CorpusPage_29 = Добавить параметр
 CorpusPage_3  = Шрифт
-CorpusPage_31 = Удалить параметр
-CorpusPage_32 = Добавить тест
-CorpusPage_33 = Добавить параметр
-CorpusPage_34 = Удалить тест
 CorpusPage_35 = 1.\	Нажмите на значок 
 CorpusPage_36 = 'папка', чтобы 
 CorpusPage_37 = выбрать папку с исходными материалами.
@@ -193,18 +138,14 @@
 CorpusPage_42 = 4.\	Чтобы
 CorpusPage_43 = начать импортирование,
 CorpusPage_44 = \ нажмите на этот значок: 
-CorpusPage_45 = ПИ
 CorpusPage_46 = Папка с исходными материалами не содержала файл 'import.xml'. Создан новый.
 CorpusPage_47 = Ошибка при создании файла 'import.xml' 
 CorpusPage_48 = Загрузка параметров импорта из файла: 
 CorpusPage_49 = N/A_Default
 CorpusPage_5  = N/A_caract�res blancs s�parateurs
 CorpusPage_50 = Параметры модуля: 
-CorpusPage_51 = Только эти тесты
 CorpusPage_52 = Сохранение параметров импорта...
 CorpusPage_53 = Имя корпуса обязательно
-CorpusPage_54 = Имя корпуса должно содержать хотя бы одну букву
-CorpusPage_55 = Только эти тесты
 CorpusPage_6  = Удалить параметр
 CorpusPage_61 = Edit XSL stylesheet...
 CorpusPage_7  = Общая информация
@@ -215,8 +156,6 @@
 
 CreateFolder_1 = Новая папка: {0}
 
-CreateFrequencyList_8 = Загрузка таблицы частотности
-
 CreatePartitionDialog_0  = Создать Распределение
 CreatePartitionDialog_1  = Простое
 CreatePartitionDialog_16 = Запросы не должны быть пустыми
@@ -250,8 +189,6 @@
 CreateSubcorpus_8        = Готово : {0} образован 
 CreateSubcorpus_9        = Составление подкорпуса для {0} по запросу <{1}>
 
-DONE = Готово: {0}
-
 DefineReferencePattern_0 = Шаблон ссылок для отображения
 DefineReferencePattern_1 = Шаблон ссылок для &отображения
 DefineReferencePattern_2 = Шаблон ссылок для отображения
@@ -266,7 +203,6 @@
 DeleteInCorporaView_2 = ** Ошибка при удалении распределения {0}
 
 DeleteLines_0 = Таблица должна содержать хотя бы одну строчку
-DeleteLines_1 = Вы уверены?
 
 DeleteObject_0  = Вы действительно хотите удалить {0}?
 DeleteObject_10 = {0} удален(о)
@@ -339,7 +275,6 @@
 ExportPreferencePage_1  = Конфигурация экспорта
 ExportPreferencePage_18 = Разделитель полей
 ExportPreferencePage_19 = Разделитель текста
-ExportPreferencePage_21 = Формат графиков R по умолчанию
 ExportPreferencePage_3  = Кодировка экспортируемых файлов
 ExportPreferencePage_4  = Показать результаты экспорта в текстовом редакторе
 
@@ -351,24 +286,11 @@
 ExportResult_5 = ** Не удается прочитать {0}
 ExportResult_6 = ** Не удалось экспортировать результат {0}: {1}
 
-ExportSVG_0 = N/A_Exporting SVG...
-ExportSVG_2 = N/A_Exporting with device: 
-
 FAILED_TO_PARSE_OPTIONS    = ** Не удалось проанализировать опции TXM {0}: {1}
 FAILED_TO_SAVE_PREFERENCES = ** Не удалось сохранить персональные настройки
 
-FactorialMapEditor_0  = Факторы:  
-FactorialMapEditor_10 = ** Внутренняя ошибка: ошибка выбора плана ФАС
-FactorialMapEditor_11 = Изменить размер
-FactorialMapEditor_13 = Обновление факторного плана
-FactorialMapEditor_4  = Показать: 
-FactorialMapEditor_5  = колонки
-FactorialMapEditor_6  = строки
-FactorialMapEditor_8  = Перезагрузка факторного плана
-
 FileExplorerPreferencePage_0 = Рег. выр. скрытых файлов
 FileExplorerPreferencePage_1 = Показать скрытые файлы
-FileExplorerPreferencePage_2 = Показать папки
 
 FileTreeContentProvider_1 = ** Проводник: некорректное регулярное выражение
 FileTreeContentProvider_2 = \ ОШИБКА 
@@ -376,13 +298,10 @@
 FileTreeContentProvider_4 = '
 
 FrequencyListEditorInput_0 = Список форм
-FrequencyListEditorInput_1 = Pareto
-FrequencyListEditorInput_2 = Список форм не может быть пустым
 FrequencyListEditorInput_3 = Форма
 FrequencyListEditorInput_4 = Частотность
 FrequencyListEditorInput_5 = Цепочка знаков
 FrequencyListEditorInput_6 = Целое
-FrequencyListEditorInput_9 = Тип
 
 GenericMultiPageEditor_1 = ** Внутренняя ошибка: невозможно показать данные {0}.
 GenericMultiPageEditor_3 = ** Внутренняя ошибка: число редакторов RCP ({0}) должно соответствовать числу вводов ({1}).
@@ -417,8 +336,6 @@
 ImportSelectedText_4  = Корпус {0} будет удален
 ImportSelectedText_6  = ** Внутренняя ошибка: не удается найти проект 'default' 
 
-IndexToCooccurrence_0 = ** Ошибка при связывании Индекса и Совместной встречаемости
-
 IndexToLexicalTable_0 = Невозможно составить словарную таблицу из Индекса, полученного на Корпусе
 
 InternalCorpusView_0 = ** Ошибка при подготовке информации о корпусе
@@ -435,8 +352,6 @@
 JobsTimer_12 = ч., 
 JobsTimer_13 = \ мин. и 
 JobsTimer_15 = Проделано за {0} ({1}).
-JobsTimer_16 = . (
-JobsTimer_17 = \ мс)
 JobsTimer_19 = Проделано за {0}.
 JobsTimer_2  = \ мс
 JobsTimer_20 = Job: 
@@ -461,49 +376,12 @@
 MacrosExplorer_1 = N/A_Create a new macro from a template
 
 MainPage_0  = Главная страница
-MainPage_1  = Главный
-MainPage_10 = \	Чтобы перейти на следующую панель, используйте закладку снизу.\n
-MainPage_11 = 3-\	Вы можете сохранить параметры импорта с помощью значка дискеты.\n
-MainPage_12 = 4-\	Для запуска импорта нажмите на зелёную стрелку.
-MainPage_13 = параллелизм
-MainPage_14 = Корпуса
-MainPage_15 = Добавить параллельный корпус
-MainPage_17 = Введите имя корпуса
 MainPage_18 = Входная стилевая таблица XSL
 MainPage_19 = Параметры словарной сегментации
 MainPage_2  = Параметры импорта в модуле {0}
 MainPage_20 = Основной язык
-MainPage_22 = Удалить корпус
 MainPage_23 = Кодировка
-MainPage_25 = Введите имя удаляемого корпуса
-MainPage_27 = Гиперссылки
-MainPage_28 = ** Ошибка при получении кодировки
-MainPage_29 = Добавить гиперссылку
 MainPage_3  = Папка с исходными материалами: 
-MainPage_30 = Создать гиперссылку из корпуса: 
-MainPage_31 = Выберите 2 корпуса:
-MainPage_33 = seg
-MainPage_34 = Удалить гиперссылку
-MainPage_36 = Введите номер удаляемой строки
-MainPage_38 = Убрать гиперссылку №
-MainPage_39 = Введите корректное число
-MainPage_4  = Имя корпуса (базы)
-MainPage_40 = Первый корпус
-MainPage_42 = Структура выравнивания
-MainPage_44 = * \n(имя архива без расширения, в котором будет храниться корпус)
-MainPage_45 = Описание
-MainPage_46 = Добавить 
-MainPage_49 = N/A_base name is mandatory
-MainPage_5  = N/A_Opening...
-MainPage_50 = N/A_refresh links table
-MainPage_52 = N/A_The source directory does not contain import.xml
-MainPage_53 = N/A_Sorry, 'the import.xml' file could not been created
-MainPage_54 = N/A_Load params from: 
-MainPage_55 = N/A_Params: 
-MainPage_6  = N/A_Saving...
-MainPage_7  = N/A_Starting...
-MainPage_8  = N/A_1-\	Click on the 'folder' icon to choose the source directory\n
-MainPage_9  = N/A_2-\	If you want to add details such as default subcorpus, exemple queries or types of word properties,\n
 
 MergeCols_1 = Новое имя
 MergeCols_2 = Имя новой колонки, образованной объединением
@@ -526,21 +404,6 @@
 
 NavigationWidget_0 = N/A_Error while getting current position value : 
 
-ONE_RESULT = Готово: один результат
-
-ObjectExplorer_0  = Информация: 
-ObjectExplorer_10 = Удалить свойство
-ObjectExplorer_12 = Набрать имя удаляемого свойства
-ObjectExplorer_15 = Добавить свойство нижестоящим элементам
-ObjectExplorer_2  = Значение
-ObjectExplorer_21 = Удалить свойство у нижестоящих элементов
-ObjectExplorer_26 = Имя
-ObjectExplorer_27 = Ключ
-ObjectExplorer_3  = Новое свойство
-ObjectExplorer_4  = Имя свойства
-ObjectExplorer_5  = Введите имя добавляемого свойства
-ObjectExplorer_7  = новое имя
-
 ObjectSelectionDialog_0 = Селектор значений
 ObjectSelectionDialog_3 = Найдено {0} значений
 
@@ -555,21 +418,12 @@
 OpenBrowser_0 = ** Ошибка при открытии библиографической записи 
 OpenBrowser_1 = . URL
 
-OpenEdition_0 = Выбрать часть
-OpenEdition_1 = ** Не удалось загрузить издание {0}
-OpenEdition_3 = Открытие издания {0} 
-OpenEdition_5 = ** Не удается найти первый текст с идентификатором {0} в корпусе или
-OpenEdition_7 = ** Не удается найти издание по умолчанию 
-OpenEdition_8 = ** Не удается найти первую страницу издания 
-
 OpenEmptyEditor_2 = ** Библиография: не удается найти папку {0}
 
 OpenGraph_8 = ** Не удается октрыть график {0}
 
 OpenSVGGraph_0 = График SVG 
 
-OpenTXMUserPreferences_0 = Параметры по умолчанию
-
 OpenURI_0 = ** OpenURL : Рабочий стол не поддерживается
 OpenURI_1 = ** Ошибка при открытии файла {0}
 
@@ -578,10 +432,7 @@
 ParametersDialog_10 = N/A_Unknowed widget name: '
 ParametersDialog_11 = N/A_(* mandatory fields)
 ParametersDialog_12 = N/A_** Error : missing value: 
-ParametersDialog_13 = N/A_** Error : format error: 
 ParametersDialog_14 = N/A_Error in @Option name declaration: 
-ParametersDialog_15 = N/A_Error: the bean is not a groovy.lang.Script object
-ParametersDialog_17 = N/A_Error: the ''monitor'' (JobHandler class) binding is missing. Got: {0}.
 
 PartitionComposer_0  = Структура: 
 PartitionComposer_11 = Удалить
@@ -592,11 +443,6 @@
 PartitionComposer_8  = Заголовок: 
 PartitionComposer_9  = Назначить
 
-PartsSize_0  = N/A_\n Sorted by size
-PartsSize_10 = Размеры распределения {0} корпуса {1} в порядке величины
-PartsSize_18 = Размеры: {0}
-PartsSize_2  = N/A_Number of words per part
-
 PasteFile_1 = ** Ошибка при копировании  
 PasteFile_3 = ** Не удалось удалить
 PasteFile_4 = : 
@@ -632,7 +478,6 @@
 QueryAssistDialog_12 = заканчивается на
 QueryAssistDialog_13 = содержит
 QueryAssistDialog_2  = Я ищу: 
-QueryAssistDialog_3  = слово
 QueryAssistDialog_32 = за ним 
 QueryAssistDialog_33 = с интервалом не менее 0 слов
 QueryAssistDialog_34 = с интервалом не менее 1 слова
@@ -644,7 +489,6 @@
 RenameFile_2 = Переименование через: 
 RenameFile_3 = ** Не удалось переименовать 
 
-RestartTXM_0 = Перезагрузка видов...
 RestartTXM_1 = Перезагрузить TXM
 
 RunGroovyScript_0 = Выполнение скрипта
@@ -663,7 +507,6 @@
 SaveAs_2 = ** Не удалось сохранить 
 
 ScriptPreferencePage_0 = Следующий номер сессии 
-ScriptPreferencePage_3 = &Корневая папка
 
 SetContextSize_1 = Задать размер &контекстов
 SetContextSize_2 = Задать размер контекстов
@@ -681,8 +524,6 @@
 SetSortProperty_2 = Задать свойство сортировки
 SetSortProperty_3 = Сортировка свойств 
 
-ShowSelected_4 = Править свойство 'LANG'
-
 ShowSvgHelp_0 = Команды SVG
 ShowSvgHelp_1 = Перевод: Shift + Левый щелчок + Перетащить\n
 ShowSvgHelp_2 = Масштаб +/- : Shift + Правый щелчок + Перетащить\n
@@ -698,13 +539,6 @@
 
 Submit_0 = Сохранить
 
-TXMCqpServerWatcher_0 = Поисковая машина остановлена
-TXMCqpServerWatcher_1 = Пожалуйста, подождите, пока поисковая машина перезагружается...
-
-TXMRServeWatcher_0 = Статистическая машина остановлена
-TXMRServeWatcher_1 = Пожалуйста, подождите, пока статистическая машина перезагружается...
-TXMRServeWatcher_3 = Перезагрузка вида корпусов...
-
 TablableVector_0 = Обе таблицы должны быть одинакового размера.
 
 TableEditor_0 = Невозможно показать таблицу с предложенной информациейn: {0}
@@ -713,14 +547,9 @@
 
 TableSorter_0 = Номер колонки слишком велик.
 
-TextometriePreferencePage_0  = N/A_Automatically find new updates and notify me
-TextometriePreferencePage_1  = N/A_General preferences backup
-TextometriePreferencePage_14 = Настройки сохранены в 
-TextometriePreferencePage_15 = Экспорт настроек в файл
-TextometriePreferencePage_18 = Настройки импортированы из 
-TextometriePreferencePage_19 = Необходимо закрыть окно настроек, чтобы TXM могла их обновить
-TextometriePreferencePage_2  = 
-TextometriePreferencePage_20 = Импортировать из файла
+TextometriePreferencePage_0 = N/A_Automatically find new updates and notify me
+TextometriePreferencePage_1 = N/A_General preferences backup
+TextometriePreferencePage_2 = 
 
 TxmBrowser_10 = Не удается запустить встроенные браузер. Вы должны отрегулировать соответствующий параметр в Настройках, с помощью меню Общие / Веб браузер
 TxmBrowser_11 = Нет предыдущего текста
@@ -730,16 +559,14 @@
 TxmBrowser_8  = следующий текст
 TxmBrowser_9  = предыдущий текст
 
-TxmCommand_1 = Загрузка расширения
-
 TxtEditor_0 = ТекстовыйРедактор: 
 TxtEditor_1 = Найденная кодировка 
 
 UIParameterException_0 = N/A_Error  
 
-UserPreferencePage_0 = Страница Пользователя
 UserPreferencePage_3 = Не требуется подтверждение для удаления объекта
 
+common_areYouSure                         = Вы уверены?
 common_beginning                          = Начало
 common_displayOptions                     = Отображение свойств
 common_end                                = В конец
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties	(revision 722)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages_fr.properties	(revision 723)
@@ -8,24 +8,20 @@
 
 AddBase_1  = Nouveau corpus : {0}.
 AddBase_10 = TXM est prêt.
-AddBase_16 = ** Impossible d''affecter la langue {0} à la propriété ''LANG'' de la structure <txmcorpus>
 AddBase_17 = ** Impossible de lire le fichier {0}
 AddBase_19 = Attention
 AddBase_2  = ** Échec du chargement du corpus à partir du dossier : {0}.\nImpossible de trouver les composants nécessaires.
 AddBase_20 = Le répertoire du corpus {0} existe déjà. Voulez-vous le remplacer ?
 AddBase_22 = Le fichier {0} n''est pas un fichier TXM.
-AddBase_23 = Le corpus {0} n''a pas de propriété ''LANG'' associée à la structure <txmcorpus>
 AddBase_24 = ** Échec du chargement du corpus {0}
 AddBase_25 = Un corpus TXM au format binaire est soit un fichier d'extension .txm ou .zip, soit un dossier composé des sous-dossiers 'html', 'data', 'registry', 'txm'
 AddBase_27 = Chargement du corpus
 AddBase_28 = Extraction du corpus binaire
-AddBase_29 = Extraction de {0} dans {1}
 AddBase_31 = ** Échec de l''extraction du corpus binaire : {0}
 AddBase_32 = Chargement du corpus dans la plateforme
 AddBase_33 = Redémarrage de la plateforme
 AddBase_34 = L'espace de travail de TXM n'est pas initialisé, veuillez redémarrer TXM.
 AddBase_4  = ** Échec de chargement du corpus binaire(null error).
-AddBase_7  = ** Échec de création du corpus binaire.
 
 AddProject_3 = Saisissez le nom du projet
 
@@ -40,74 +36,55 @@
 AdvancePreferencePage_6  = Journal et messages
 AdvancePreferencePage_7  = Niveau de mise à jour
 
-ApplicationWorkbenchAdvisor_0                            = Initialisation de la plateforme...
-ApplicationWorkbenchAdvisor_1                            = Initialisation de la plateforme...
-ApplicationWorkbenchAdvisor_11                           = Chargement des corpus d'exemple 
-ApplicationWorkbenchAdvisor_12                           = ** Erreur : la variable d''environnement ''TXMHOME'' est bien définie ({0}) mais le dossier n''existe pas : 
-ApplicationWorkbenchAdvisor_13                           = ** Échec de la création du dossier TXMHOME : {0}
-ApplicationWorkbenchAdvisor_16                           = Nettoyage de l''ancien dossier de sauvegarde des corpus ''{0}''. 
-ApplicationWorkbenchAdvisor_17                           = .
-ApplicationWorkbenchAdvisor_18                           = Corpus sauvegardés dans : {0}.
-ApplicationWorkbenchAdvisor_19                           = ** Échec de configuration des paramètres du logiciel TreeTagger : {0}
-ApplicationWorkbenchAdvisor_2                            = Chargement des préférences d''installation de TXM à partir de : {0}
-ApplicationWorkbenchAdvisor_20                           = \ in 
-ApplicationWorkbenchAdvisor_22                           = Traitement du dossier : 
-ApplicationWorkbenchAdvisor_23                           = \ ...
-ApplicationWorkbenchAdvisor_24                           = Erreur lors du déplacement du corpus depuis  
-ApplicationWorkbenchAdvisor_25                           = Réglages des préférences par défaut depuis le chemin d''installation {0}
-ApplicationWorkbenchAdvisor_26                           = \ vers  
-ApplicationWorkbenchAdvisor_27                           = Le dossier de travail de TXM existe déjà : {0}. Voulez vous recharger les corpus sauvegardés ?
-ApplicationWorkbenchAdvisor_28                           = Récupération des corpus existants…
-ApplicationWorkbenchAdvisor_3                            = Vérification de la présence du dossier de travail
-ApplicationWorkbenchAdvisor_30                           = Sauvegarde des corpus existants dans ''{0}''.
-ApplicationWorkbenchAdvisor_31                           = ** Échec de la création de l'espace de travail 'default.xml'
-ApplicationWorkbenchAdvisor_32                           = ** TreeTagger n'est pas installé, ou les chemins d'accès sont incorrects.
-ApplicationWorkbenchAdvisor_33                           = Les chemins d'accès à TreeTagger ont été réglés à des valeurs par défaut.
-ApplicationWorkbenchAdvisor_34                           = ** Échec : le dossier de sauvegarde des corpus n'a pas pu être créé
-ApplicationWorkbenchAdvisor_35                           = \nCorpus 
-ApplicationWorkbenchAdvisor_36                           = Déplacement des corpus de 
-ApplicationWorkbenchAdvisor_37                           = \ vers 
-ApplicationWorkbenchAdvisor_38                           = Attention : le corpus a déjà été sauvegardé.
-ApplicationWorkbenchAdvisor_39                           = Dossier manquant dans le dossier d''installation de TXM : {0}
-ApplicationWorkbenchAdvisor_4                            = Vérification de l'installation de TreeTagger
-ApplicationWorkbenchAdvisor_40                           = ** Échec de la copie des fichiers TXM du dossier TXMINSTALL vers TXMHOME : {0}
-ApplicationWorkbenchAdvisor_41                           = ** Échec de réglage des préférences : {0}
-ApplicationWorkbenchAdvisor_42                           = \ déplacement de 
-ApplicationWorkbenchAdvisor_43                           = Les corpus {0} ont été mis à jour avec une version plus récente.
-ApplicationWorkbenchAdvisor_43_single                    = Le corpus {0} a été mis à jour avec une version plus récente.
-ApplicationWorkbenchAdvisor_44                           = ** Impossible de déplacer le corpus 
-ApplicationWorkbenchAdvisor_45                           = ** Impossible de lire le fichier {0}
-ApplicationWorkbenchAdvisor_46                           = \nCorpus 
-ApplicationWorkbenchAdvisor_47                           = ** Impossible de sauvegarder les corpus existants : 
-ApplicationWorkbenchAdvisor_48                           = \nCorpus ''{0}'' non restauré et déplacé vers ''{1}''
-ApplicationWorkbenchAdvisor_49                           = Initialisation de la toolbox...
-ApplicationWorkbenchAdvisor_5                            = Sortie standard
-ApplicationWorkbenchAdvisor_51                           = ** Échec du chargement du corpus depuis le fichier : 
-ApplicationWorkbenchAdvisor_52                           = ** Échec du chargement des corpus d''exemple : {0}
-ApplicationWorkbenchAdvisor_53                           = Rechargement des corpus existants depuis le dossier ''{0}''.
-ApplicationWorkbenchAdvisor_54                           = Conversion du corpus au format TXM 0.5 
-ApplicationWorkbenchAdvisor_55                           = \ au format TXM 0.6.
-ApplicationWorkbenchAdvisor_56                           = ** Échec de la conversion du corpus au format TXM 0.6
-ApplicationWorkbenchAdvisor_57                           = Chargement du corpus 0.5 converti 
-ApplicationWorkbenchAdvisor_58                           = Chargement du corpus 0.6 
-ApplicationWorkbenchAdvisor_59                           = ** Erreur lors du chargement de 
-ApplicationWorkbenchAdvisor_60                           = ** Erreur : le répertoire 
-ApplicationWorkbenchAdvisor_61                           = \ n'est pas un corpus binaire.
-ApplicationWorkbenchAdvisor_66                           = Récupération des préférences de TXM de l'installation précédente depuis le fichier   
-ApplicationWorkbenchAdvisor_67                           = Pas de fichier de préférences de l'installation précédentes trouvé : 
-ApplicationWorkbenchAdvisor_68                           = Mise en place du thème par défaut
-ApplicationWorkbenchAdvisor_69                           = Erreur lors du chargement du thème : 
-ApplicationWorkbenchAdvisor_7                            = Création de l'espace de travail utilisateur de TXM.
-ApplicationWorkbenchAdvisor_71                           = Chargement des corpus d'exemple.
-ApplicationWorkbenchAdvisor_8                            = Chemin d''installation : {0}
-ApplicationWorkbenchAdvisor_9                            = ** Échec de lecture du fichier des préférences d'installation
-ApplicationWorkbenchAdvisor_PROGRESS_BAR_LOADING_CORPORA = Chargement des corpus
-ApplicationWorkbenchAdvisor_init                         = Démarrage de TXM {0}...
-ApplicationWorkbenchAdvisor_init_failed                  = ** Le démarrage de la plateforme a été interrompu, veuillez régler les préférences de TXM (dans le menu 'Fichier>Préférences')
-ApplicationWorkbenchAdvisor_ready                        = Prêt.
+ApplicationWorkbenchAdvisor_0           = Initialisation de la plateforme...
+ApplicationWorkbenchAdvisor_1           = Initialisation de la plateforme...
+ApplicationWorkbenchAdvisor_11          = Chargement des corpus d'exemple 
+ApplicationWorkbenchAdvisor_12          = ** Erreur : la variable d''environnement ''TXMHOME'' est bien définie ({0}) mais le dossier n''existe pas : 
+ApplicationWorkbenchAdvisor_13          = ** Échec de la création du dossier TXMHOME : {0}
+ApplicationWorkbenchAdvisor_16          = Nettoyage de l''ancien dossier de sauvegarde des corpus ''{0}''. 
+ApplicationWorkbenchAdvisor_18          = Corpus sauvegardés dans : {0}.
+ApplicationWorkbenchAdvisor_2           = Chargement des préférences d''installation de TXM à partir de : {0}
+ApplicationWorkbenchAdvisor_22          = Traitement du dossier : 
+ApplicationWorkbenchAdvisor_23          = \ ...
+ApplicationWorkbenchAdvisor_24          = Erreur lors du déplacement du corpus depuis  
+ApplicationWorkbenchAdvisor_26          = \ vers  
+ApplicationWorkbenchAdvisor_27          = Le dossier de travail de TXM existe déjà : {0}. Voulez vous recharger les corpus sauvegardés ?
+ApplicationWorkbenchAdvisor_28          = Récupération des corpus existants…
+ApplicationWorkbenchAdvisor_3           = Vérification de la présence du dossier de travail
+ApplicationWorkbenchAdvisor_30          = Sauvegarde des corpus existants dans ''{0}''.
+ApplicationWorkbenchAdvisor_31          = ** Échec de la création de l'espace de travail 'default.xml'
+ApplicationWorkbenchAdvisor_34          = ** Échec : le dossier de sauvegarde des corpus n'a pas pu être créé
+ApplicationWorkbenchAdvisor_37          = \ vers 
+ApplicationWorkbenchAdvisor_39          = Dossier manquant dans le dossier d''installation de TXM : {0}
+ApplicationWorkbenchAdvisor_40          = ** Échec de la copie des fichiers TXM du dossier TXMINSTALL vers TXMHOME : {0}
+ApplicationWorkbenchAdvisor_41          = ** Échec de réglage des préférences : {0}
+ApplicationWorkbenchAdvisor_43          = Les corpus {0} ont été mis à jour avec une version plus récente.
+ApplicationWorkbenchAdvisor_43_single   = Le corpus {0} a été mis à jour avec une version plus récente.
+ApplicationWorkbenchAdvisor_44          = ** Impossible de déplacer le corpus 
+ApplicationWorkbenchAdvisor_45          = ** Impossible de lire le fichier {0}
+ApplicationWorkbenchAdvisor_47          = ** Impossible de sauvegarder les corpus existants : 
+ApplicationWorkbenchAdvisor_48          = \nCorpus ''{0}'' non restauré et déplacé vers ''{1}''
+ApplicationWorkbenchAdvisor_5           = Sortie standard
+ApplicationWorkbenchAdvisor_51          = ** Échec du chargement du corpus depuis le fichier : 
+ApplicationWorkbenchAdvisor_52          = ** Échec du chargement des corpus d''exemple : {0}
+ApplicationWorkbenchAdvisor_53          = Rechargement des corpus existants depuis le dossier ''{0}''.
+ApplicationWorkbenchAdvisor_54          = Conversion du corpus au format TXM 0.5 
+ApplicationWorkbenchAdvisor_55          = \ au format TXM 0.6.
+ApplicationWorkbenchAdvisor_56          = ** Échec de la conversion du corpus au format TXM 0.6
+ApplicationWorkbenchAdvisor_58          = Chargement du corpus 0.6 
+ApplicationWorkbenchAdvisor_59          = ** Erreur lors du chargement de 
+ApplicationWorkbenchAdvisor_60          = ** Erreur : le répertoire 
+ApplicationWorkbenchAdvisor_61          = \ n'est pas un corpus binaire.
+ApplicationWorkbenchAdvisor_68          = Mise en place du thème par défaut
+ApplicationWorkbenchAdvisor_69          = Erreur lors du chargement du thème : 
+ApplicationWorkbenchAdvisor_7           = Création de l'espace de travail utilisateur de TXM.
+ApplicationWorkbenchAdvisor_8           = Chemin d''installation : {0}
+ApplicationWorkbenchAdvisor_9           = ** Échec de lecture du fichier des préférences d'installation
+ApplicationWorkbenchAdvisor_init        = Démarrage de TXM {0}...
+ApplicationWorkbenchAdvisor_init_failed = ** Le démarrage de la plateforme a été interrompu, veuillez régler les préférences de TXM (dans le menu 'Fichier>Préférences')
+ApplicationWorkbenchAdvisor_ready       = Prêt.
 
-Application_4                                            = Ce fichier ne permet pas de lancer TXM. Veuillez consulter les instructions de lancement dans le manuel de TXM. 
-Application_6                                            = ** Vous devez installer la version 1.6 de Java ou supérieur avant de lancer TXM, la version courante de Java sur cette machine est {0}
+Application_4                           = Ce fichier ne permet pas de lancer TXM. Veuillez consulter les instructions de lancement dans le manuel de TXM. 
 
 AssistedQueryWidget_0 = Ouvrir l'assistant de requêtes
 
@@ -121,8 +98,6 @@
 
 Cannot_ask_simple_when_advance = Impossible d'afficher l'onglet des options simples quand l'utilisateur a sélectionné l'affichage des options avancées
 
-Commands_0 = Erreur : impossible d'initialiser les commandes
-
 ComplexSortSelector_0 = Clés de tri : 
 ComplexSortSelector_1 = Tri multiple : 
 ComplexSortSelector_2 = Tri
@@ -151,9 +126,6 @@
 ComplexSubcorpusPanel_4  = Requête 
 ComplexSubcorpusPanel_5  = Rafraîchir
 
-ComputeCoocFromLines_0 = Calcul des cooccurrents en cours
-ComputeCoocFromLines_1 = Ouverture du tableau de cooccurrents
-
 ComputeCoocMatrix_0  = Matrice mot-mot : 
 ComputeCoocMatrix_1  = Nombre de noeuds : 
 ComputeCoocMatrix_10 = Distance en mot
@@ -168,52 +140,21 @@
 ComputeCooccurrences_0 = Chargement du tableau de cooccurrents
 ComputeCooccurrences_1 = ** Impossible de calculer les cooccurrents de la sélection
 
-ComputeFrequencyList_2 = Calcul du lexique de la propriété {0} dans le corpus {1}
-
 ComputeIndexFromLines_0 = Envoyer la sélection vers la commande Index
 
 ConvertCorpus_0 = La conversion du corpus a échoué.
 
 CorporaView_0 = Corpus
-CorporaView_1 = ** Erreur : {0}
-CorporaView_2 = ** Échec de récupération de la dimension du corpus {0}
 CorporaView_3 = ** Une erreur est survenue lors du calcul de la concordance
-CorporaView_4 = Le symbole R de la matrice est : 
-CorporaView_5 = ** Une erreur est survenue lors du calcul des spécificités
-CorporaView_6 = ** Échec de l'ouverture de la fenêtre du Référenceur\	
-CorporaView_7 = ** Une erreur est survenue lors du calcul du tableau lexical
-CorporaView_9 = ** Erreur : impossible d''écrire dans {0}
 
 CorpusPage_0   = Éditions
-CorpusPage_1   = Ajouter une édition
-CorpusPage_10  = Propriétés de mot
-CorpusPage_11  = Ajouter une définition de propriété
-CorpusPage_12  = Ajouter une définition de propriété de structure
-CorpusPage_13  = Supprimer une définition de propriété
-CorpusPage_14  = Sous-corpus et partitions par défaut
-CorpusPage_15  = Ajouter un sous-corpus
 CorpusPage_16  = Ponctuations
 CorpusPage_16a = Caractères séparateurs
-CorpusPage_17  = Supprimer un sous-corpus
-CorpusPage_18  = Ajouter une partition
 CorpusPage_19  = Caractères d'élision
-CorpusPage_2   = Supprimer une édition
-CorpusPage_20  = Supprimer une partition
-CorpusPage_21  = Ajouter une requête
 CorpusPage_22  = Caractères de fin de phrase
-CorpusPage_23  = Supprimer une requête
-CorpusPage_24  = Propriétés de structure
-CorpusPage_25  = Ajouter une définition de propriété de structure
 CorpusPage_26  = Annoter le corpus
-CorpusPage_27  = Supprimer une définition de propriété de structure
-CorpusPage_28  = Utiliser seulement ces tests lors de la tokenization
-CorpusPage_29  = Ajouter un paramètre
 CorpusPage_3   = Police d'affichage
 CorpusPage_30  = Paramètres
-CorpusPage_31  = Supprimer un paramètre
-CorpusPage_32  = Ajouter un test
-CorpusPage_33  = Ajouter un paramètre
-CorpusPage_34  = Supprimer un test
 CorpusPage_35  = 1.\	
 CorpusPage_36  = Nombre de mots par page
 CorpusPage_37  = Sélectionner le répertoire des sources.
@@ -225,26 +166,20 @@
 CorpusPage_42  = 3.\	
 CorpusPage_43  = Lancer l'import du corpus.
 CorpusPage_44  = Construire l'édition
-CorpusPage_45  = UIs
 CorpusPage_46  = Le dossier des sources ne contient pas de fichier 'import.xml'. Un nouveau a été créé.
 CorpusPage_47  = Erreur lors de la création du fichier 'import.xml' 
 CorpusPage_48  = Chargement des paramètres d'import depuis le fichier : 
 CorpusPage_49  = Défaut
 CorpusPage_5   = Espaces
 CorpusPage_50  = Paramètres du module : 
-CorpusPage_51  = Seulement ces tests
 CorpusPage_52  = Sauvegarde des paramètres d'importation...
 CorpusPage_53  = Le nom du corpus est obligatoire
-CorpusPage_54  = Le nom du corpus doit contenir au moins une lettre
-CorpusPage_55  = Seulement ces tests
 CorpusPage_6   = Supprimer un paramètre
-CorpusPage_60  = OK
 CorpusPage_61  = Editer la feuille XSL...
 CorpusPage_63  = Commandes
 CorpusPage_64  = Structures de limite des contextes de concordance
 CorpusPage_65  = Impossible de sauvegarder l'import : pas de dossier source sélectionné.
 CorpusPage_66  = Impossible de commencer l'import : pas de dossier source sélectionné.
-CorpusPage_67  = Séparés par des virgules
 CorpusPage_7   = Informations générales
 CorpusPage_8   = Nom du corpus* (majuscules et pas de chiffre en début)
 CorpusPage_9   = Description - HTML (nom complet, auteur, date, license, commentaire...)
@@ -253,8 +188,6 @@
 
 CreateFolder_1 = Nouveau dossier : {0}
 
-CreateFrequencyList_8 = Chargement du tableau des fréquences
-
 CreateMacro_0 = Nom de la macro
 CreateMacro_1 = Nom de la macro
 
@@ -273,7 +206,6 @@
 CreatePartition_0        = Création d''une partition sur {0}
 CreatePartition_2        = ** Erreur : la partition n'a pas été créé
 CreatePartition_5        = Terminé : {0} items pour {1} occurrences.
-CreatePartition_55       = Terminé : {0} items pour {1} occurrences.
 CreatePartition_6        = Terminé : {0} parties
 
 CreateSubCorpus_0      = ** Erreur : le sous-corpus n'a pas été créé
@@ -293,8 +225,6 @@
 CreateSubcorpus_8        = Terminé : {0} a été créé  
 CreateSubcorpus_9        = Calcul d''un sous-corpus de {0} avec la requête <{1}>
 
-DONE = Terminé : {0}
-
 DefineReferencePattern_0 = Options d'affichage des références
 DefineReferencePattern_1 = Options d'&affichage des références
 DefineReferencePattern_2 = Options d'affichage des références
@@ -309,7 +239,6 @@
 DeleteInCorporaView_2 = ** Erreur lors de la suppression de la partition {0}
 
 DeleteLines_0 = Le tableau doit comporter au moins une ligne
-DeleteLines_1 = Sûr(e) ?
 
 DeleteObject_0  = Voulez-vous vraiment supprimer {0} ?
 DeleteObject_10 = {0} supprimé
@@ -391,7 +320,6 @@
 ExportPreferencePage_1  = Configuration de l'export
 ExportPreferencePage_18 = Colonnes séparées par
 ExportPreferencePage_19 = Séparateur de texte
-ExportPreferencePage_21 = Format de fichier d'export des graphiques par défaut
 ExportPreferencePage_3  = Encodage des fichiers d'export
 ExportPreferencePage_4  = Afficher le résultat de l'export dans un éditeur de texte
 
@@ -403,26 +331,14 @@
 ExportResult_5 = ** Impossible de lire {0}
 ExportResult_6 = ** Échec de l''exportation du résultat {0} : {1}
 
-ExportSVG_0 = Export graphique en cours...
 ExportSVG_1 = Graphique enregistré au format {1} dans le fichier {0} 
-ExportSVG_2 = Export avec le device : {0}
 ExportSVG_3 = Échec de l''export dans le fichier {0} au format {1}
 
 FAILED_TO_PARSE_OPTIONS    = ** Échec de l''analyse des options de TXM {0} : {1}
 FAILED_TO_SAVE_PREFERENCES = ** Échec de la sauvegarde des préférences
 
-FactorialMapEditor_0  = Axes:  
-FactorialMapEditor_10 = ** Erreur interne : erreur de sélection du plan de l'AFC
-FactorialMapEditor_11 = Redimensionner
-FactorialMapEditor_13 = Mise à jour du plan factoriel
-FactorialMapEditor_4  = Afficher : 
-FactorialMapEditor_5  = colonnes
-FactorialMapEditor_6  = lignes
-FactorialMapEditor_8  = Rechargement du plan factoriel
-
 FileExplorerPreferencePage_0 = Exp. Rég. des fichiers cachés
 FileExplorerPreferencePage_1 = Afficher les fichiers cachés
-FileExplorerPreferencePage_2 = Afficher les dossiers
 
 FileTreeContentProvider_1 = ** Explorateur de fichiers : expression régulière incorrecte
 FileTreeContentProvider_2 = \ ERREUR 
@@ -430,13 +346,10 @@
 FileTreeContentProvider_4 = '
 
 FrequencyListEditorInput_0 = Lexique
-FrequencyListEditorInput_1 = Pareto
-FrequencyListEditorInput_2 = Le lexique ne peut être vide
 FrequencyListEditorInput_3 = Forme
 FrequencyListEditorInput_4 = Fréquence
 FrequencyListEditorInput_5 = Chaîne de caractères
 FrequencyListEditorInput_6 = Entier
-FrequencyListEditorInput_9 = Type
 
 GenericMultiPageEditor_1 = ** Erreur interne : Impossible d''afficher la donnée {0}.
 GenericMultiPageEditor_3 = ** Erreur interne : le nombre d''éditeurs RCP ({0}) doit correspondre au nombre d''inputs ({1}).
@@ -472,8 +385,6 @@
 ImportSelectedText_4  = Le corpus {0} va être supprimé
 ImportSelectedText_6  = ** Erreur interne : impossible de trouver le projet 'default' 
 
-IndexToCooccurrence_0 = ** Erreur lors de la liaison entre l'Index et les Cooccurrences
-
 IndexToLexicalTable_0 = Impossible de créer une table lexicale à partir d'un Index créé sur un Corpus
 
 InternalCorpusView_0 = ** Erreur lors du calcul des informations du corpus
@@ -490,8 +401,6 @@
 JobsTimer_12 = h, 
 JobsTimer_13 = \ min and 
 JobsTimer_15 = Effectué en {0} ({1}).
-JobsTimer_16 = . (
-JobsTimer_17 = \ msec)
 JobsTimer_19 = Effectué en {0}.
 JobsTimer_2  = \ msec
 JobsTimer_20 = Job: 
@@ -516,49 +425,12 @@
 MacrosExplorer_1 = Créer une template de 
 
 MainPage_0  = Page principale
-MainPage_1  = Principal
-MainPage_10 = \	Pour aller au panneau suivant utiilisez l'onglet du bas.\n
-MainPage_11 = 3-\	Vous pouvez sauver les paramètres d'import à l'aide de l'icone disquette.\n
-MainPage_12 = 4-\	Pour commencer l'import, cliquez sur la fleche verte.
-MainPage_13 = parallelisme
-MainPage_14 = Corpora
-MainPage_15 = Ajouter un corpus aligné
-MainPage_17 = Entrez le nom du corpus
 MainPage_18 = Feuille XSL d'entrée
 MainPage_19 = Segmentation lexicale
 MainPage_2  = Paramètres d''import du module {0}
 MainPage_20 = Langue principale
-MainPage_22 = Supprimer un corpus
 MainPage_23 = Encodage des caractères
-MainPage_25 = Entrez le nom du corpus à supprimer
-MainPage_27 = Liens
-MainPage_28 = ** Erreur lors de la récupération de l'encodage
-MainPage_29 = Ajouter un lien
 MainPage_3  = Dossier des sources : 
-MainPage_30 = Créer un lien à partir du corpus : 
-MainPage_31 = Selectionnez 2 corpus :
-MainPage_33 = seg
-MainPage_34 = Retirer un lien
-MainPage_36 = Entrez un numéro de ligne à supprimer
-MainPage_38 = Retirer le lien n°
-MainPage_39 = Veuillez entrer un nombre valide
-MainPage_4  = Nom du corpus (base)
-MainPage_40 = Premier corpus
-MainPage_42 = Structure d'alignement
-MainPage_44 = * \n(nom de l'archive sans extension qui contiendra le corpus)
-MainPage_45 = Description
-MainPage_46 = Ajouter un 
-MainPage_49 = Le nom de corpus est obligatoire
-MainPage_5  = Ouverture...
-MainPage_50 = Rafraichir les liens
-MainPage_52 = Le dossier des sources ne contient pas de fichier import.xml
-MainPage_53 = Erreur lors de la création du fichier 'the import.xml'
-MainPage_54 = Chargement des paramètres depuis : 
-MainPage_55 = Paramètres :  
-MainPage_6  = Sauvegarde...
-MainPage_7  = Début...
-MainPage_8  = 1- Cliquez sur l'icone "dossier" pour choisir le dossier des sources\n
-MainPage_9  = 2- Si vous souhaitez ajouter des précisions d'import comme les sous-corpus et partition par défaut où les types des propriétés léxicales
 
 MergeCols_1 = Nouveau nom
 MergeCols_2 = Nom de la nouvelle colonne issue de la fusion
@@ -583,21 +455,6 @@
 
 NumberOfLines = Nombre de lignes :
 
-ONE_RESULT = Terminé : un résultat.
-
-ObjectExplorer_0  = Informations : 
-ObjectExplorer_10 = Supprimer une propriété
-ObjectExplorer_12 = Saisir le nom d'une propriété à supprimer
-ObjectExplorer_15 = Ajouter une propriété aux descendants
-ObjectExplorer_2  = Valeur
-ObjectExplorer_21 = Retirer une propriété aux descendants
-ObjectExplorer_26 = Nom
-ObjectExplorer_27 = Clé
-ObjectExplorer_3  = Nouvelle propriété
-ObjectExplorer_4  = Nom de la propriété
-ObjectExplorer_5  = Saisir le nom d'une propriété à ajouter
-ObjectExplorer_7  = nouveau nom
-
 ObjectSelectionDialog_0 = Sélecteur de valeurs
 ObjectSelectionDialog_3 = Trouvé {0} valeur(s)
 
@@ -612,21 +469,12 @@
 OpenBrowser_0 = ** Erreur lors de l'ouverture de la fiche bibliographique 
 OpenBrowser_1 = . URL
 
-OpenEdition_0 = Sélectionner une partie
-OpenEdition_1 = ** Échec de chargement de l''édition de {0}
-OpenEdition_3 = Ouverture de l''édition de {0}
-OpenEdition_5 = ** Impossible de trouver l''édition du premier texte d''identifiant {0} dans le corpus
-OpenEdition_7 = ** Impossible de trouver l'édition par défaut 
-OpenEdition_8 = ** Impossible de trouver la première page de l'édition 
-
 OpenEmptyEditor_2 = ** Bibliographie : dossier {0} introuvable
 
 OpenGraph_8 = ** Impossible d''ouvrir le graphique {0}
 
 OpenSVGGraph_0 = Graphique SVG 
 
-OpenTXMUserPreferences_0 = Paramètres par défaut
-
 OpenURI_0 = ** OpenURL : Bureau non supporté
 OpenURI_1 = ** Erreur lors de l''ouverture du fichier {0}
 
@@ -635,10 +483,7 @@
 ParametersDialog_10 = Erreur : widget sans nom : '
 ParametersDialog_11 = (* champ obligatoire)
 ParametersDialog_12 = ** Erreur :valeur non fournie : 
-ParametersDialog_13 = ** Erreur : format éronné: 
 ParametersDialog_14 = ** Erreur : déclaration du nom de l'@Option : 
-ParametersDialog_15 = ** Erreur : le bean n'est pas un object groovy.lang.Script
-ParametersDialog_17 = ** Erreur : le binding ''monitor'' (classe JobHandler) n''a pas été fait. Obtenu : {0}.
 
 PartitionComposer_0  = Structure : 
 PartitionComposer_11 = Supprimer
@@ -649,10 +494,6 @@
 PartitionComposer_8  = Titre : 
 PartitionComposer_9  = Affecter
 
-PartsSize_0  = Trier par taille
-PartsSize_10 = Dimensions de la partition {0} du corpus {1}
-PartsSize_2  = Nombre de mots par partie
-
 PasteFile_1 = ** Erreur lors de la copie  
 PasteFile_3 = ** Échec de la suppression
 PasteFile_4 = : 
@@ -690,21 +531,17 @@
 QueryAssistDialog_12 = se termine par
 QueryAssistDialog_13 = contient
 QueryAssistDialog_2  = Je recherche : 
-QueryAssistDialog_3  = mot
 QueryAssistDialog_32 = suivi de 
 QueryAssistDialog_33 = séparé d'au moins 0 mot
 QueryAssistDialog_34 = séparé d'au moins 1 mot
 QueryAssistDialog_8  = un mot dont
 
-REFRESH = Rafraîchir
-
 RefreshingCorporaView = Mise à jour de la vue des corpus...
 
 RenameFile_0 = Renommer le fichier
 RenameFile_2 = Renommage par : 
 RenameFile_3 = ** Échec du renommage 
 
-RestartTXM_0 = Rechargement des vues...
 RestartTXM_1 = Redémarrer TXM
 
 RunGroovyScript_0  = Exécution du script
@@ -726,7 +563,6 @@
 SaveAs_2 = ** Échec de la sauvegarde 
 
 ScriptPreferencePage_0 = Prochain numéro de session 
-ScriptPreferencePage_3 = Dossier &racine
 
 SetContextSize_1 = Options d'affichage des &contextes
 SetContextSize_2 = Options d'affichage des contextes
@@ -744,8 +580,6 @@
 SetSortProperty_2 = Options de tri
 SetSortProperty_3 = Options de tri
 
-ShowSelected_4 = Régler la propriété 'LANG'
-
 ShowSvgHelp_0 = Raccourcis clavier graphiques
 ShowSvgHelp_1 = \	Translation :  Clic droit + Glisser\n
 ShowSvgHelp_2 = \	Zoom +/- : Roulette OU Shift + Clic Droit + Glisser\n
@@ -761,13 +595,6 @@
 
 Submit_0 = Enregistrer
 
-TXMCqpServerWatcher_0 = Le moteur de recherche est arrêté
-TXMCqpServerWatcher_1 = Veuillez attendre que le moteur de recherche ai redémarré...
-
-TXMRServeWatcher_0 = Le moteur statistique est arrêté
-TXMRServeWatcher_1 = Veuillez attendre que le moteur statistique ai redémarré...
-TXMRServeWatcher_3 = Rechargement de la vue des corpus...
-
 TablableVector_0 = Les deux tables doivent être de même taille.
 
 TableEditor_0 = Impossible d'afficher un tableau avec les informations fourniesn: {0}
@@ -776,14 +603,9 @@
 
 TableSorter_0 = Le numéro de colonne est trop grand.
 
-TextometriePreferencePage_0  = Vérifier les mises à jour au démarrage
-TextometriePreferencePage_1  = Sauvegarde générale des préférences
-TextometriePreferencePage_14 = Préférences sauvegardées dans 
-TextometriePreferencePage_15 = Exporter dans un fichier
-TextometriePreferencePage_18 = Préférences importées depuis 
-TextometriePreferencePage_19 = TXM a besoin de fermer la fenêtre des préférences pour les mettre à jour
-TextometriePreferencePage_2  = Mises à jour automatiques
-TextometriePreferencePage_20 = Importer à partir d'un fichier
+TextometriePreferencePage_0 = Vérifier les mises à jour au démarrage
+TextometriePreferencePage_1 = Sauvegarde générale des préférences
+TextometriePreferencePage_2 = Mises à jour automatiques
 
 TextualPlansSection_milestone_label           = Elements milestones
 TextualPlansSection_milestone_tooltip         = Liste des éléments milestones à encoder dans les mots (séparés par une virgule ",")
@@ -803,17 +625,15 @@
 TxmBrowser_8  = Prochain texte
 TxmBrowser_9  = Texte précedent
 
-TxmCommand_1 = Chargement de l'extension 
-
 TxtEditor_0 = Editeur de Texte: 
 TxtEditor_1 = Encodage trouvé 
 
 UIParameterException_0 = Erreur  
 
-UserPreferencePage_0 = Page Utilisateur
 UserPreferencePage_1 = 
 UserPreferencePage_3 = Pas de confirmation pour supprimer un objet
 
+common_areYouSure                         = Sûr(e) ?
 common_beginning                          = Début
 common_displayOptions                     = Options d'affichage
 common_end                                = Fin
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java	(revision 722)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/TXMUIMessages.java	(revision 723)
@@ -243,7 +243,7 @@
 	public static String DeleteInCorporaView_1;
 	public static String DeleteInCorporaView_2;
 	public static String DeleteLines_0;
-	public static String DeleteLines_1;
+	public static String common_areYouSure;
 	public static String DeleteObject_0;
 	public static String DeleteObject_10;
 	public static String DeleteObject_3;
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 722)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/messages/messages.properties	(revision 723)
@@ -8,24 +8,20 @@
 
 AddBase_1  = New corpus: {0}.
 AddBase_10 = TXM is ready.
-AddBase_16 = ** Cannot set the 'LANG' property from the 'txmcorpus' structure:
 AddBase_17 = ** Cannot read the file {0}
 AddBase_19 = Warning
 AddBase_2  = ** Failed to load corpus  from directory: {0}.\nWe cannot find the necessary components
 AddBase_20 = The {0} corpus directory already exists. Do you want to replace it ?
 AddBase_22 = This file is not a TXM file: {0}
-AddBase_23 = The corpus {0} has no ''LANG'' set in ''txmcorpus''
 AddBase_24 = ** Failed to load corpus  {0}
 AddBase_25 = A binary corpus is a TXM file (extension .txm or .zip)
 AddBase_27 = Loading binary corpus
 AddBase_28 = Extracting binary corpus
-AddBase_29 = Extracting {0} in {1}
 AddBase_31 = ** Could not unzip binary corpus:
 AddBase_32 = Loading the corpus in the platform
 AddBase_33 = Restarting the platform
 AddBase_34 = TXM workspace is not initialized, please restart TXM.
 AddBase_4  = ** Failed to load binary corpus (null error).
-AddBase_7  = ** Failed to create binary corpus.
 
 AddProject_3 = Enter project name
 
@@ -40,100 +36,73 @@
 AdvancePreferencePage_6  = Logs
 AdvancePreferencePage_7  = Update level
 
-ApplicationWorkbenchAdvisor_0                            = Initializing platform...
-ApplicationWorkbenchAdvisor_1                            = Initialization of the platform
-ApplicationWorkbenchAdvisor_11                           = Loading sample corpora
-ApplicationWorkbenchAdvisor_12                           = ** Error: ''TXMHOME'' environment variable is set ({0}), but the directory doesn''t exist:
-ApplicationWorkbenchAdvisor_13                           = ** Could not create TXMHOME directory: {0}
-ApplicationWorkbenchAdvisor_16                           = Removing old corpus backup directory {0}.
-ApplicationWorkbenchAdvisor_17                           = .
-ApplicationWorkbenchAdvisor_18                           = Corpora backuped: {0}
-ApplicationWorkbenchAdvisor_19                           = ** Could not configure TreeTagger parameters: {0}
-ApplicationWorkbenchAdvisor_2                            = Loading TXM install preferences
-ApplicationWorkbenchAdvisor_20                           = \ in
-ApplicationWorkbenchAdvisor_21                           = Remove unused Eclipse RCP preference page
-ApplicationWorkbenchAdvisor_22                           = Processing folder:
-ApplicationWorkbenchAdvisor_23                           = \ ...
-ApplicationWorkbenchAdvisor_24                           = Failed moving old corpus from
-ApplicationWorkbenchAdvisor_25                           = Reading TXM install preferences from the {0} file
-ApplicationWorkbenchAdvisor_26                           = \ to
-ApplicationWorkbenchAdvisor_27                           = TXM workspace directory already exists ({0}). Would you like to reload its corpora in your new TXM?"
-ApplicationWorkbenchAdvisor_28                           = Workspace directory backup
-ApplicationWorkbenchAdvisor_3                            = Checking for existing workspace directory
-ApplicationWorkbenchAdvisor_30                           = Moving corpora to {0}.
-ApplicationWorkbenchAdvisor_31                           = ** Failed to create TXM default.xml workspace
-ApplicationWorkbenchAdvisor_32                           = ** TreeTagger is not installed or paths are incorrect.
-ApplicationWorkbenchAdvisor_33                           = TreeTagger paths have been set to default values
-ApplicationWorkbenchAdvisor_34                           = ** Could not create backup directory :
-ApplicationWorkbenchAdvisor_35                           = \nCorpus
-ApplicationWorkbenchAdvisor_36                           = Moving corpora
-ApplicationWorkbenchAdvisor_37                           = \ to
-ApplicationWorkbenchAdvisor_38                           = Warning: the corpus has already been backuped.
-ApplicationWorkbenchAdvisor_39                           = Missing folder in TXM install dir: {0}
-ApplicationWorkbenchAdvisor_4                            = Checking TreeTagger installation
-ApplicationWorkbenchAdvisor_40                           = Failed to copy TXM files from TXMINSTALL DIR to TXMHOME: {0}
-ApplicationWorkbenchAdvisor_41                           = Failed to set preferences: {0}
-ApplicationWorkbenchAdvisor_42                           = \ moving
-ApplicationWorkbenchAdvisor_43                           = Corpora {0} not restored, since this setup provides more recent ones.
-ApplicationWorkbenchAdvisor_43_single                    = Corpus {0} not restored, since this setup provides more recent ones.
-ApplicationWorkbenchAdvisor_44                           = ** Failed to move corpus
-ApplicationWorkbenchAdvisor_45                           = ** Failed to read file {0}
-ApplicationWorkbenchAdvisor_46                           = \nCorpus
-ApplicationWorkbenchAdvisor_47                           = ** Failed to backup existing corpora:
-ApplicationWorkbenchAdvisor_48                           = \nCorpus ''{0}'' could not be restored and are moved to ''{1}''.
-ApplicationWorkbenchAdvisor_49                           = Initializing the toolbox...
-ApplicationWorkbenchAdvisor_5                            = System Output
-ApplicationWorkbenchAdvisor_51                           = ** Failed to load corpus from file:
-ApplicationWorkbenchAdvisor_52                           = ** Failed to load sample corpora: {0}
-ApplicationWorkbenchAdvisor_53                           = Restoring corpora from folder ''{0}''
-ApplicationWorkbenchAdvisor_54                           = Converting TXM 0.5 format corpus
-ApplicationWorkbenchAdvisor_55                           = \ to TXM 0.6 format.
-ApplicationWorkbenchAdvisor_56                           = ** Failed to convert corpus to TXM 0.6 format
-ApplicationWorkbenchAdvisor_57                           = Loading converted 0.5 corpus
-ApplicationWorkbenchAdvisor_58                           = Loading 0.6 corpus
-ApplicationWorkbenchAdvisor_59                           = ** Error while loading
-ApplicationWorkbenchAdvisor_60                           = ** Error: the 
-ApplicationWorkbenchAdvisor_61                           = \ directory is not a binary corpus
-ApplicationWorkbenchAdvisor_63                           = Disable automatic update
-ApplicationWorkbenchAdvisor_64                           = ERROR: no IProvisioningAgent found
-ApplicationWorkbenchAdvisor_65                           = Failed to set auto update preference: 
-ApplicationWorkbenchAdvisor_66                           = Restoring previous preferences from
-ApplicationWorkbenchAdvisor_67                           = No previous preference file found at
-ApplicationWorkbenchAdvisor_68                           = Setting default TXM theme
-ApplicationWorkbenchAdvisor_69                           = Failed to set default CSS theme:
-ApplicationWorkbenchAdvisor_7                            = Creating TXM user working directory.
-ApplicationWorkbenchAdvisor_71                           = Loading sample corpora.
-ApplicationWorkbenchAdvisor_72                           = Start job: load install preferences
-ApplicationWorkbenchAdvisor_73                           = Start job: check TXMHOME
-ApplicationWorkbenchAdvisor_74                           = Start job: initialize UI
-ApplicationWorkbenchAdvisor_75                           = Error while loading TXM: 
-ApplicationWorkbenchAdvisor_76                           = Automatic update
-ApplicationWorkbenchAdvisor_77                           = Starting update fetch
-ApplicationWorkbenchAdvisor_78                           = Error while updating TXM: 
-ApplicationWorkbenchAdvisor_79                           = Error while updating TXM: no handler service found
-ApplicationWorkbenchAdvisor_8                            = Install path: {0}
-ApplicationWorkbenchAdvisor_86                           = Initializing Toolbox
-ApplicationWorkbenchAdvisor_87                           = Initializing the SWT Charts Components provider
-ApplicationWorkbenchAdvisor_88                           = Loading views
-ApplicationWorkbenchAdvisor_89                           = Missing RCP preference has been set from TBX preference: 
-ApplicationWorkbenchAdvisor_9                            = ** Could not read install preferences file
-ApplicationWorkbenchAdvisor_PROGRESS_BAR_LOADING_CORPORA = Loading corpora
-ApplicationWorkbenchAdvisor_init                         = Starting up {0}...
-ApplicationWorkbenchAdvisor_init_failed                  = ** Startup failed, please check TXM preferences (in the 'File>Preferences' menu) or contact txm-users mailing list (menu: Help>
-ApplicationWorkbenchAdvisor_ready                        = Ready.
+ApplicationWorkbenchAdvisor_0           = Initializing platform...
+ApplicationWorkbenchAdvisor_1           = Initialization of the platform
+ApplicationWorkbenchAdvisor_11          = Loading sample corpora
+ApplicationWorkbenchAdvisor_12          = ** Error: ''TXMHOME'' environment variable is set ({0}), but the directory doesn''t exist:
+ApplicationWorkbenchAdvisor_13          = ** Could not create TXMHOME directory: {0}
+ApplicationWorkbenchAdvisor_16          = Removing old corpus backup directory {0}.
+ApplicationWorkbenchAdvisor_18          = Corpora backuped: {0}
+ApplicationWorkbenchAdvisor_2           = Loading TXM install preferences
+ApplicationWorkbenchAdvisor_21          = Remove unused Eclipse RCP preference page
+ApplicationWorkbenchAdvisor_22          = Processing folder:
+ApplicationWorkbenchAdvisor_23          = \ ...
+ApplicationWorkbenchAdvisor_24          = Failed moving old corpus from
+ApplicationWorkbenchAdvisor_26          = \ to
+ApplicationWorkbenchAdvisor_27          = TXM workspace directory already exists ({0}). Would you like to reload its corpora in your new TXM?"
+ApplicationWorkbenchAdvisor_28          = Workspace directory backup
+ApplicationWorkbenchAdvisor_3           = Checking for existing workspace directory
+ApplicationWorkbenchAdvisor_30          = Moving corpora to {0}.
+ApplicationWorkbenchAdvisor_31          = ** Failed to create TXM default.xml workspace
+ApplicationWorkbenchAdvisor_34          = ** Could not create backup directory :
+ApplicationWorkbenchAdvisor_37          = \ to
+ApplicationWorkbenchAdvisor_39          = Missing folder in TXM install dir: {0}
+ApplicationWorkbenchAdvisor_40          = Failed to copy TXM files from TXMINSTALL DIR to TXMHOME: {0}
+ApplicationWorkbenchAdvisor_41          = Failed to set preferences: {0}
+ApplicationWorkbenchAdvisor_43          = Corpora {0} not restored, since this setup provides more recent ones.
+ApplicationWorkbenchAdvisor_43_single   = Corpus {0} not restored, since this setup provides more recent ones.
+ApplicationWorkbenchAdvisor_44          = ** Failed to move corpus
+ApplicationWorkbenchAdvisor_45          = ** Failed to read file {0}
+ApplicationWorkbenchAdvisor_47          = ** Failed to backup existing corpora:
+ApplicationWorkbenchAdvisor_48          = \nCorpus ''{0}'' could not be restored and are moved to ''{1}''.
+ApplicationWorkbenchAdvisor_5           = System Output
+ApplicationWorkbenchAdvisor_51          = ** Failed to load corpus from file:
+ApplicationWorkbenchAdvisor_52          = ** Failed to load sample corpora: {0}
+ApplicationWorkbenchAdvisor_53          = Restoring corpora from folder ''{0}''
+ApplicationWorkbenchAdvisor_54          = Converting TXM 0.5 format corpus
+ApplicationWorkbenchAdvisor_55          = \ to TXM 0.6 format.
+ApplicationWorkbenchAdvisor_56          = ** Failed to convert corpus to TXM 0.6 format
+ApplicationWorkbenchAdvisor_58          = Loading 0.6 corpus
+ApplicationWorkbenchAdvisor_59          = ** Error while loading
+ApplicationWorkbenchAdvisor_60          = ** Error: the 
+ApplicationWorkbenchAdvisor_61          = \ directory is not a binary corpus
+ApplicationWorkbenchAdvisor_68          = Setting default TXM theme
+ApplicationWorkbenchAdvisor_69          = Failed to set default CSS theme:
+ApplicationWorkbenchAdvisor_7           = Creating TXM user working directory.
+ApplicationWorkbenchAdvisor_72          = Start job: load install preferences
+ApplicationWorkbenchAdvisor_73          = Start job: check TXMHOME
+ApplicationWorkbenchAdvisor_74          = Start job: initialize UI
+ApplicationWorkbenchAdvisor_75          = Error while loading TXM: 
+ApplicationWorkbenchAdvisor_77          = Starting update fetch
+ApplicationWorkbenchAdvisor_78          = Error while updating TXM: 
+ApplicationWorkbenchAdvisor_79          = Error while updating TXM: no handler service found
+ApplicationWorkbenchAdvisor_8           = Install path: {0}
+ApplicationWorkbenchAdvisor_88          = Loading views
+ApplicationWorkbenchAdvisor_9           = ** Could not read install preferences file
+ApplicationWorkbenchAdvisor_init        = Starting up {0}...
+ApplicationWorkbenchAdvisor_init_failed = ** Startup failed, please check TXM preferences (in the 'File>Preferences' menu) or contact txm-users mailing list (menu: Help>
+ApplicationWorkbenchAdvisor_ready       = Ready.
 
 ApplicationWorkbenchWindowAdvisor_0 = Remove unnecessary e4 elements
 ApplicationWorkbenchWindowAdvisor_9 = Setting status line and configuring action sets
 
-Application_0                                            = Args: 
-Application_1                                            = '-log' option detected
-Application_10                                           = Could not start proxy configuration: 
-Application_11                                           = Setting proxy for Mac OS X: {0}
-Application_2                                            = Force loggin...
-Application_4                                            = This file is not meant to run TXM. Please consult TXM user manual.
-Application_6                                            = ** You need to install Java version 1.6 at least before launching TXM, your actual Java version is {0}
-Application_8                                            = Lock RCP workspace
-Application_9                                            = Activate Proxy Service
+Application_0                           = Args: 
+Application_1                           = '-log' option detected
+Application_10                          = Could not start proxy configuration: 
+Application_2                           = Force loggin...
+Application_4                           = This file is not meant to run TXM. Please consult TXM user manual.
+Application_8                           = Lock RCP workspace
+Application_9                           = Activate Proxy Service
 
 AssistedQueryWidget_0 = Open the query assistant
 
@@ -150,8 +119,6 @@
 CleanPerspective_1 = Error while calling 'org.eclipse.ui.window.resetPerspective': 
 CleanPerspective_2 = Error while cleaning perspective: no handler service found
 
-Commands_0 = Error: failed to initialize Commands
-
 ComplexSortSelector_0 = sort keys:
 ComplexSortSelector_1 = Complex sort:
 ComplexSortSelector_2 = Sort
@@ -199,45 +166,16 @@
 ConvertCorpus_0 = Corpus conversion failed.
 
 CorporaView_0 = Corpus
-CorporaView_1 = Error: {0}
-CorporaView_2 = Can''t retrieve {0} corpus size
 CorporaView_3 = Error while computing the concordance:
-CorporaView_4 = CoocMatrix symbol is:
-CorporaView_5 = Error while computing specificities:
-CorporaView_6 = Failed to open referencer editor:
-CorporaView_7 = Error while computing the lexical table:
-CorporaView_9 = Error: {0} is not writeable
 
 CorpusPage_0   = Editions
-CorpusPage_1   = Add an edition
-CorpusPage_10  = Word properties
-CorpusPage_11  = Add a property definition
-CorpusPage_12  = Add a structural unit definition
-CorpusPage_13  = Remove a property definition
-CorpusPage_14  = Pre build subcorpora and partitions
-CorpusPage_15  = Add a default sub-corpus
 CorpusPage_16  = Punctuations
 CorpusPage_16a = Separator characters
-CorpusPage_17  = Remove a subcorpus
-CorpusPage_18  = Add a default partition
 CorpusPage_19  = Elision characters
-CorpusPage_2   = Remove an edition
-CorpusPage_20  = Remove a partition
-CorpusPage_21  = Add a query
 CorpusPage_22  = End of sentence characters
-CorpusPage_23  = Remove selected query
-CorpusPage_24  = Structures properties
-CorpusPage_25  = Add a property
 CorpusPage_26  = Annotate the corpus
-CorpusPage_27  = Remove a structural unit definition
-CorpusPage_28  = Use only those tokenizer tests
-CorpusPage_29  = Add a parameter
 CorpusPage_3   = Display font
 CorpusPage_30  = Parameters
-CorpusPage_31  = Remove a parameter
-CorpusPage_32  = Add a tokenizer test
-CorpusPage_33  = Add a tokenizer parameter
-CorpusPage_34  = Remove a test
 CorpusPage_35  = 1.\	
 CorpusPage_36  = Words per page
 CorpusPage_37  = Select the source directory.
@@ -249,30 +187,23 @@
 CorpusPage_42  = 3.\	
 CorpusPage_43  = Start corpus import.
 CorpusPage_44  = Build edition
-CorpusPage_45  = UIs
 CorpusPage_46  = The source directory does not contain import.xml. Creating a new one.
 CorpusPage_47  = Error while creating 'import.xml' file
 CorpusPage_48  = Load import parameters from file:
 CorpusPage_49  = Default
 CorpusPage_5   = Spaces
 CorpusPage_50  = module UI parameters:
-CorpusPage_51  = Only these tests
 CorpusPage_52  = Saving import parameters...
 CorpusPage_53  = Corpus name is mandatory
-CorpusPage_54  = Corpus name must contains at least one letter
-CorpusPage_55  = onlyThoseTests
 CorpusPage_57  = Font name
 CorpusPage_6   = Delete parameter
-CorpusPage_60  = OK
 CorpusPage_61  = Edit XSL stylesheet...
 CorpusPage_63  = Commands
 CorpusPage_64  = Concordance context structure limits
 CorpusPage_65  = Cannot save import configuration. No source folder selected.
 CorpusPage_66  = Cannot start import configuration. No source folder selected.
-CorpusPage_67  = comma separated
 CorpusPage_7   = General informations
 CorpusPage_8   = Corpus name* (only caps and no digit at beginning)
-CorpusPage_80  = Struct limits: 
 CorpusPage_9   = Description - HTML (complete name, author, date, license, comment...)
 CorpusPage_90  = Error: the selected file is not a directory: 
 CorpusPage_91  = Error: can not read the selected file: 
@@ -283,8 +214,6 @@
 
 CreateFolder_1 = New folder: {0}
 
-CreateFrequencyList_8 = Loading frequencies results...
-
 CreateMacro_0 = Macro name
 CreateMacro_1 = Please write the macro name
 
@@ -304,7 +233,6 @@
 CreatePartition_0        = Creating a new partition with {0}
 CreatePartition_2        = ** Error: the partition was not created
 CreatePartition_5        = Done: {0} items
-CreatePartition_55       = Done: {0} items for {1} occurrences
 CreatePartition_6        = Done: {0} parts
 
 CreateSubCorpus_0      = ** Error: subcorpus was not created
@@ -326,8 +254,6 @@
 CreateSubcorpus_8        = Done: {0} created
 CreateSubcorpus_9        = Compute SubCorpus on {0}. Query: {1}
 
-DONE = Done: {0}
-
 DefineReferencePattern_0 = References display options
 DefineReferencePattern_1 = References &display options
 DefineReferencePattern_2 = References display options
@@ -342,10 +268,8 @@
 DeleteInCorporaView_2 = ** Failed to delete partition {0}
 
 DeleteLines_0 = The table must contain at least one line
-DeleteLines_1 = Are you sure ?
 
 DeleteObject_0  = Deleting {0}, continue ?
-DeleteObject_1  = Failed to remove 
 DeleteObject_10 = Deleted: {0}
 DeleteObject_3  = Error: delete() returned 'false'
 DeleteObject_4  = Error while deleting {0}: {1}
@@ -432,7 +356,6 @@
 ExportPreferencePage_1  = Export settings
 ExportPreferencePage_18 = Columns separated by
 ExportPreferencePage_19 = Text separator
-ExportPreferencePage_21 = Default charts export file format
 ExportPreferencePage_3  = Export file encoding
 ExportPreferencePage_4  = Show export result in the text editor
 
@@ -444,26 +367,14 @@
 ExportResult_5 = ** Impossible to read {0}
 ExportResult_6 = ** Failed to export result {0}: {1}
 
-ExportSVG_0 = Exporting...
 ExportSVG_1 = {1} file saved in {0}
-ExportSVG_2 = Exporting with device: {0}
 ExportSVG_3 = Failed to export file {0} with device {1}
 
 FAILED_TO_PARSE_OPTIONS    = Failed to parse TXM options {0}: {1}
 FAILED_TO_SAVE_PREFERENCES = Failed to save preferences:
 
-FactorialMapEditor_0  = Axes:
-FactorialMapEditor_10 = ** Internal error: CA plan selection error
-FactorialMapEditor_11 = Resize
-FactorialMapEditor_13 = Reseting factorial map
-FactorialMapEditor_4  = Show:
-FactorialMapEditor_5  = columns
-FactorialMapEditor_6  = lines
-FactorialMapEditor_8  = Reloading factorial map
-
 FileExplorerPreferencePage_0 = Regexp pattern to hide files
 FileExplorerPreferencePage_1 = Show hidden files
-FileExplorerPreferencePage_2 = Show folders
 
 FileTreeContentProvider_1 = ** File Explorer: Incorrect pattern
 FileTreeContentProvider_2 = \ ERROR
@@ -473,13 +384,10 @@
 FixUpdateHandler_0 = Ready to show Update UI
 
 FrequencyListEditorInput_0 = Lexicon
-FrequencyListEditorInput_1 = Pareto
-FrequencyListEditorInput_2 = Lexicon cannot be null
 FrequencyListEditorInput_3 = Form
 FrequencyListEditorInput_4 = Frequency
 FrequencyListEditorInput_5 = String
 FrequencyListEditorInput_6 = Integer
-FrequencyListEditorInput_9 = Type
 
 GenericMultiPageEditor_1 = The input {0} cannot be displayed.
 GenericMultiPageEditor_3 = The number of editors ({0}) and number of inputs ({1}) must be equal.
@@ -519,8 +427,6 @@
 ImportSelectedText_4  = The corpus  and the corpus {0} will be deleted
 ImportSelectedText_6  = ** Internal error: ImportSelectedText failed to get default project
 
-IndexToCooccurrence_0 = Error while linking Index to Cooccurences
-
 IndexToLexicalTable_0 = Cannot create a Lexical Table from an Index created with a Corpus (more than one column is needed)
 
 InternalCorpusView_0 = Error while computing corpus summary
@@ -537,8 +443,6 @@
 JobsTimer_12 = h,
 JobsTimer_13 = \ min and
 JobsTimer_15 = Done in {0} ({1}).
-JobsTimer_16 = . (
-JobsTimer_17 = \ msec)
 JobsTimer_19 = Done in {0}.
 JobsTimer_2  = \ msec
 JobsTimer_20 = Job:
@@ -556,73 +460,27 @@
 
 LineLabelProvider_1 = Should not happen
 
-LoadBinaryCorpus_0  = : OK
-LoadBinaryCorpus_1  = Failed to remove old backup of corpus: 
 LoadBinaryCorpus_10 = The new binary corpus '
 LoadBinaryCorpus_11 = ' could not be loaded.
 LoadBinaryCorpus_12 = Restoring previous corpus...
 LoadBinaryCorpus_13 = Failed to delete corrupted corpus: 
 LoadBinaryCorpus_14 = . Could not restore 
 LoadBinaryCorpus_15 = Failed to restore backup corpus: 
-LoadBinaryCorpus_2  = Failed to backup the corpus to: 
-LoadBinaryCorpus_3  = : FAIL (reason=
 LoadBinaryCorpus_4  = Failed to get the new binary corpus
-LoadBinaryCorpus_5  = No corpus found in the binary corpus.
-LoadBinaryCorpus_6  = Testing the new CQP corpus: 
-LoadBinaryCorpus_7  = )
 
 LocalePreferencePage_1 = Configuration of the user interface language
 LocalePreferencePage_2 = User interface language
 
-MacroExplorer_2 = REFRESH the Tree
-
 MacrosExplorer_0 = New macro
 MacrosExplorer_1 = Create a new macro from a template
 
 MainPage_0  = MainPage
-MainPage_1  = Main
-MainPage_10 = \	go to the next panel, using the tabs below\n
-MainPage_11 = 3-\	You can save the import parameters with the 'floppy' icon\n
-MainPage_12 = 4-\	To start the import click on the 'green arrow' icon.
-MainPage_13 = parallel
-MainPage_14 = Corpora
-MainPage_15 = Add an aligned corpus
-MainPage_17 = Enter the corpus name
 MainPage_18 = Front XSL
 MainPage_19 = Lexical Segmentation
 MainPage_2  = Import parameters of {0}
 MainPage_20 = Main language
-MainPage_22 = Remove a corpus
 MainPage_23 = Source characters encoding
-MainPage_25 = Enter the corpus name to remove
-MainPage_27 = Links
-MainPage_28 = Error while getting encoding
-MainPage_29 = Add a link
 MainPage_3  = Corpus  infos
-MainPage_30 = create new link from corpora:
-MainPage_31 = Select 2 corpus:
-MainPage_33 = seg
-MainPage_34 = Remove a link
-MainPage_36 = Enter the line number to remove
-MainPage_38 = remove link nÂ°
-MainPage_39 = Please enter a valid linenumber
-MainPage_4  = Corpus  name
-MainPage_40 = First corpus
-MainPage_42 = Aligned structure
-MainPage_44 = * \n(archive name without extension)
-MainPage_45 = Description
-MainPage_46 = AddCorpus: NEW CORPUS
-MainPage_49 = base name is mandatory
-MainPage_5  = Opening...
-MainPage_50 = refresh links table
-MainPage_52 = The source directory does not contain import.xml
-MainPage_53 = Sorry, 'the import.xml' file could not been created
-MainPage_54 = Load params from:
-MainPage_55 = Params:
-MainPage_6  = Saving...
-MainPage_7  = Starting...
-MainPage_8  = 1-\	Click on the 'folder' icon to choose the source directory\n
-MainPage_9  = 2-\	If you want to add details such as default subcorpus, exemple queries or types of word properties,\n
 
 MergeCols_1 = New name
 MergeCols_2 = Edit the name of the new column created by the merged columns
@@ -647,21 +505,6 @@
 
 NumberOfLines = Number of lines:
 
-ONE_RESULT = Done: one result.
-
-ObjectExplorer_0  = Informations:
-ObjectExplorer_10 = Remove property
-ObjectExplorer_12 = Enter a property name to remove
-ObjectExplorer_15 = add a new property to all children
-ObjectExplorer_2  = Value
-ObjectExplorer_21 = remove a property from the children
-ObjectExplorer_26 = Name
-ObjectExplorer_27 = Key
-ObjectExplorer_3  = New property
-ObjectExplorer_4  = Property name
-ObjectExplorer_5  = Enter a property name to add
-ObjectExplorer_7  = new name
-
 ObjectSelectionDialog_0 = Value selector
 ObjectSelectionDialog_3 = Found {0} value(s)
 
@@ -676,22 +519,12 @@
 OpenBrowser_0 = ** Error while opening bibliographic record
 OpenBrowser_1 = . URL
 
-OpenEdition_0 = Select a part
-OpenEdition_1 = Failed to load edition of {0}
-OpenEdition_2 = No main corpus for corpus: 
-OpenEdition_3 = Opening edition of {0}
-OpenEdition_5 = ** Could not find first text with {0} ID in the corpus
-OpenEdition_7 = ** Failed to find default edition of text
-OpenEdition_8 = ** Failed to find first page of edition
-
 OpenEmptyEditor_2 = Could not find directory: {0}
 
 OpenGraph_8 = Can''t open graphic {0}
 
 OpenSVGGraph_0 = SVG Graphic
 
-OpenTXMUserPreferences_0 = Default settings
-
 OpenURI_0 = ** Desktop is not supported (fatal)
 OpenURI_1 = ** Error while opening file {0}
 
@@ -700,10 +533,7 @@
 ParametersDialog_10 = Unknowed widget name: '
 ParametersDialog_11 = (* mandatory fields)
 ParametersDialog_12 = ** Error: missing value:
-ParametersDialog_13 = ** Error: format error:
 ParametersDialog_14 = Error in @Option name declaration:
-ParametersDialog_15 = Error: the bean is not a groovy.lang.Script object
-ParametersDialog_17 = Error: the ''monitor'' (JobHandler class) binding is missing. Got: {0}.
 
 PartitionComposer_0  = Structure:
 PartitionComposer_1  = Error: this partition has no part.
@@ -715,10 +545,6 @@
 PartitionComposer_8  = Title:
 PartitionComposer_9  = Assign
 
-PartsSize_0  = StatEngine is not ready. Canceling command.
-PartsSize_10 = Dimensions of partition {0} of corpus {1}
-PartsSize_2  = Number of words per part
-
 PasteFile_1 = ** Failed to copy
 PasteFile_3 = ** Failed to delete
 PasteFile_4 = :
@@ -756,21 +582,17 @@
 QueryAssistDialog_12 = ends with
 QueryAssistDialog_13 = contains
 QueryAssistDialog_2  = I'm looking for:
-QueryAssistDialog_3  = I''m looking for {0} words
 QueryAssistDialog_32 = followed by
 QueryAssistDialog_33 = separated by at least 0 word
 QueryAssistDialog_34 = separated by at least 1 word
 QueryAssistDialog_8  = a word with its property
 
-REFRESH = Refresh
-
 RefreshingCorporaView = Refreshing corpora...
 
 RenameFile_0 = Rename file
 RenameFile_2 = renaming by:
 RenameFile_3 = ** Failed to rename
 
-RestartTXM_0 = Reloading views...
 RestartTXM_1 = Restart TXM
 
 RunGroovyScript_0  = Script execution
@@ -795,7 +617,6 @@
 
 ScriptPreferencePage_0 = Next session number
 ScriptPreferencePage_1 = Save script before execution
-ScriptPreferencePage_3 = &Root folder
 
 SetContextSize_1 = &Contexts display options
 SetContextSize_2 = Contexts display options
@@ -814,7 +635,6 @@
 SetSortProperty_3 = Sort options
 
 ShowSelected_0 = File: 
-ShowSelected_4 = Set the 'LANG' property
 
 ShowSvgHelp_0 = Graphics keyboard shortcuts
 ShowSvgHelp_1 = \	Pan: Right Mouse + Drag\n
@@ -835,13 +655,6 @@
 
 SummaryView_0 = No default edition page found for element: 
 
-TXMCqpServerWatcher_0 = CQP server is down
-TXMCqpServerWatcher_1 = Please wait for searchengine to restart...
-
-TXMRServeWatcher_0 = StatEngine server is down
-TXMRServeWatcher_1 = Please wait for StatEngine to restart...
-TXMRServeWatcher_3 = Reloading corpora view...
-
 TablableVector_0 = The two arrays must have the same size.
 
 TableEditor_0 = Can not create a table with the provided information: {0}
@@ -851,14 +664,9 @@
 
 TableSorter_0 = Column index is too big.
 
-TextometriePreferencePage_0  = Check for updates at startup
-TextometriePreferencePage_1  = General preferences backup
-TextometriePreferencePage_14 = Preferences saved in
-TextometriePreferencePage_15 = Export to file
-TextometriePreferencePage_18 = Preferences imported from
-TextometriePreferencePage_19 = TXM needs to close the preferences window to update them
-TextometriePreferencePage_2  = Automatic updates
-TextometriePreferencePage_20 = Import from a file
+TextometriePreferencePage_0 = Check for updates at startup
+TextometriePreferencePage_1 = General preferences backup
+TextometriePreferencePage_2 = Automatic updates
 
 TextualPlansSection_milestone_label           = Milestone elements
 TextualPlansSection_milestone_tooltip         = List of milestone elements, separated by ',' (comma).
@@ -883,15 +691,14 @@
 
 UIParameterException_0 = Error
 
-UserPreferencePage_0 = User page
 UserPreferencePage_1 = Recompute automatically
 UserPreferencePage_3 = Do not confirm to delete an object
 
+common_areYouSure                         = Are you sure ?
 common_beginning                          = Beginning
 common_displayOptions                     = Display options
 common_end                                = End
 common_enterRegularExpressionOfYourSearch = Enter the regular expression of your search
-common_loadingExtension                   = Loading extension
 common_refresh                            = Refresh
 
 error_invalidRegularExpression = Invalid regular expression: {0}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java	(revision 722)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/TXMEditor.java	(revision 723)
@@ -46,12 +46,16 @@
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.TXMWindows;
 import org.txm.rcp.swt.GLComposite;
+import org.txm.rcp.swt.widget.AssistedQueryWidget;
 import org.txm.rcp.swt.widget.FloatSpinner;
 import org.txm.rcp.swt.widget.NewNavigationWidget;
 import org.txm.rcp.swt.widget.PropertiesSelector;
+import org.txm.rcp.swt.widget.QueryWidget;
 import org.txm.rcp.utils.JobHandler;
 import org.txm.rcp.views.corpora.CorporaView;
 import org.txm.rcp.views.debug.TXMResultDebugView;
+import org.txm.searchengine.cqp.corpus.Property;
+import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.utils.logger.Log;
 
 /**
@@ -644,13 +648,14 @@
 
 	/**
 	 * Updates the editor fields from result and declared parameters annotations.
-	 * <p>
 	 * Manages these widgets at this moment: 
 	 * ToolItem+Boolean, 
 	 * FloatSpinner+Float, 
 	 * Spinner+Integer, 
 	 * Text+String, 
-	 * Button+Boolean, Viewer+any, PropertiesSelector+<P extends Property>, NewNavigationWidget+Integer.
+	 * Button+Boolean, Viewer+any, PropertiesSelector+<P extends Property>, NewNavigationWidget+Integer,
+	 * AssistedQueryWidget, QueryWidget
+	 * 
 	 */
 	public void autoUpdateEditorFieldsFromResult(boolean update)	{
 
@@ -695,11 +700,24 @@
 					}
 				}
 				else if(object instanceof PropertiesSelector)	{
-					((PropertiesSelector)object).setSelectedProperties((List) value); 
+					// multiple
+					if(value instanceof List)	{
+						((PropertiesSelector)object).setSelectedProperties((List) value);	
+					}
+					// single
+					else	{
+						((PropertiesSelector)object).setSelectedProperty((Property) value);
+					}
 				}
 				else if(object instanceof NewNavigationWidget)	{
 					((NewNavigationWidget)object).setCurrentPosition((Integer) value); 
 				}
+				else if(object instanceof AssistedQueryWidget)	{
+					((AssistedQueryWidget)object).setText(((Query)value).getQueryString()); 
+				}
+				else if(object instanceof QueryWidget)	{
+					((QueryWidget)object).setText(((Query)value).getQueryString()); 
+				}
 				else	{
 					f.set(this, value);
 				}
@@ -731,7 +749,7 @@
 
 	/**
 	 * Updates the result parameters from the editor declared parameters annotations.
-	 * Manages these widgets at this moment: ToolItem, FloatSpinner, Spinner, Text, Button, Viewer, PropertiesSelector, NewNavigationWidget.
+	 * Manages these widgets at this moment: ToolItem, FloatSpinner, Spinner, Text, Button, Viewer, PropertiesSelector, NewNavigationWidget, AssistedQueryWidget, QueryWidget.
 	 */
 	public void autoUpdateResultFromEditorParameters()	{
 
@@ -776,11 +794,27 @@
 					}
 				}
 				else if(object instanceof PropertiesSelector)	{
-					value = new ArrayList(((PropertiesSelector)object).getSelectedProperties()); // need to copy the list otherwise the properties selector modify the result itself
+					Field resultField = this.getResult().getField(parameter.key());
+					if(resultField != null)	{
+						// multiple
+						if (resultField.getType().isAssignableFrom(List.class))	{
+							value = new ArrayList(((PropertiesSelector)object).getSelectedProperties()); // need to copy the list otherwise the properties selector modify the result itself through reference	
+						}
+						// single
+						else	{
+							value = ((PropertiesSelector)object).getSelectedProperties().get(0);
+						}
+					}
 				}
 				else if(object instanceof NewNavigationWidget)	{
 					value = ((NewNavigationWidget)object).getCurrentPosition(); 
 				}
+				else if(object instanceof AssistedQueryWidget)	{
+					value = ((AssistedQueryWidget)object).getQuery(); 
+				}
+				else if(object instanceof QueryWidget)	{
+					value = ((QueryWidget)object).getQuery(); 
+				}
 				else	{
 					value = object;
 				}
@@ -791,6 +825,7 @@
 			}
 			catch (IllegalArgumentException e) {
 				// TODO Auto-generated catch block
+				System.err.println("TXMEditor.autoUpdateResultFromEditorParameters(): Error with field " + parameter.key());
 				e.printStackTrace();
 			}
 			catch (IllegalAccessException e) {
@@ -876,7 +911,7 @@
 	 * Creates and populates a popup menu and attaches it to the specified composite.
 	 * The menu will be accessible through the RCP extension in plugin.xml by its id, eg. "popup:" + menuId.
 	 * 
-	 *  The menu ID will be the composite class fullpath
+	 *  The menu ID will be the editor/workbench part ID.
 	 *  
 	 * @param composite
 	 * @param partSite not null
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/listeners/ComputeListener.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/listeners/ComputeListener.java	(revision 0)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/listeners/ComputeListener.java	(revision 723)
@@ -0,0 +1,33 @@
+package org.txm.rcp.editors.listeners;
+
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.txm.core.preferences.TXMPreferences;
+import org.txm.rcp.editors.TXMEditor;
+import org.txm.rcp.preferences.RCPPreferences;
+
+/**
+ * Generic listener that calls TXMEditor.compute() on handleEvent().
+ * 
+ * @author sjacquot
+ *
+ */
+public class ComputeListener extends BaseAbstractComputeListener implements Listener {
+
+	
+	/**
+	 * 
+	 * @param editor
+	 */
+	public ComputeListener(TXMEditor editor) {
+		super(editor);
+	}
+
+	@Override
+	public void handleEvent(Event event) {
+		if (TXMPreferences.getBoolean(RCPPreferences.AUTO_UPDATE_EDITOR, RCPPreferences.PREFERENCES_NODE)) {
+			this.editor.compute(false);
+		}
+	}
+
+}

Property changes on: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/listeners/ComputeListener.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/listeners/ComputeSelectionListener.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/listeners/ComputeSelectionListener.java	(revision 722)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/listeners/ComputeSelectionListener.java	(revision 723)
@@ -7,8 +7,10 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
+import org.txm.core.preferences.TXMPreferences;
 import org.txm.core.results.TXMResult;
 import org.txm.rcp.editors.TXMEditor;
+import org.txm.rcp.preferences.RCPPreferences;
 
 /**
  * A selection listener that can be added to editors widgets and that call the TXMEditor.compute() method.
@@ -38,7 +40,8 @@
 	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		// to skip programmatically setSelection() calls
-		if(!mustIgnoreEvent(event))	{
+		if(!mustIgnoreEvent(event)
+				&& TXMPreferences.getBoolean(RCPPreferences.AUTO_UPDATE_EDITOR, RCPPreferences.PREFERENCES_NODE))	{
 			this.editor.compute(false);
 		}
 	}
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/listeners/ComputeKeyListener.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/listeners/ComputeKeyListener.java	(revision 722)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/listeners/ComputeKeyListener.java	(revision 723)
@@ -10,7 +10,7 @@
 import org.txm.rcp.editors.TXMEditor;
 
 /**
- * Key listener that call TXMEditor.compute() when the Enter key is pressed.
+ * Key listener that calls TXMEditor.compute() when the Enter key is pressed.
  * 
  * @author mdecorde
  * @author sjacquot
Index: tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java
===================================================================
--- tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java	(revision 722)
+++ tmp/org.txm.rcp/src/main/java/org/txm/rcp/editors/SVGGraphicEditor.java	(revision 723)
@@ -38,7 +38,6 @@
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
-import org.txm.core.results.TXMResult;
 import org.txm.rcp.messages.TXMUIMessages;
 import org.txm.rcp.svg.SVGComposite;
 
Index: tmp/org.txm.rcp/rcpapplication.product
===================================================================
--- tmp/org.txm.rcp/rcpapplication.product	(revision 722)
+++ tmp/org.txm.rcp/rcpapplication.product	(revision 723)
@@ -79,7 +79,6 @@
       </win>
    </launcher>
 
-
    <vm>
       <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</linux>
       <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</macos>
@@ -565,6 +564,8 @@
       <feature id="org.eclipse.equinox.p2.user.ui"/>
       <feature id="org.eclipse.equinox.p2.extras.feature"/>
       <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
+      <feature id="org.txm.statsengine.r.feature"/>
+      <feature id="org.txm.searchengine.cqp.feature"/>
    </features>
 
    <configurations>
Index: tmp/org.txm.rcp/plugin.xml
===================================================================
--- tmp/org.txm.rcp/plugin.xml	(revision 722)
+++ tmp/org.txm.rcp/plugin.xml	(revision 723)
@@ -21,12 +21,6 @@
             id="org.txm.rcp.perspective.TXMPerspective"
             name="%perspective.name">
       </perspective>
-      <perspective
-            class="org.txm.rcp.perspective.RPerspective"
-            icon="icons/logo/Rcran.png"
-            id="org.txm.rcp.perspective.RPerspective"
-            name="%perspective.name.0">
-      </perspective>
    </extension>
    <extension
          id="product"
@@ -1372,7 +1366,7 @@
                   visible="false">
             </separator>
             <command
-                  commandId="org.txm.rcp.commands.base.DeleteObject?after=org.txm.information.rcp.handlers.ComputeInformation"
+                  commandId="org.txm.rcp.handlers.results.DeleteObject?after=org.txm.information.rcp.handlers.ComputeInformation"
                   icon="icons/functions/Delete.png"
                   style="push"
                   tooltip="%command.tooltip.33">
@@ -1989,7 +1983,7 @@
             </separator>
             
             <command
-                  commandId="org.txm.rcp.commands.base.DeleteObject"
+                  commandId="org.txm.rcp.handlers.results.DeleteObject"
                   icon="icons/functions/Delete.png"
                   style="push">
                <visibleWhen
@@ -2069,7 +2063,7 @@
                name="org.txm.rcp.separator1">
          </separator>
          <command
-               commandId="org.txm.rcp.commands.base.DeleteInCorpora"
+               commandId="org.txm.rcp.handlers.results.DeleteObject"
                icon="icons/functions/Delete.png"
                label="%command.label.65"
                style="push"
@@ -2152,7 +2146,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="org.txm.rcp.commands.base.DeleteInCorpora"
+               commandId="org.txm.rcp.handlers.results.DeleteObject"
                icon="icons/functions/Delete.png"
                label="%command.label.65"
                style="push"
@@ -2622,7 +2616,7 @@
             categoryId="org.txm.rcp.categories.results"
             defaultHandler="org.txm.rcp.handlers.results.DeleteObject"
             description="Delete an object"
-            id="org.txm.rcp.commands.base.DeleteObject"
+            id="org.txm.rcp.handlers.results.DeleteObject"
             name="%command.name.26">
       </command>
       <command
@@ -2703,42 +2697,6 @@
    <extension
          point="org.eclipse.core.expressions.definitions">
       <definition
-            id="OneMainCorpusSelected">
-        <with variable="selection">
-            <iterate
-                  ifEmpty="false"
-                  operator="and">
-               <instanceof
-                     value="org.txm.searchengine.cqp.corpus.MainCorpus">
-               </instanceof>
-            </iterate>
-         </with>
-      </definition>
-      <definition
-            id="OneSubCorpusSelected">
-                 <with variable="selection">
-            <iterate
-                  ifEmpty="false"
-                  operator="and">
-               <instanceof
-                     value="org.txm.searchengine.cqp.corpus.Subcorpus">
-               </instanceof>
-            </iterate>
-         </with>
-      </definition>
-            <definition
-            id="OneCorpusSelected">
-                 <with variable="selection">
-            <iterate
-                  ifEmpty="false"
-                  operator="and">
-               <instanceof
-                     value="org.txm.searchengine.cqp.corpus.Corpus">
-               </instanceof>
-            </iterate>
-         </with>
-      </definition>
-      <definition
             id="OneFileSelected">
          <with
                variable="selection">
@@ -2865,19 +2823,6 @@
                </with>
             </definition>
             <definition
-                  id="OneReferencerSelected">
-               <with
-                     variable="selection">
-                  <iterate
-                        ifEmpty="false"
-                        operator="and">
-                     <instanceof
-                           value="org.txm.referencer.core.functions.Referencer">
-                     </instanceof>
-                  </iterate>
-               </with>
-            </definition>
-            <definition
                   id="OneQueryLogSelected">
                <with
                      variable="selection">
@@ -2891,15 +2836,6 @@
                </with>
             </definition>
             <definition
-                  id="RPerspectiveSelected">
-               <with
-                     variable="activeWorkbenchWindow.activePerspective">
-                  <equals
-                        value="org.txm.rcp.perspective.RPerspective">
-                  </equals>
-               </with>
-            </definition>
-            <definition
                   id="StatEngineReady">
                <test
                      forcePluginActivation="true"
@@ -3008,19 +2944,6 @@
       </splashHandlerProductBinding>
    </extension>
    <extension
-         point="org.eclipse.ui.decorators">
-      <decorator
-            class="org.txm.rcp.decorators.RDecorator"
-            icon="icons/decorators/R.png"
-            id="org.txm.rcp.decorators.RDecorator"
-            label="%decorator.label"
-            lightweight="false"
-            location="TOP_LEFT"
-            objectClass="java.lang.Object"
-            state="true">
-      </decorator>
-   </extension>
-   <extension
          point="org.eclipse.core.expressions.propertyTesters">
       <propertyTester
             class="org.txm.rcp.testers.ToolboxTester"
Index: tmp/org.txm.rcp/META-INF/MANIFEST.MF
===================================================================
--- tmp/org.txm.rcp/META-INF/MANIFEST.MF	(revision 722)
+++ tmp/org.txm.rcp/META-INF/MANIFEST.MF	(revision 723)
@@ -134,7 +134,6 @@
  org.txm.rcp.commands.queryview,
  org.txm.rcp.commands.tests,
  org.txm.rcp.commands.workspace,
- org.txm.rcp.decorators,
  org.txm.rcp.editors,
  org.txm.rcp.editors.adaptableDataStructure,
  org.txm.rcp.editors.imports,
Index: tmp/org.txm.rcp/icons/logo/R.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.rcp/icons/logo/Rcran.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru.properties
===================================================================
--- tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru.properties	(revision 722)
+++ tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru.properties	(revision 723)
@@ -98,8 +98,6 @@
 
 command.label.141 = управление SVG 
 
-command.label.142 = Новый сеанс
-
 command.label.143 = Выполнить
 
 command.label.144 = N/A_ Toggle Show Whitespace Characters
@@ -418,20 +416,14 @@
 
 command.name.58 = LexiconToIndex
 
-command.name.59 = OpenEmptyTextEditor
-
 command.name.6 = Анализ Корреляций
 
 command.name.60 = SubmitRcode
 
-command.name.61 = show svg help
-
 command.name.62 = OpenImportForm
 
 command.name.63 = Open Biblio
 
-command.name.64 = CopySelection
-
 command.name.66 = Выполить файл Groovy
 
 command.name.67 = СохранитьКак
@@ -622,8 +614,6 @@
 
 commandParameter.name.3 = N/A_ web page key
 
-decorator.label = Декоратор R
-
 editor.name = Графики SVG
 
 editor.name.0 = Индекс
@@ -710,8 +700,6 @@
 
 perspective.name = 
 
-perspective.name.0 = 
-
 product.name = TXM
 
 view.name = Корпус
Index: tmp/org.txm.rcp/OSGI-INF/l10n/bundle_fr.properties
===================================================================
--- tmp/org.txm.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 722)
+++ tmp/org.txm.rcp/OSGI-INF/l10n/bundle_fr.properties	(revision 723)
@@ -126,8 +126,6 @@
 
 command.label.141 = Raccourcis clavier graphiques
 
-command.label.142 = Nouvelle session
-
 command.label.143 = Ex�cuter
 
 command.label.144 = Activer l'affichage des caract�res invisibles
@@ -528,20 +526,14 @@
 
 command.name.58 = LexiconToIndex
 
-command.name.59 = OpenEmptyTextEditor
-
 command.name.6 = Analyse des Correspondances
 
 command.name.60 = SoumettreRcode
 
-command.name.61 = afficher l'aide svg
-
 command.name.62 = OuvrirFormulaireImport
 
 command.name.63 = Ouvrir Biblio
 
-command.name.64 = CopySelection
-
 command.name.66 = Ex�cuter un fichier Groovy
 
 command.name.67 = Sauver Sous
@@ -824,8 +816,6 @@
 
 context.name = Vue r�f�rentiels
 
-decorator.label = R Decorator
-
 editor.name = Graphiques SVG
 
 editor.name.0 = Index
@@ -958,8 +948,6 @@
 
 perspective.name = 
 
-perspective.name.0 = 
-
 perspective.name.1 = 
 
 product.name = TXM
Index: tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru_utf-8.properties
===================================================================
--- tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru_utf-8.properties	(revision 722)
+++ tmp/org.txm.rcp/OSGI-INF/l10n/bundle_ru_utf-8.properties	(revision 723)
@@ -69,7 +69,6 @@
 command.tooltip.10=Показать свойства этого экземпляра платформы TXM
 menu.tooltip.0=Вид
 perspective.name=Корпус
-perspective.name.0=R
 command.tooltip=Открыть в браузере HTML
 extension-point.name=N/A_Command
 command.name=Открыть файл
@@ -135,7 +134,6 @@
 command.label.71=Издание
 commandParameter.name=Файл
 command.name.66=Выполить файл Groovy
-command.name.64=CopySelection
 command.name.63=Open Biblio
 command.name.62=OpenImportForm
 command.name.61=show svg help
@@ -175,7 +173,7 @@
 command.label.45=Открыть файл
 command.label.43=Удалить скрипт
 command.label.41=Удалить базу
-decorator.label=Декоратор R
+
 command.label.40=Удалить проект
 command.name.37=Удалить
 command.name.36=ComputeLexicalTable
@@ -247,7 +245,6 @@
 command.tooltip.71=Экспортировать корпус в архив
 command.label.143=Выполнить
 command.tooltip.70=Отправить в R
-command.label.142=Новый сеанс
 command.label.141=управление SVG 
 product.name = TXM
 editor.name.17 = Просмотреть
Index: tmp/org.txm.rcp/OSGI-INF/l10n/bundle.properties
===================================================================
--- tmp/org.txm.rcp/OSGI-INF/l10n/bundle.properties	(revision 722)
+++ tmp/org.txm.rcp/OSGI-INF/l10n/bundle.properties	(revision 723)
@@ -112,8 +112,6 @@
 
 command.label.141 = Graphics shortcuts 
 
-command.label.142 = New session
-
 command.label.143 = Submit
 
 command.label.144 = Toggle Show Whitespace Characters
@@ -472,20 +470,14 @@
 
 command.name.58 = LexiconToIndex
 
-command.name.59 = OpenEmptyTextEditor
-
 command.name.6 = Compute Correspondance Analysis
 
 command.name.60 = SubmitRcode
 
-command.name.61 = show svg help
-
 command.name.62 = OpenImportForm
 
 command.name.63 = Open Biblio
 
-command.name.64 = CopySelection
-
 command.name.66 = Execute a Groovy file
 
 command.name.67 = SaveAs
@@ -732,8 +724,6 @@
 
 context.name = KR view
 
-decorator.label = R Decorator
-
 editor.name = SVG Graph
 
 editor.name.0 = Index
@@ -842,8 +832,6 @@
 
 perspective.name = 
 
-perspective.name.0 = 
-
 perspective.name.1 = 
 
 product.name = TXM
Index: tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/editors/InternalViewEditor.java
===================================================================
--- tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/editors/InternalViewEditor.java	(revision 722)
+++ tmp/org.txm.internalview.rcp/src/org/txm/internalview/rcp/editors/InternalViewEditor.java	(revision 723)
@@ -45,6 +45,13 @@
 import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.utils.logger.Log;
 
+/**
+ * Internal view editor.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
 public class InternalViewEditor extends TXMEditor<InternalView> {
 
 	public static final String ID = InternalViewEditor.class.getName();
@@ -71,7 +78,6 @@
 	 */
 	@Parameter(key=InternalViewPreferences.STRUCTURAL_UNIT)
 	protected StructuralUnitsComboViewer structuralUnitsComboViewer; 
-	
 
 	/**
 	 * Word properties to display.
@@ -89,8 +95,13 @@
 	@Override
 	public void _createPartControl(Composite parent) {
 
-		internalView = getResult();
+		internalView = this.getResult();
+
+		// Computing listener
+		ComputeSelectionListener computeSelectionListener = new ComputeSelectionListener(this);
+		ComputeKeyListener computeKeyListener = new ComputeKeyListener(this);
 		
+		
 		Composite parametersArea = getCommandParametersGroup();
 		parametersArea.setLayout(new GridLayout(5,false));
 		parametersArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
@@ -107,10 +118,8 @@
 		this.structuralUnitsComboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
-				if(!BaseAbstractComputeListener.mustIgnoreEvent(event))	{
-					structuralUnitPropertiesSelector.setProperties(structuralUnitsComboViewer.getSelectedStructuralUnit().getUserDefinedOrderedProperties());
-					structuralUnitPropertiesSelector.setSelectedProperty(0);
-				}
+				structuralUnitPropertiesSelector.setProperties(structuralUnitsComboViewer.getSelectedStructuralUnit().getUserDefinedOrderedProperties());
+				structuralUnitPropertiesSelector.setSelectedProperty(0);
 			}
 		});
 		
@@ -133,7 +142,7 @@
 		structuralUnitPropertiesSelector.setLayoutData(new GridData(GridData.CENTER, GridData.CENTER, false, true));
 		structuralUnitPropertiesSelector.setLayout(new GridLayout(3, false));
 		structuralUnitPropertiesSelector.setText(InternalViewUIMessages.InternalViewEditor_5);
-		structuralUnitPropertiesSelector.addSelectionListener(new ComputeSelectionListener(this));
+		structuralUnitPropertiesSelector.addSelectionListener(computeSelectionListener);
 		
 		navigationPanel = getBottomToolbar().installGLComposite("navigation", 4 , false);
 		navigationPanel.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));
@@ -141,14 +150,14 @@
 		// Navigation widget
 		navigation = new NewNavigationWidget(navigationPanel);
 		navigation.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, true));
-		navigation.addGoToKeyListener(new ComputeKeyListener(this));
+		navigation.addGoToKeyListener(computeKeyListener);
 
 		
 		// Listeners
-		navigation.addFirstListener(new ComputeSelectionListener(this));
-		navigation.addPreviousListener(new ComputeSelectionListener(this));
-		navigation.addNextListener(new ComputeSelectionListener(this));
-		navigation.addLastListener(new ComputeSelectionListener(this));
+		navigation.addFirstListener(computeSelectionListener);
+		navigation.addPreviousListener(computeSelectionListener);
+		navigation.addNextListener(computeSelectionListener);
+		navigation.addLastListener(computeSelectionListener);
 
 		
 		structInfos = new Label(navigationPanel, SWT.NONE);
@@ -195,8 +204,6 @@
 			}
 		});
 		
-		initializeFields();
-		
 		// Register the context menu
 		TXMEditor.initContextMenu(this.viewer.getTable(), "InternalViewEditorContextMenu", this.getSite(), this.viewer); // $NON-NLS-1$
 		
@@ -365,56 +372,8 @@
 	}
 
 
-	protected void initializeFields() {
-//		try { // init combos
-//			
-//			//propertiesSelector.setProperties(internalView.getAvailableProperties(), internalView.getProperties());
-//			
-//				Integer n = internalView.getCurrentPage();
-//				n++;
-//				navigation.setInfoLineText(n.toString(), internalView.getLocationTail());
-//
-////			for (StructuralUnit struct : internalView.getAvailableStructs()) {
-////				structCombo.add(struct.toString());
-////			}
-////			if (internalView.getAvailableStructs().size() > 0) {
-////				int hasS = -1;
-////				int hasP = -1;
-////				for (int i = 0 ; i < internalView.getAvailableStructs().size() ; i++) {
-////					if (internalView.getAvailableStructs().get(i).getName().equals("s")) {
-////						hasS = i; //$NON-NLS-1$
-////					}
-////					else if (internalView.getAvailableStructs().get(i).getName().equals("p")) {
-////						hasP = i; //$NON-NLS-1$
-////					}
-////				}
-////
-////				if (hasS > 0) { 
-////					structCombo.select(hasS);
-////				} else if (hasP > 0) {
-////					structCombo.select(hasP);
-////				} else {
-////					structCombo.select(0);
-////				}	
-////
-////				structCombo.addSelectionListener(new SelectionListener() {
-////					@Override
-////					public void widgetSelected(SelectionEvent e) {
-////						reloadStructuralUnitProperties();
-////					}
-////
-////					@Override
-////					public void widgetDefaultSelected(SelectionEvent e) { }
-////				});
-////				
-////				reloadStructuralUnitProperties();
-////			}
-//		} catch (Exception e) {
-//			System.out.println(InternalViewUIMessages.InternalViewEditor_10);
-//			org.txm.rcp.utils.Logger.printStackTrace(e);
-//		}
-	}
 
+
 	@Override
 	public void updateResultFromEditor() {
 		// nothing to do
Index: tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/preferences/PartitionPreferencePage.java
===================================================================
--- tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/preferences/PartitionPreferencePage.java	(revision 722)
+++ tmp/org.txm.partition.rcp/src/org/txm/partition/rcp/preferences/PartitionPreferencePage.java	(revision 723)
@@ -67,7 +67,6 @@
 	@Override
 	public void init(IWorkbench workbench) {
 		this.setPreferenceStore(new TXMPreferenceStore(PartitionDimensionsPreferences.PREFERENCES_NODE));
-		//this.setDescription(Messages.DiagnosticPreferencePage_1);
 		this.setTitle(TXMCoreMessages.common_description);
 	}
 }
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 722)
+++ tmp/org.txm.cooccurrence.core/src/org/txm/cooccurrence/core/functions/Cooccurrence.java	(revision 723)
@@ -214,7 +214,7 @@
 	protected List<Property> pProperties;
 	
 	/** The keyword query. */
-	@Parameter
+	@Parameter(key=CooccurrencePreferences.QUERY)
 	protected Query pQuery;
 	
 	/** The minscore. */
Index: tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/messages.properties
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/messages.properties	(revision 722)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/messages.properties	(revision 723)
@@ -0,0 +1,19 @@
+
+ReferencerEditor_0  = Compute references of <{0}> in {1} with property {2} and pattern {3}
+ReferencerEditor_10 = Get indexes
+ReferencerEditor_11 = References
+ReferencerEditor_12 = Group positions by indexes
+ReferencerEditor_13 = Refresh ui
+ReferencerEditor_17 = Showing first result page
+ReferencerEditor_19 = Showing last result page
+ReferencerEditor_21 = Showing next result page
+ReferencerEditor_23 = Showing previous result page
+ReferencerEditor_25 = Opening concordances
+ReferencerEditor_5  = Computing references of {0}
+ReferencerEditor_6  = Reference pattern
+ReferencerEditor_7  = No results
+ReferencerEditor_8  = Get matches
+ReferencerEditor_9  = Units
+
+ReferencerPreferencePage_2 = Referencer
+ReferencerPreferencePage_3 = Order references by frequency
Index: tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/ReferencerUIMessages.java
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/ReferencerUIMessages.java	(revision 722)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/messages/ReferencerUIMessages.java	(revision 723)
@@ -4,6 +4,13 @@
 import org.eclipse.osgi.util.NLS;
 import org.txm.utils.messages.Utf8NLS;
 
+/**
+ * Referencer UI messages. 
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
+ */
 public class ReferencerUIMessages extends NLS {
 	
 	private static final String BUNDLE_NAME = "org.txm.referencer.rcp.messages.messages"; //$NON-NLS-1$
Index: tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/LineLabelProvider.java
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/LineLabelProvider.java	(revision 722)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/LineLabelProvider.java	(revision 723)
@@ -60,8 +60,7 @@
 			return line.getPropValue();
 		case 2:
 			StringBuffer str = new StringBuffer();
-			for(String ref : line.getReferences())
-			{
+			for (String ref : line.getReferences()) {
 				str.append(", "+ref+"("+line.getCount(ref)+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 			}
 			return str.substring(2); 
Index: tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/ReferencerEditor.java
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/ReferencerEditor.java	(revision 722)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/editors/ReferencerEditor.java	(revision 723)
@@ -34,8 +34,6 @@
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.SelectionEvent;
@@ -49,33 +47,28 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.PartInitException;
 import org.txm.core.messages.TXMCoreMessages;
-import org.txm.core.preferences.TXMPreferences;
-import org.txm.core.results.TXMResult;
+import org.txm.core.results.Parameter;
 import org.txm.rcp.StatusLine;
 import org.txm.rcp.editors.TXMEditor;
-import org.txm.rcp.editors.TXMResultEditorInput;
 import org.txm.rcp.editors.TableKeyListener;
+import org.txm.rcp.editors.listeners.ComputeKeyListener;
+import org.txm.rcp.editors.listeners.ComputeSelectionListener;
 import org.txm.rcp.messages.TXMUIMessages;
-import org.txm.rcp.preferences.RCPPreferences;
 import org.txm.rcp.swt.GLComposite;
 import org.txm.rcp.swt.widget.NavigationWidget;
 import org.txm.rcp.swt.widget.PropertiesSelector;
 import org.txm.rcp.swt.widget.QueryWidget;
 import org.txm.rcp.views.QueriesView;
-import org.txm.rcp.views.corpora.CorporaView;
 import org.txm.referencer.core.functions.Referencer;
 import org.txm.referencer.core.functions.Referencer.Line;
+import org.txm.referencer.core.preferences.ReferencerPreferences;
 import org.txm.referencer.rcp.handlers.ReferencerToConc;
 import org.txm.referencer.rcp.messages.ReferencerUIMessages;
 import org.txm.searchengine.cqp.clientExceptions.CqiClientException;
 import org.txm.searchengine.cqp.corpus.Corpus;
 import org.txm.searchengine.cqp.corpus.Property;
 import org.txm.searchengine.cqp.corpus.StructuralUnitProperty;
-import org.txm.searchengine.cqp.corpus.query.Query;
 import org.txm.statsengine.r.rcp.views.RVariablesView;
 
 /**
@@ -92,15 +85,7 @@
 	/** The referencer. */
 	Referencer referencer;
 
-	/** The querywidget. */
-	QueryWidget querywidget;
 	
-	/** The props area. */
-	protected PropertiesSelector<Property> propsArea;
-	
-	/** The pattern area. */
-	protected PropertiesSelector<StructuralUnitProperty> patternArea;
-	
 	/** The navigation area. */
 	NavigationWidget navigationArea;
 
@@ -133,121 +118,52 @@
 	/** The mess. */
 	String mess;
 
-	
-	@Override
-	public void init(IEditorSite site, IEditorInput input)
-	throws PartInitException {
-		setSite(site);
-		setInput(input);
 
-		if (!(input instanceof TXMResultEditorInput)) {
-			throw new PartInitException("Editor input is not a TXMResultEditorInput input editor: "+input);
-		}
-		
-		TXMResult result = ((TXMResultEditorInput) input).getResult();
-		
-		if (!(result instanceof Referencer)) {
-			throw new PartInitException("TXMResult input is not a Referencer result: "+result);
-		}
-		
-		this.referencer = ((Referencer) result);
-		this.corpus = referencer.getCorpus();
-		
-	}
-
 	
+	/** The querywidget. */
+	@Parameter(key=ReferencerPreferences.QUERY)
+	protected QueryWidget querywidget;
+	
 	/**
-	 * Compute.
-	 *
-	 * @return true, if successful
+	 * Word property selector.
 	 */
-	@Override
-	public void updateEditorFromResult(boolean update) {
-		
-//		JobHandler jobhandler = new JobHandler("refreshing...") {
-//			@Override
-//			protected IStatus run(IProgressMonitor monitor) {
-//				this.runInit(monitor);
-//				try {
-//					JobsTimer.start();
-//									
-//					monitor.worked(50);
-//
-//					monitor.subTask(RCPMessages.ReferencerEditor_13);
-//					syncExec(new Runnable() {
-//						@Override
-//						public void run() {
-							fillDisplayArea(0, lineperpage);
-							CorporaView.refresh();
-							CorporaView.expand(corpus);
-							QueriesView.refresh();
-							RVariablesView.refresh();
-							//setPartName(referencer.getName()); //$NON-NLS-1$
-							
-							viewer.getTable().setFocus();
-							System.out.println(NLS.bind(TXMUIMessages.CreatePartition_5, referencer.getNLines(), referencer.getV()));
-//						}
-//					});
-//
-//					monitor.worked(100);
-//				} catch (ThreadDeath td) {
-//					return Status.CANCEL_STATUS;
-//				} catch (Exception e) {
-//					org.txm.rcp.utils.Logger.printStackTrace(e);
-//				} finally {
-//					monitor.done();
-//					JobsTimer.stopAndPrint();
-//				}
-//				return Status.OK_STATUS;
-//			}
-//		};
-//		jobhandler.startJob();
+	@Parameter(key=ReferencerPreferences.UNIT_PROPERTY)
+	protected PropertiesSelector<Property> propertiesSelector;
+	
+	/** The pattern area. */
+	@Parameter(key=ReferencerPreferences.PATTERN)
+	protected PropertiesSelector<StructuralUnitProperty> patternArea;
 
-		return;
-	}
+	
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
+	
 	@Override
 	public void _createPartControl(Composite parent) {
-//		super.createPartControl(parent);
 		
+		
+		this.referencer = ((Referencer) this.getResult());
+		this.corpus = referencer.getCorpus();
+
+		// Computing listener
+		ComputeSelectionListener computeSelectionListener = new ComputeSelectionListener(this);
+		ComputeKeyListener computeKeyListener = new ComputeKeyListener(this);
+
+		
 		parent.setLayout(new GridLayout(1,true));
 		Composite paramArea = getCommandParametersGroup();
 		paramArea.setLayout(new GridLayout(3, false));
 		
 		querywidget = new QueryWidget(paramArea, SWT.None);
 		querywidget.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-		querywidget.addKeyListener(new KeyListener() {
-			@Override
-			public void keyReleased(KeyEvent e) { }
+		querywidget.addKeyListener(computeKeyListener);
 
-			@Override
-			public void keyPressed(KeyEvent e) {
-				if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
-					referencer.setQuery(querywidget.getQuery());
-					compute(true);
-				}
-			}
-		});
-
 		// [Edit]
-		propsArea = new PropertiesSelector<Property>(paramArea, SWT.NONE);
-		propsArea.setMaxPropertyNumber(1);
-		propsArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
+		propertiesSelector = new PropertiesSelector<Property>(paramArea, SWT.NONE);
+		propertiesSelector.setMaxPropertyNumber(1);
+		propertiesSelector.setLayoutData(new GridData(GridData.FILL, GridData.FILL,
 				false, false));
-		propsArea.setLayout(new GridLayout(3, false));
-		propsArea.addSelectionListener(new SelectionListener() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				referencer.setProperty(propsArea.getSelectedProperties().get(0));
-				compute(true);
-			}
-			
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) { }
-		});
+		propertiesSelector.setLayout(new GridLayout(3, false));
+		propertiesSelector.addSelectionListener(computeSelectionListener);
 		
 		// [Search]
 		Button go = new Button(paramArea, SWT.PUSH);
@@ -261,33 +177,17 @@
 		go.setFont(newf);
 
 		go.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false));
-		go.addSelectionListener(new SelectionListener() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				updateResultFromEditor();
-				compute(true);
-			}
+		go.addSelectionListener(computeSelectionListener);
 
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) { }
-		});
-
 		// [pattern : ... ]
 		patternArea = new PropertiesSelector<StructuralUnitProperty>(paramArea, SWT.NONE);
 		patternArea.setLayoutData(new GridData(GridData.FILL, GridData.FILL, false, false,3,1));
 		patternArea.setLayout(new GridLayout(3, false));
 		patternArea.setText(ReferencerUIMessages.ReferencerEditor_6);
-		patternArea.addSelectionListener(new SelectionListener() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				referencer.setPattern(patternArea.getSelectedProperties());
-				compute(true);
-			}
-			
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) { }
-		});
+		patternArea.addSelectionListener(computeSelectionListener);
 
+		
+		
 		//pagination
 		GLComposite navigationComposite = getBottomToolbar().installGLComposite("navigation", 1, false);
 		navigationArea = new NavigationWidget(navigationComposite, SWT.None);
@@ -401,43 +301,34 @@
 		unitColumn.setText(TXMCoreMessages.common_units);
 		unitColumn.setToolTipText(TXMCoreMessages.common_units);
 		unitColumn.setWidth(200);
-		unitColumn.addSelectionListener(new SelectionListener() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
 
-			}
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
 		freqColumn = new TableColumn(viewer.getTable(), SWT.LEFT);
 		freqColumn.setText(ReferencerUIMessages.ReferencerEditor_11);
 		freqColumn.setToolTipText(ReferencerUIMessages.ReferencerEditor_11);
 		freqColumn.setWidth(100);
-		freqColumn.addSelectionListener(new SelectionListener() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-
-			}
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
 		
 		initializeFields();
 		
 		
 		// Register the context menu
-		TXMEditor.initContextMenu(this.viewer.getTable(), "ReferencerEditorContextMenu", this.getSite(), this.viewer); // $NON-NLS-1$
+		TXMEditor.initContextMenu(this.viewer.getTable(), this.getSite(), this.viewer); // $NON-NLS-1$
 
 		
 	}
 	
+	@Override
+	public void updateEditorFromResult(boolean update) {
 
+		fillDisplayArea(0, lineperpage);
+		QueriesView.refresh();
+		RVariablesView.refresh();
 
+		viewer.getTable().setFocus();
+		System.out.println(NLS.bind(TXMUIMessages.CreatePartition_5, referencer.getNLines(), referencer.getV()));
+	}
+
+
+
 	/**
 	 * Send selection to conc.
 	 */
@@ -542,6 +433,9 @@
 		return this.corpus;
 	}
 
+	/**
+	 * 
+	 */
 	protected void initializeFields() {
 		// word properties
 		try {
@@ -552,9 +446,9 @@
 			if (referencer.getProperty() != null) {
 				selectedProps.add(referencer.getProperty());
 				availables.remove(referencer.getProperty());
-				this.propsArea.setProperties(availables, selectedProps);
+				this.propertiesSelector.setProperties(availables, selectedProps);
 			} else {
-				this.propsArea.setCorpus(corpus);
+				this.propertiesSelector.setCorpus(corpus);
 			}
 			
 		} catch (CqiClientException e1) {
@@ -581,19 +475,10 @@
 			org.txm.rcp.utils.Logger.printStackTrace(e1);
 			return;
 		}
-		
-		if (referencer.getQuery() != null) {
-			this.querywidget.setText(referencer.getQuery().getQueryString());
-		}
 	}
 
 	@Override
 	public void updateResultFromEditor() {
-		final Query query = querywidget.getQuery();
-		final List<Property> queryprops = propsArea.getSelectedProperties();
-		final List<StructuralUnitProperty> refs = patternArea.getSelectedProperties();
-		boolean hierarchicSort = TXMPreferences.getBoolean(RCPPreferences.SORTBYFREQ, RCPPreferences.PREFERENCES_NODE);
-		
-		referencer.setParameters(query, queryprops.get(0), refs, hierarchicSort);
+		// nothing to do
 	}
 }
Index: tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/preferences/ReferencerPreferencePage.java
===================================================================
--- tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/preferences/ReferencerPreferencePage.java	(revision 722)
+++ tmp/org.txm.referencer.rcp/src/org/txm/referencer/rcp/preferences/ReferencerPreferencePage.java	(revision 723)
@@ -28,45 +28,35 @@
 package org.txm.referencer.rcp.preferences;
 
 import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.txm.rcp.preferences.RCPPreferences;
-import org.txm.rcp.preferences.RCPPreferencesPage;
+import org.eclipse.ui.IWorkbench;
+import org.txm.rcp.preferences.TXMPreferencePage;
+import org.txm.rcp.preferences.TXMPreferenceStore;
+import org.txm.referencer.core.preferences.ReferencerPreferences;
 import org.txm.referencer.rcp.messages.ReferencerUIMessages;
 
+
 /**
- * This class represents a preference page that is contributed to the
- * Preferences dialog. By subclassing <samp>FieldEditorPreferencePage</samp>, we
- * can use the field support built into JFace that allows us to create a page
- * that is small and knows how to save, restore and apply itself.
- * <p>
- * This page is used to modif y preferences only. They are stored in the
- * preference store that belongs to the main plug-in class. That way,
- * preferences can be accessed directly via the preference store.
+ * Referencer preference page.
+ * 
+ * @author mdecorde
+ * @author sjacquot
+ *
  */
+public class ReferencerPreferencePage extends TXMPreferencePage {
 
-public class ReferencerPreferencePage extends RCPPreferencesPage {
 
-	/** The referencer_sorttype. */
-	private BooleanFieldEditor referencer_sorttype;
-
-	/**
-	 * Instantiates a new referencer preference page.
-	 */
-	public ReferencerPreferencePage() {
-		super();
-		setTitle(ReferencerUIMessages.ReferencerPreferencePage_2);
-	}
-
-	/**
-	 * Creates the field editors. Field editors are abstractions of the common
-	 * GUI blocks needed to manipulate various types of preferences. Each field
-	 * editor knows how to save and restore itself.
-	 */
+	
 	@Override
 	public void createFieldEditors() {
+		this.addField(new BooleanFieldEditor(ReferencerPreferences.SORT_BY_FREQUENCIES, ReferencerUIMessages.ReferencerPreferencePage_3, this.getFieldEditorParent()));
+	}
 
-		referencer_sorttype = new BooleanFieldEditor(RCPPreferences.SORTBYFREQ, ReferencerUIMessages.ReferencerPreferencePage_3, getFieldEditorParent());
-		
-		addField(referencer_sorttype);
-
+	@Override
+	public void init(IWorkbench workbench) {
+		this.setPreferenceStore(new TXMPreferenceStore(ReferencerPreferences.PREFERENCES_NODE));
+		this.setTitle(ReferencerUIMessages.ReferencerPreferencePage_2);
 	}
+	
+	
+	
 }
Index: tmp/org.txm.referencer.rcp/plugin.xml
===================================================================
--- tmp/org.txm.referencer.rcp/plugin.xml	(revision 722)
+++ tmp/org.txm.referencer.rcp/plugin.xml	(revision 723)
@@ -58,7 +58,7 @@
                   </command>
                </menuContribution>
                <menuContribution
-            locationURI="popup:ReferencerEditorContextMenu">
+            locationURI="popup:org.txm.referencer.rcp.editors.ReferencerEditor">
          <command
                commandId="org.txm.referencer.rcp.handlers.ReferencerToConc"
                style="push">
